Fix docker compose UI (#1099)

OasisLMF · Aug 7, 2024 · cb316c7 · cb316c7
1 parent 8c66a88
commit cb316c7
Showing 1 changed file with 6 additions and 15 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -4,8 +4,11 @@ volumes:
   celery-db-OasisData:
   filestore-OasisData:
 x-shared-env: &shared-env
-  OASIS_DEBUG: 1
-  OASIS_URL_SUB_PATH: 0
+  OASIS_DEBUG: 0
+  OASIS_KEEP_RUN_DIR: 0
+  OASIS_KEEP_LOCAL_DATA: 0
+  OASIS_KEEP_REMOTE_DATA: 0
+  OASIS_URL_SUB_PATH: 1
   OASIS_CELERY_BROKER_URL: "amqp://rabbit:rabbit@broker:5672"
   #OASIS_CELERY_BROKER_URL: "redis://broker:6379"
   OASIS_SERVER_DB_HOST: server-db
@@ -60,7 +63,6 @@ services:
      OASIS_ADMIN_PASS: password
    volumes:
      - filestore-OasisData:/shared-fs:rw
-     - ./src/server/oasisapi:/var/www/oasis/src/server/oasisapi
   server_websocket:
    restart: always
    image: coreoasis/api_server:dev
@@ -75,7 +77,6 @@ services:
      <<: *shared-env
    volumes:
      - filestore-OasisData:/shared-fs:rw
-     - ./src/server/oasisapi:/var/www/oasis/src/server/oasisapi
   v1-worker-monitor:
    restart: always
    image: coreoasis/api_server:dev
@@ -88,7 +89,6 @@ services:
      <<: *shared-env
    volumes:
      - filestore-OasisData:/shared-fs:rw
-     - ./src/server/oasisapi:/var/www/oasis/src/server/oasisapi
   v2-worker-monitor:
    restart: always
    image: coreoasis/api_server:dev
@@ -101,7 +101,6 @@ services:
      <<: *shared-env
    volumes:
      - filestore-OasisData:/shared-fs:rw
-     - ./src/server/oasisapi:/var/www/oasis/src/server/oasisapi
   v2-task-controller:
    restart: always
    image: coreoasis/api_server:dev
@@ -114,7 +113,6 @@ services:
      <<: *shared-env
    volumes:
      - filestore-OasisData:/shared-fs:rw
-     - ./src/server/oasisapi/analyses:/var/www/oasis/src/server/oasisapi/analyses
   celery-beat_v2:
    restart: always
    image: coreoasis/api_server:dev
@@ -158,7 +156,6 @@ services:
      OASIS_RUN_MODE: v1
     volumes:
      - ${OASIS_MODEL_DATA_DIR:-./data/static}:/home/worker/model:rw
-     - ./src/model_execution_worker:/home/worker/src/model_execution_worker
      - filestore-OasisData:/shared-fs:rw
   v2-worker:
     restart: always
@@ -177,7 +174,6 @@ services:
      OASIS_RUN_MODE: v2
     volumes:
      - ${OASIS_MODEL_DATA_DIR:-./data/static}:/home/worker/model:rw
-     - ./src/model_execution_worker:/home/worker/src/model_execution_worker
      - filestore-OasisData:/shared-fs:rw
   server-db:
     restart: always
@@ -189,7 +185,7 @@ services:
     volumes:
       - server-db-OasisData:/var/lib/postgresql/data:rw
     ports:
-      - 33307:3306
+      - 33307:5432
   celery-db:
     restart: always
     image: postgres
@@ -201,11 +197,6 @@ services:
       - celery-db-OasisData:/var/lib/postgresql/data:rw
     ports:
       - 33306:5432
-#  broker:
-#    restart: always
-#    image: redis:5.0.7
-#    ports:
-#      - 5672:6379
   broker:
     restart: always
     image: rabbitmq:3.8.14-management