Merge pull request #296 from silinternational/rm-data

remove the data container from Docker Compose environment
silinternational · Nov 21, 2024 · dad8108 · dad8108
2 parents 81fc511 + 4a792f5
commit dad8108
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 19 deletions.
diff --git a/actions-services.yml b/actions-services.yml
@@ -1,6 +1,6 @@
 services:
   db:
-    image: mariadb:latest
+    image: mariadb:10
     environment:
       MYSQL_ROOT_PASSWORD: r00tp@ss!
       MYSQL_DATABASE: test

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,20 +1,15 @@
 services:
-  data:
-    image: silintl/data-volume:latest
-    volumes:
-      - ./application:/data
-    user: "${DOCKER_UIDGID}"
 
   db:
-    image: mariadb:latest
+    image: mariadb:10
     environment:
       MYSQL_ROOT_PASSWORD: r00tp@ss!
       MYSQL_DATABASE: pwmgr
       MYSQL_USER: idpmgmt
       MYSQL_PASSWORD: idpmgmt
 
   testDb:
-    image: mariadb:latest
+    image: mariadb:10
     environment:
       MYSQL_ROOT_PASSWORD: r00tp@ss!
       MYSQL_DATABASE: test
@@ -32,8 +27,8 @@ services:
 
   api:
     build: ./
-    volumes_from:
-      - data
+    volumes:
+      - ./application:/data
     ports:
       - "51155:80"
     depends_on:
@@ -45,8 +40,8 @@ services:
 
   apitest:
     build: ./
-    volumes_from:
-      - data
+    volumes:
+      - ./application:/data
     depends_on:
       - testDb
       - zxcvbn
@@ -63,9 +58,8 @@ services:
 
   unittest:
     build: ./
-    volumes_from:
-      - data
     volumes:
+      - ./application:/data
       - ./dockerbuild/dev-ldap.conf:/etc/ldap/ldap.conf
     depends_on:
       - testDb
@@ -82,9 +76,8 @@ services:
 
   integrationtest:
     build: ./
-    volumes_from:
-      - data
     volumes:
+      - ./application:/data
       - ./dockerbuild/dev-ldap.conf:/etc/ldap/ldap.conf
     depends_on:
       - testDb
@@ -102,9 +95,8 @@ services:
 
   cli:
     build: ./
-    volumes_from:
-      - data
     volumes:
+      - ./application:/data
       - ${COMPOSER_CACHE_DIR}:/composer
     working_dir: /data
     user: "${DOCKER_UIDGID}"
@@ -153,7 +145,7 @@ services:
     image: wcjr/zxcvbn-api:1.1.0
 
   brokerDb:
-    image: mariadb:latest
+    image: mariadb:10
     environment:
       MYSQL_ROOT_PASSWORD: r00tp@ss!
       MYSQL_DATABASE: broker