[fix] docker entrypoint with awaiting database

Author: mosquito

Dockerfile

@@ -19,15 +19,14 @@ COPY ./ /tmp
 
 RUN set -ex && \
   apk add --no-cache --virtual .build-deps gcc py-pip python-dev musl-dev && \
-  pip list && \
-  pip install '/tmp' && \
+  pip --no-cache-dir install '/tmp' && \
   apk del .build-deps
 
 VOLUME "/usr/lib/pypi-server"
 
-COPY docker-entrypoint.sh /entrypoint.sh
-RUN rm -rf /root/.cache /var/cache/*
+COPY docker-entrypoint.py /usr/local/bin/entrypoint.py
+RUN chmod a+x /usr/local/bin/entrypoint.py
 
 EXPOSE 80
 
-ENTRYPOINT ["/entrypoint.sh"]
+ENTRYPOINT ["/usr/local/bin/entrypoint.py"]

docker-entrypoint.py

@@ -0,0 +1,57 @@
+#!/usr/bin/python
+import socket
+import os
+import sys
+import logging
+from time import sleep
+from distutils import spawn
+
+try:
+    from urlparse import urlparse as parse_url
+except ImportError:
+    from urllib.parse import urlsplit as parse_url
+
+logging.basicConfig(level=logging.INFO)
+log = logging.getLogger()
+
+
+def check_port(host, port):
+    sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    return sock.connect_ex((host, port)) == 0
+
+
+DEFAULT_PORTS = {
+    'postgres': 5432,
+    'postgresql': 5432,
+    'mysql': 3306,
+}
+
+
+if __name__ == '__main__':
+    args = sys.argv[1:]
+
+    if not args or args[0].startswith('-'):
+        db_url = parse_url(os.getenv('DB', ''))
+        host = db_url.hostname
+        port = int(db_url.port or DEFAULT_PORTS[db_url.scheme])
+
+        args.insert(0, '/usr/bin/pypi-server')
+
+        while not check_port(db_url.hostname, port):
+            log.info('Awaiting database...')
+            sleep(1)
+            continue
+
+        # Ensure database engine is ready
+        sleep(5)
+
+    executable = args[0]
+
+    if not executable.startswith('/'):
+        executable = spawn.find_executable(executable)
+
+    if not executable or not os.path.exists(executable):
+        log.error('Command not found')
+        exit(127)
+
+    os.execv(executable, args)