Env extracted

platform/docker-compose.yml

@@ -11,6 +11,7 @@ services:
     environment:
       DB_USER: ${DB_USER}
       DB_PASSWORD: $DB_PASSWORD
+      CELERY_BROKER_URL: 'redis://redis:6379/0'
       SQLALCHEMY_DATABASE_URI: "postgresql://${DB_USER}:${DB_PASSWORD}@db:5432/${DB_DB}"
       LOG_LEVEL_GLOBAL: ${LOG_LEVEL_GLOBAL}
       GITPYTHON_CUSTOM_SSH_KEY: ${SSH_KEY}
@@ -32,6 +33,7 @@ services:
     env_file:
     - envs/portal.env
     environment:
+      CELERY_BROKER_URL: 'redis://redis:6379/0'
       SQLALCHEMY_DATABASE_URI: "postgresql://${DB_USER}:${DB_PASSWORD}@db:5432/${DB_DB}"
       LOG_LEVEL_GLOBAL: ${LOG_LEVEL_GLOBAL}
       GITPYTHON_CUSTOM_SSH_KEY: ${SSH_KEY}
@@ -84,6 +86,9 @@ services:
     env_file:
     - envs/worker.env
     environment:
+      CELERY_BROKER_URL: 'redis://redis:6379/1'
+      WORKER_REDIS_HOST: 'redis'
+      PORTAL_URL: 'http://portal:8000'
       LOG_LEVEL_GLOBAL: ${LOG_LEVEL_GLOBAL}
 
     depends_on:
@@ -98,10 +103,23 @@ services:
   celery-worker:
     image: 'kontr2/worker'
     privileged: true
-    command: "celery worker --loglevel=DEBUG -A app.celery"
+    command: >
+      /bin/sh -c "
+        while ! nc -z portal 8000;
+        do
+          echo 'Sleeping';
+          sleep 1;
+        done;
+        echo 'Connected!';
+        celery worker --loglevel=DEBUG -A app.celery
+      "
+    
     env_file:
     - envs/worker.env
     environment:
+      CELERY_BROKER_URL: 'redis://redis:6379/1'
+      WORKER_REDIS_HOST: 'redis'
+      PORTAL_URL: 'http://portal:8000'
       LOG_LEVEL_GLOBAL: ${LOG_LEVEL_GLOBAL}
 
     depends_on:

platform/envs/portal.env

-CELERY_BROKER_URL: "redis://redis:6379/0"
-PORTAL_DATA_WORKER_DOMAIN: 'kontr-worker'
-FLASK_ENV: 'development'
+PORTAL_DATA_WORKER_DOMAIN=kontr-worker
+FLASK_ENV=development
 

platform/envs/worker.env

-      WORKER_NAME: 'executor'
-      SECRET_KEY: 'you-will-never-guess'
-      CELERY_BROKER_URL: 'redis://redis:6379/1'
-      WORKER_REDIS_HOST: 'redis'
-      PORTAL_URL: 'http://portal:8000'
-      WORKER_CLEAN_SUBMISSION_FILES: 'True'
-      WORKER_CLEAN_SUBMISSION_CONTAINER: 'True'
-      FLASK_ENV: 'development'
+WORKER_NAME=executor
+SECRET_KEY=you-will-never-guess
+WORKER_CLEAN_SUBMISSION_FILES=True
+WORKER_CLEAN_SUBMISSION_CONTAINER=True
+FLASK_ENV=development