Merge pull request #4 from tiangolo/independent-start-script

Make /start.sh independent of /entrypoint.sh

python3.6-alpine3.8/Dockerfile

@@ -6,9 +6,6 @@ RUN apk add --no-cache --virtual .build-deps gcc libc-dev make \
     && pip install uvicorn gunicorn \
     && apk del .build-deps gcc libc-dev make
 
-COPY ./entrypoint.sh /entrypoint.sh
-RUN chmod +x /entrypoint.sh
-
 COPY ./start.sh /start.sh
 RUN chmod +x /start.sh
 
@@ -21,8 +18,6 @@ ENV PYTHONPATH=/app
 
 EXPOSE 80
 
-ENTRYPOINT ["/entrypoint.sh"]
-
 # Run the start script, it will check for an /app/prestart.sh script (e.g. for migrations)
-# And then will start Gunicorn with Meinheld
+# And then will start Gunicorn with Uvicorn
 CMD ["/start.sh"]

python3.6-alpine3.8/start.sh

@@ -1,6 +1,24 @@
 #! /usr/bin/env sh
 set -e
 
+if [ -f /app/app/main.py ]; then
+    DEFAULT_MODULE_NAME=app.main
+elif [ -f /app/main.py ]; then
+    DEFAULT_MODULE_NAME=main
+fi
+MODULE_NAME=${MODULE_NAME:-$DEFAULT_MODULE_NAME}
+VARIABLE_NAME=${VARIABLE_NAME:-app}
+export APP_MODULE=${APP_MODULE:-"$MODULE_NAME:$VARIABLE_NAME"}
+
+if [ -f /app/gunicorn_conf.py ]; then
+    DEFAULT_GUNICORN_CONF=/app/gunicorn_conf.py
+elif [ -f /app/app/gunicorn_conf.py ]; then
+    DEFAULT_GUNICORN_CONF=/app/app/gunicorn_conf.py
+else
+    DEFAULT_GUNICORN_CONF=/gunicorn_conf.py
+fi
+export GUNICORN_CONF=${GUNICORN_CONF:-$DEFAULT_GUNICORN_CONF}
+
 # If there's a prestart.sh script in the /app directory, run it before starting
 PRE_START_PATH=/app/prestart.sh
 echo "Checking for script in $PRE_START_PATH"

python3.6/Dockerfile

@@ -4,9 +4,6 @@ LABEL maintainer="Sebastian Ramirez <[email protected]>"
 
 RUN pip install uvicorn gunicorn
 
-COPY ./entrypoint.sh /entrypoint.sh
-RUN chmod +x /entrypoint.sh
-
 COPY ./start.sh /start.sh
 RUN chmod +x /start.sh
 
@@ -19,8 +16,6 @@ ENV PYTHONPATH=/app
 
 EXPOSE 80
 
-ENTRYPOINT ["/entrypoint.sh"]
-
 # Run the start script, it will check for an /app/prestart.sh script (e.g. for migrations)
-# And then will start Gunicorn with Meinheld
+# And then will start Gunicorn with Uvicorn
 CMD ["/start.sh"]

python3.6/start.sh

@@ -1,6 +1,24 @@
 #! /usr/bin/env sh
 set -e
 
+if [ -f /app/app/main.py ]; then
+    DEFAULT_MODULE_NAME=app.main
+elif [ -f /app/main.py ]; then
+    DEFAULT_MODULE_NAME=main
+fi
+MODULE_NAME=${MODULE_NAME:-$DEFAULT_MODULE_NAME}
+VARIABLE_NAME=${VARIABLE_NAME:-app}
+export APP_MODULE=${APP_MODULE:-"$MODULE_NAME:$VARIABLE_NAME"}
+
+if [ -f /app/gunicorn_conf.py ]; then
+    DEFAULT_GUNICORN_CONF=/app/gunicorn_conf.py
+elif [ -f /app/app/gunicorn_conf.py ]; then
+    DEFAULT_GUNICORN_CONF=/app/app/gunicorn_conf.py
+else
+    DEFAULT_GUNICORN_CONF=/gunicorn_conf.py
+fi
+export GUNICORN_CONF=${GUNICORN_CONF:-$DEFAULT_GUNICORN_CONF}
+
 # If there's a prestart.sh script in the /app directory, run it before starting
 PRE_START_PATH=/app/prestart.sh
 echo "Checking for script in $PRE_START_PATH"

