Fix

OasisLMF · Jan 18, 2024 · 32d8fb0 · 32d8fb0
1 parent 420a777
commit 32d8fb0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/docker/plat2-v2.docker-compose.yml b/docker/plat2-v2.docker-compose.yml
@@ -134,7 +134,7 @@ services:
      OASIS_MODEL_SUPPLIER_ID: OasisLMF
      OASIS_MODEL_ID: PiWind
      OASIS_MODEL_VERSION_ID: 1
-     OASIS_API_VERSION: ${WORKER_API_VER:-v2}
+     OASIS_API_VERSION: ${WORKER_API_VER:-v1}
     volumes:
      - ../:/home/worker/model
      - filestore-OasisData:/shared-fs:rw

diff --git a/docker/plat2-v2.s3.docker-compose.yml b/docker/plat2-v2.s3.docker-compose.yml
@@ -4,9 +4,11 @@ volumes:
   server-db-OasisData:
   celery-db-OasisData:
 
-x-oasis-env: &oasis-env
+x-oasis-env: &server-env
   OASIS_DEBUG: 1
   OASIS_URL_SUB_PATH: 0
+  OASIS_ADMIN_USER: admin
+  OASIS_ADMIN_PASS: password
   OASIS_CELERY_BROKER_URL: "amqp://rabbit:rabbit@broker:5672"
   OASIS_SERVER_DB_HOST: server-db
   OASIS_SERVER_DB_PASS: oasis
@@ -21,6 +23,7 @@ x-oasis-env: &oasis-env
   OASIS_CELERY_DB_USER: celery
   OASIS_CELERY_DB_NAME: celery
   OASIS_CELERY_DB_PORT: 5432
+  STARTUP_RUN_MIGRATIONS: 'true'
   OASIS_INPUT_GENERATION_CONTROLLER_QUEUE: task-controller
   OASIS_LOSSES_GENERATION_CONTROLLER_QUEUE: task-controller
   OASIS_STORAGE_TYPE: S3
@@ -55,18 +58,18 @@ services:
 
   server:
     restart: always
-    image: ${SERVER_IMG:-coreoasis/api_server}:${SERVER_TAG:-2.1.0-dev}
+    image: ${SERVER_IMG:-coreoasis/api_server}:${SERVER_TAG:-dev}
     ports:
       - 8000:8000
     links:
       - server-db
       - celery-db
-      - rabbit
+      - broker
     environment:
-      <<: *oasis-env
+      <<: *server-env
   websocket:
     restart: always
-    image: ${SERVER_IMG:-coreoasis/api_server}:${SERVER_TAG:-2.1.0-dev}
+    image: ${SERVER_IMG:-coreoasis/api_server}:${SERVER_TAG:-dev}
     command: ["./asgi/run-asgi.sh"]
     links:
       - server-db
@@ -78,7 +81,7 @@ services:
       <<: *server-env
   v1-worker-monitor:
     restart: always
-    image: ${SERVER_IMG:-coreoasis/api_server}:${SERVER_TAG:-2.1.0-dev}
+    image: ${SERVER_IMG:-coreoasis/api_server}:${SERVER_TAG:-dev}
     command: [celery, -A, src.server.oasisapi.celery_app_v1, worker, --loglevel=INFO, -Q, celery]
     links:
       - server-db
@@ -88,7 +91,7 @@ services:
       <<: *server-env
   v2-worker-monitor:
     restart: always
-    image: ${SERVER_IMG:-coreoasis/api_server}:${SERVER_TAG:-2.1.0-dev}
+    image: ${SERVER_IMG:-coreoasis/api_server}:${SERVER_TAG:-dev}
     command: [celery, -A, src.server.oasisapi.celery_app_v2, worker, --loglevel=INFO, -Q, celery-v2]
     links:
       - server-db
@@ -98,7 +101,7 @@ services:
       <<: *server-env
   task-controller:
     restart: always
-    image: ${SERVER_IMG:-coreoasis/api_server}:${SERVER_TAG:-2.1.0-dev}
+    image: ${SERVER_IMG:-coreoasis/api_server}:${SERVER_TAG:-dev}
     command: [celery, -A, src.server.oasisapi.celery_app_v2, worker, --loglevel=INFO, -Q, task-controller]
     links:
       - server-db
@@ -108,7 +111,7 @@ services:
       <<: *server-env
   celery-beat:
     restart: always
-    image: ${SERVER_IMG:-coreoasis/api_server}:${SERVER_TAG:-2.1.0-dev}
+    image: ${SERVER_IMG:-coreoasis/api_server}:${SERVER_TAG:-dev}
     command: [celery, -A, src.server.oasisapi.celery_app_v2, beat, --loglevel=INFO]
     links:
       - server-db
@@ -118,7 +121,7 @@ services:
       <<: *server-env
   worker:
     restart: always
-    image: ${WORKER_IMG:-coreoasis/model_worker}:${WORKER_TAG:-2.1.0-dev}
+    image: ${WORKER_IMG:-coreoasis/model_worker}:${WORKER_TAG:-dev}
     links:
      - celery-db
      - broker:mybroker
@@ -127,7 +130,7 @@ services:
      OASIS_MODEL_SUPPLIER_ID: OasisLMF
      OASIS_MODEL_ID: PiWind
      OASIS_MODEL_VERSION_ID: 1
-     OASIS_API_VERSION: ${WORKER_API_VER:-v2}
+     OASIS_API_VERSION: ${WORKER_API_VER:-v1}
     volumes:
      - ../:/home/worker/model
   server-db: