fix: update to use DMSS internal redis

equinor · May 8, 2024 · d5f65b9 · d5f65b9
1 parent a1a9509
commit d5f65b9
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 18 deletions.
diff --git a/example/app/data_sources/DemoDataSource.json b/example/app/data_sources/DemoDataSource.json
@@ -8,7 +8,7 @@
       "data_types": ["blob"],
       "database": "DemoDataSource",
       "host": "db",
-      "password": "xd7wCEhEx4kszsecYFfC",
+      "password": "maf",
       "port": 27017,
       "tls": false,
       "username": "maf"

diff --git a/example/app/data_sources/ExtraDataSource.json b/example/app/data_sources/ExtraDataSource.json
@@ -7,7 +7,7 @@
       "data_types": [],
       "database": "ExtraDataSource",
       "host": "db",
-      "password": "xd7wCEhEx4kszsecYFfC",
+      "password": "maf",
       "port": 27017,
       "tls": false,
       "username": "maf"

diff --git a/example/docker-compose.yaml b/example/docker-compose.yaml
@@ -1,29 +1,28 @@
-version: '3.4'
-
 services:
   dmss:
     image: datamodelingtool.azurecr.io/dmss:${DMSS_TAG:-latest}
     platform: linux/amd64
     restart: unless-stopped
     environment:
       AUTH_ENABLED: 0
+      REDIS_PASSWORD: maf
+      MONGO_PASSWORD: maf
       ENVIRONMENT: ${ENVIRONMENT:-local}
 #      RESET_DATA_SOURCE: off
-      MONGO_USERNAME: maf
-      MONGO_PASSWORD: xd7wCEhEx4kszsecYFfC
       SECRET_KEY: sg9aeUM5i1JO4gNN8fQadokJa3_gXQMLBjSGGYcfscs= # Don't reuse this in production...
 #    volumes:
 #      - ../../data-modelling-storage-service/src:/code/src
     ports:
       - '5000:5000'
     depends_on:
       - db
+      - redis
 
   db:
     image: mongo:3.6
     environment:
       MONGO_INITDB_ROOT_USERNAME: maf
-      MONGO_INITDB_ROOT_PASSWORD: xd7wCEhEx4kszsecYFfC
+      MONGO_INITDB_ROOT_PASSWORD: maf
     volumes:
       - ./dmss-data/db:/data/db
 
@@ -33,22 +32,20 @@ services:
     restart: unless-stopped
     environment:
       SCHEDULER_ENVS_TO_EXPORT: 'PUBLIC_DMSS_API,SIMA_LICENSE'
-      SCHEDULER_REDIS_HOST: job-store
-      SCHEDULER_REDIS_PORT: 6379
-      SCHEDULER_REDIS_SSL: 'false'
+      SCHEDULER_REDIS_HOST: redis
+      SCHEDULER_REDIS_PASSWORD: maf
       DMSS_API: http://dmss:5000
-      API_DEBUG: 1
       AUTH_ENABLED: 0
       ENVIRONMENT: local
       AZURE_JOB_SUBSCRIPTION: 14d57366-b2ae-4da8-8b75-e273c6fdabe2
       AZURE_JOB_RESOURCE_GROUP: dmt-test-containers
       AZURE_SP_SECRET: ${AZURE_SP_SECRET}
       AZURE_JOB_TENANT_ID: 3aa4a235-b6e2-48d5-9195-7fcf05b459b0
       AZURE_JOB_CLIENT_ID: 97a6b5bd-63fb-42c6-bb75-7e5de2394ba0
-      MONGO_PASSWORD: xd7wCEhEx4kszsecYFfC
+      MONGO_PASSWORD: maf
       #SIMA_LICENSE: |
     depends_on:
-      - job-store
+      - redis
       - db
     volumes:
 #      - /var/run/docker.sock:/var/run/docker.sock # Needed for docker-in-docker jobs
@@ -69,8 +66,9 @@ services:
   #      ME_CONFIG_MONGODB_ADMINPASSWORD: xd7wCEhEx4kszsecYFfC
   #      ME_CONFIG_MONGODB_ENABLE_ADMIN: "true"
 
-  job-store:
-    image: redis:6.2.5-alpine
-    command: 'redis-server --save 30 1 --loglevel notice'
-    #    volumes:
-    #     - ./redis_data:/data
+  redis:
+    image: bitnami/redis:latest
+    environment:
+      REDIS_PASSWORD: maf
+      #    volumes:
+      #     - ./dmss-data/redis:/bitnami