python3.7-alpine3.8/Dockerfile

@@ -6,9 +6,6 @@ RUN apk add --no-cache --virtual .build-deps gcc libc-dev make \
     && pip install uvicorn gunicorn \
     && apk del .build-deps gcc libc-dev make
 
-COPY ./entrypoint.sh /entrypoint.sh
-RUN chmod +x /entrypoint.sh
-
 COPY ./start.sh /start.sh
 RUN chmod +x /start.sh
 
@@ -21,8 +18,6 @@ ENV PYTHONPATH=/app
 
 EXPOSE 80
 
-ENTRYPOINT ["/entrypoint.sh"]
-
 # Run the start script, it will check for an /app/prestart.sh script (e.g. for migrations)
-# And then will start Gunicorn with Meinheld
+# And then will start Gunicorn with Uvicorn
 CMD ["/start.sh"]

python3.7-alpine3.8/start.sh

@@ -1,6 +1,24 @@
 #! /usr/bin/env sh
 set -e
 
+if [ -f /app/app/main.py ]; then
+    DEFAULT_MODULE_NAME=app.main
+elif [ -f /app/main.py ]; then
+    DEFAULT_MODULE_NAME=main
+fi
+MODULE_NAME=${MODULE_NAME:-$DEFAULT_MODULE_NAME}
+VARIABLE_NAME=${VARIABLE_NAME:-app}
+export APP_MODULE=${APP_MODULE:-"$MODULE_NAME:$VARIABLE_NAME"}
+
+if [ -f /app/gunicorn_conf.py ]; then
+    DEFAULT_GUNICORN_CONF=/app/gunicorn_conf.py
+elif [ -f /app/app/gunicorn_conf.py ]; then
+    DEFAULT_GUNICORN_CONF=/app/app/gunicorn_conf.py
+else
+    DEFAULT_GUNICORN_CONF=/gunicorn_conf.py
+fi
+export GUNICORN_CONF=${GUNICORN_CONF:-$DEFAULT_GUNICORN_CONF}
+
 # If there's a prestart.sh script in the /app directory, run it before starting
 PRE_START_PATH=/app/prestart.sh
 echo "Checking for script in $PRE_START_PATH"

python3.7/Dockerfile

@@ -4,9 +4,6 @@ LABEL maintainer="Sebastian Ramirez <[email protected]>"
 
 RUN pip install uvicorn gunicorn
 
-COPY ./entrypoint.sh /entrypoint.sh
-RUN chmod +x /entrypoint.sh
-
 COPY ./start.sh /start.sh
 RUN chmod +x /start.sh
 
@@ -19,8 +16,6 @@ ENV PYTHONPATH=/app
 
 EXPOSE 80
 
-ENTRYPOINT ["/entrypoint.sh"]
-
 # Run the start script, it will check for an /app/prestart.sh script (e.g. for migrations)
-# And then will start Gunicorn with Meinheld
+# And then will start Gunicorn with Uvicorn
 CMD ["/start.sh"]

python3.7/start.sh

@@ -1,6 +1,24 @@
 #! /usr/bin/env sh
 set -e
 
+if [ -f /app/app/main.py ]; then
+    DEFAULT_MODULE_NAME=app.main
+elif [ -f /app/main.py ]; then
+    DEFAULT_MODULE_NAME=main
+fi
+MODULE_NAME=${MODULE_NAME:-$DEFAULT_MODULE_NAME}
+VARIABLE_NAME=${VARIABLE_NAME:-app}
+export APP_MODULE=${APP_MODULE:-"$MODULE_NAME:$VARIABLE_NAME"}
+
+if [ -f /app/gunicorn_conf.py ]; then
+    DEFAULT_GUNICORN_CONF=/app/gunicorn_conf.py
+elif [ -f /app/app/gunicorn_conf.py ]; then
+    DEFAULT_GUNICORN_CONF=/app/app/gunicorn_conf.py
+else
+    DEFAULT_GUNICORN_CONF=/gunicorn_conf.py
+fi
+export GUNICORN_CONF=${GUNICORN_CONF:-$DEFAULT_GUNICORN_CONF}
+
 # If there's a prestart.sh script in the /app directory, run it before starting
 PRE_START_PATH=/app/prestart.sh
 echo "Checking for script in $PRE_START_PATH"