From 09cd23019767feeb55963c678080fb1c7ac5593b Mon Sep 17 00:00:00 2001 From: Harish Ved Date: Mon, 13 Mar 2023 16:46:36 +0530 Subject: [PATCH 1/2] Use same image for web and celery containers --- Dockerfile | 6 +----- constants.json | 2 +- docker-compose.yml | 20 ++++++-------------- docker-entrypoint-celery.sh | 18 ------------------ docker-entrypoint.sh | 4 +--- 5 files changed, 9 insertions(+), 41 deletions(-) delete mode 100755 docker-entrypoint-celery.sh diff --git a/Dockerfile b/Dockerfile index 3b65e685..a4811eec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,14 +31,10 @@ COPY config.json.sample config.json RUN pip install -r /tmp/requirements.txt --no-cache-dir --ignore-installed COPY --chown=app:root . . + FROM base as test CMD ["python" "-m", "pytest", "-v", "--cov", "--disable-warnings" ] - -FROM base as celery -COPY ./docker-entrypoint-celery.sh /tmp/entrypoint-celery.sh -ENTRYPOINT ["/tmp/entrypoint-celery.sh"] - FROM base as web COPY ./docker-entrypoint.sh /tmp/entrypoint.sh ENTRYPOINT ["/tmp/entrypoint.sh"] diff --git a/constants.json b/constants.json index 7dd4bd06..9e86abfb 100644 --- a/constants.json +++ b/constants.json @@ -10,4 +10,4 @@ "reason8": "The request raised is incorrect or is not required for the reason supplied. Please re-raise with corrections.", "reason9": "Please raise this via Group Access. Get in touch with your Lead/Manager to get yourself added to relevant Access Groups." } -} \ No newline at end of file +} diff --git a/docker-compose.yml b/docker-compose.yml index 39007c9c..28555585 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,15 +15,9 @@ services: - 8000:8000 depends_on: - db - command: > - /bin/bash -c " - while ! nc -z db 3306; - do - echo sleeping; - sleep 1; - done; - echo Connected!;" + echo Starting Django runserver; + python manage.py runserver 0.0.0.0:8000 db: container_name: db image: mysql/mysql-server:8.0.31 @@ -33,31 +27,29 @@ services: - ./secrets/ops_mysql_dev.env volumes: - ./dbs:/var/lib/mysql --socket=/tmp/mysql.sock - - redis: container_name: redis image: redis:alpine command: --port 6379 ports: - "6379:6379" - celery: container_name: celery build: context: . dockerfile: Dockerfile - target : celery + target: web volumes: - ./:/app/ env_file: - ./secrets/ops_app_celery.env - depends_on: - db - redis - web - + command: > + echo Starting celery; + python3 -m celery -A BrowserStackAutomation worker -n worker1 -l DEBUG test: container_name: test build: diff --git a/docker-entrypoint-celery.sh b/docker-entrypoint-celery.sh deleted file mode 100755 index 022f5aab..00000000 --- a/docker-entrypoint-celery.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -python manage.py createcachetable -python manage.py migrate # Apply database migrations -python manage.py collectstatic --clear --noinput # clearstatic files -python manage.py collectstatic --noinput # collect static files - -# directory for gunicorn logs and django app logs -mkdir -p /ebs/logs -touch /ebs/logs/bstack.log -tail -n 0 -f /ebs/logs/bstack.log & - -# run scripts/clone_access_modules.py to clone access modules -python scripts/clone_access_modules.py -pip install -r Access/access_modules/requirements.txt --no-cache-dir --ignore-installed - -echo Starting celery -python3 -m celery -A BrowserStackAutomation worker -n worker1 -l DEBUG diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index d4a8cc49..e34cb8dc 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -15,6 +15,4 @@ tail -n 0 -f /ebs/logs/bstack.log & python scripts/clone_access_modules.py pip install -r Access/access_modules/requirements.txt --no-cache-dir --ignore-installed - -echo Starting Django runserver. -python manage.py runserver 0.0.0.0:8000 +eval "$@" From b47010ac20f6a8c5941bd649486bcb2206c15490 Mon Sep 17 00:00:00 2001 From: Harish Ved Date: Mon, 13 Mar 2023 19:23:08 +0530 Subject: [PATCH 2/2] fix: updating bash commands --- docker-compose.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 28555585..50b5a0eb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,8 +16,8 @@ services: depends_on: - db command: > - echo Starting Django runserver; - python manage.py runserver 0.0.0.0:8000 + bash -c "echo Starting Django runserver; + python manage.py runserver 0.0.0.0:8000" db: container_name: db image: mysql/mysql-server:8.0.31 @@ -48,8 +48,9 @@ services: - redis - web command: > + bash -c " echo Starting celery; - python3 -m celery -A BrowserStackAutomation worker -n worker1 -l DEBUG + python3 -m celery -A BrowserStackAutomation worker -n worker1 -l DEBUG" test: container_name: test build: