Merge branch 'master' into develop

KPMP · Mar 26, 2024 · 2d36b0d · 2d36b0d
2 parents 2be18c8 + a64907c
commit 2d36b0d
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 1 deletion.
diff --git a/atlas/knowledge-environment/docker-compose.dev.yml b/atlas/knowledge-environment/docker-compose.dev.yml
@@ -99,6 +99,9 @@ services:
       - MINIO_ACCESS_KEY=${ENV_MINIO_ACCESS_KEY}
       - MINIO_SECRET_KEY=${ENV_MINIO_SECRET_KEY}
       - MINIO_URL=${ENV_MINIO_URL}
+      - MYSQL_HOST=${ENV_MYSQL_HOST}
+      - MYSQL_USER=${ENV_MYSQL_USER}
+      - MYSQL_PASSWORD=${ENV_MYSQL_PASSWORD}      
       - BUCKET_NAME=${ENV_BUCKET_NAME}
       - MYSQL_HOST=${ENV_MYSQL_HOST}
       - MYSQL_USER=${ENV_MYSQL_USER}

diff --git a/atlas/knowledge-environment/docker-compose.local.yml b/atlas/knowledge-environment/docker-compose.local.yml
@@ -124,6 +124,9 @@ services:
       - MINIO_ACCESS_KEY=${ENV_MINIO_ACCESS_KEY}
       - MINIO_SECRET_KEY=${ENV_MINIO_SECRET_KEY}
       - MINIO_URL=${ENV_MINIO_URL}
+      - MYSQL_HOST=${ENV_MYSQL_HOST}
+      - MYSQL_USER=${ENV_MYSQL_USER}
+      - MYSQL_PASSWORD=${ENV_MYSQL_PASSWORD}      
       - BUCKET_NAME=${ENV_BUCKET_NAME}
       - MYSQL_HOST=${ENV_MYSQL_HOST}
       - MYSQL_USER=${ENV_MYSQL_USER}

diff --git a/atlas/knowledge-environment/docker-compose.prod.yml b/atlas/knowledge-environment/docker-compose.prod.yml
@@ -129,6 +129,9 @@ services:
       - MINIO_ACCESS_KEY=${ENV_MINIO_ACCESS_KEY}
       - MINIO_SECRET_KEY=${ENV_MINIO_SECRET_KEY}
       - MINIO_URL=${ENV_MINIO_URL}
+      - MYSQL_HOST=${ENV_MYSQL_HOST}
+      - MYSQL_USER=${ENV_MYSQL_USER}
+      - MYSQL_PASSWORD=${ENV_MYSQL_PASSWORD}      
       - BUCKET_NAME=${ENV_BUCKET_NAME}
       - MYSQL_HOST=${ENV_MYSQL_HOST}
       - MYSQL_USER=${ENV_MYSQL_USER}

diff --git a/eridanus/docker-compose.prod.yml b/eridanus/docker-compose.prod.yml
@@ -38,7 +38,7 @@ services:
 
   mariadb:
     container_name: eridanus-mariadb
-    image: mariadb
+    image: mariadb:10.8.2
     restart: always
     environment:
       MYSQL_ROOT_PASSWORD: ${ENV_MYSQL_PASSWORD}

diff --git a/libra/docker-compose.prod.yml b/libra/docker-compose.prod.yml
@@ -5,6 +5,7 @@ services:
     container_name: data-manager-service
     image: ${ENV_DMD_SERVICE_CONTAINER}
     entrypoint: ["flask", "run"]
+    restart: unless-stopped
     expose:
       - 5000
     environment: