From 6c3e7a378562c78ecbf66a801ec924f1ff78232c Mon Sep 17 00:00:00 2001 From: Suneet Srivastava Date: Mon, 23 Dec 2019 01:31:20 +0530 Subject: [PATCH] chore:run container script run through CLI args --- Dockerfile | 2 +- docker-compose.yml | 2 +- scripts/container_start.sh | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 87f2352e36..e16e7027e4 100644 --- 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 index bc5a0b53bc..e4e8596644 100644 --- 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 index 055835d34d..eb2515559f 100644 --- 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"