Update from dev machine.

di2ag · Jun 27, 2023 · 61be809 · 61be809
1 parent a2bd971
commit 61be809
Show file tree

Hide file tree

Showing 3 changed files with 103 additions and 4 deletions.
diff --git a/compose.chp-api.yaml b/compose.chp-api.yaml
@@ -43,15 +43,14 @@ services:
       - POSTGRES_PASSWORD_FILE=/run/secrets/db-password
       - POSTGRES_HOST=db
       - POSTGRES_PORT=5432
-      - DEBUG=1
+      - DEBUG=0
         # For Helm testing purposes
         #- POSTGRES_PASSWORD=31173e51d8f78b56606d06dfb66a1b126630cdf4711bed9427025d8979976f31
         #- SECRET_KEY=e1743ca40af220389cd1165d213e3d677f2d59c00d7b0f94e7a302c91f95f029
         #- DJANGO_ALLOWED_HOSTS=localhost,chp.thayer.dartmouth.edu
         #- DJANGO_SUPERUSER_USERNAME=chp_admin
         #- [email protected]
         #- DJANGO_SUPERUSER_PASSWORD=e12ff26f070819d9a72e317898148679680e6b3976e464b4102bd6eb18357919
-      - POSTGRES_PASSWORD_FILE=/run/secrets/db-password
       - SECRET_KEY_FILE=/run/secrets/django-key
       - DJANGO_ALLOWED_HOSTS_FILE=/run/secrets/allowed-hosts
       - DJANGO_SUPERUSER_USERNAME_FILE=/run/secrets/django-superuser-username

diff --git a/compose.gennifer.yaml b/compose.gennifer.yaml
@@ -20,7 +20,7 @@ services:
     command: flask --app pidc run --debug --host 0.0.0.0
     depends_on:
         - redis
-
+ 
   worker-pidc:
     build: 
         context: ./gennifer/pidc
@@ -32,6 +32,101 @@ services:
     depends_on:
         - pidc
         - redis
+
+  grisli:
+    build: 
+        context: ./gennifer/grisli
+        dockerfile: Dockerfile
+    restart: always
+    user: gennifer_user
+    ports:
+        - 5005:5000
+    secrets:
+        - gennifer_key
+    environment:
+        - SECRET_KEY_FILE=/run/secrets/gennifer_key
+        - CELERY_BROKER_URL=redis://redis:6379/0
+        - CELERY_RESULT_BACKEND=redis://redis:6379/0
+        - PYTHONUNBUFFERED=1
+          #command: gunicorn -c gunicorn.config.py -b 0.0.0.0:5000 'pidc:create_app()'
+    command: flask --app grisli run --debug --host 0.0.0.0
+    depends_on:
+        - redis
+
+  worker-grisli:
+    build: 
+        context: ./gennifer/grisli
+        dockerfile: Dockerfile
+    command: celery --app grisli.tasks.celery worker -Q grisli --loglevel=info
+    environment:
+        - CELERY_BROKER_URL=redis://redis:6379/0
+        - CELERY_RESULT_BACKEND=redis://redis:6379/0
+        - PYTHONUNBUFFERED=1
+    depends_on:
+        - grisli
+        - redis
+
+  genie3:
+    build:
+        context: ./gennifer/genie3
+        dockerfile: Dockerfile
+    restart: always
+    user: gennifer_user
+    ports:
+        - 5006:5000
+    secrets:
+        - gennifer_key
+    environment:
+        - SECRET_KEY_FILE=/run/secrets/gennifer_key
+        - CELERY_BROKER_URL=redis://redis:6379/0
+        - CELERY_RESULT_BACKEND=redis://redis:6379/0
+          #command: gunicorn -c gunicorn.config.py -b 0.0.0.0:5000 'genie3:create_app()'
+    command: flask --app genie3 run --debug --host 0.0.0.0
+    depends_on:
+        - redis
+
+  worker-genie3:
+    build:
+        context: ./gennifer/genie3
+        dockerfile: Dockerfile
+    command: celery --app genie3.tasks.celery worker -Q genie3 --loglevel=info
+    environment:
+        - CELERY_BROKER_URL=redis://redis:6379/0
+        - CELERY_RESULT_BACKEND=redis://redis:6379/0
+    depends_on:
+        - genie3
+        - redis
+
+  grnboost2:
+    build:
+        context: ./gennifer/grnboost2
+        dockerfile: Dockerfile
+    restart: always
+    user: gennifer_user
+    ports:
+        - 5007:5000
+    secrets:
+        - gennifer_key
+    environment:
+        - SECRET_KEY_FILE=/run/secrets/gennifer_key
+        - CELERY_BROKER_URL=redis://redis:6379/0
+        - CELERY_RESULT_BACKEND=redis://redis:6379/0
+          #command: gunicorn -c gunicorn.config.py -b 0.0.0.0:5000 'grnboost2:create_app()'
+    command: flask --app grnboost2 run --debug --host 0.0.0.0
+    depends_on:
+        - redis
+
+  worker-grnboost2:
+    build:
+        context: ./gennifer/grnboost2
+        dockerfile: Dockerfile
+    command: celery --app grnboost2.tasks.celery worker -Q grnboost2 --loglevel=info
+    environment:
+        - CELERY_BROKER_URL=redis://redis:6379/0
+        - CELERY_RESULT_BACKEND=redis://redis:6379/0
+    depends_on:
+        - grnboost2
+        - redis
 
 secrets:
   gennifer_key:

diff --git a/gennifer-sample.json b/gennifer-sample.json
@@ -6,6 +6,11 @@
             "algorithm_name": "pidc",
             "zenodo_id":"7988181",
             "hyperparameters": null
-        }
+        },
+	{
+	    "algorithm_name": "grisli",
+	    "zenodo_id":"8057216",
+	    "hyperparameters": null
+	}
     ]
 }