chore:run container script run through CLI args

fossasia · Dec 23, 2019 · 6c3e7a3 · 6c3e7a3
1 parent 6a71e47
commit 6c3e7a3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -26,4 +26,4 @@ WORKDIR /data/app
 ADD . .
 
 EXPOSE 8080
-CMD ["sh", "scripts/container_start.sh"]
+ENTRYPOINT ["sh", "scripts/container_start.sh"]
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -53,8 +53,8 @@ services:
     container_name: opev-celery
     environment:
       <<: *environment-vars
-      DEPLOYMENT: celery
       C_FORCE_ROOT: "true"
+    command: celery
 
 volumes:
     pg:

diff --git a/scripts/container_start.sh b/scripts/container_start.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-export DEPLOYMENT=${DEPLOYMENT:-api}
+export DEPLOYMENT=${1:-api}
 
 echo "[LOG] Deploying ${DEPLOYMENT}"
 echo "[LOG] Using database: ${DATABASE_URL}"
@@ -18,6 +18,7 @@ then
     echo "[LOG] Starting gunicorn on port ${PORT}"
     gunicorn -b 0.0.0.0:${PORT} app:app -w $GUNICORN_WORKERS --enable-stdio-inheritance --log-level $GUNICORN_LOG_LEVEL --proxy-protocol --preload $GUNICORN_EXTRA_ARGS
 fi
+
 if [ "$DEPLOYMENT" == "celery" ]
 then
     echo "[LOG] Starting celery worker"