Try with separate compose file

UtrechtUniversity · May 22, 2024 · 4eadada · 4eadada
1 parent 4b3bd21
commit 4eadada
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 38 deletions.
diff --git a/molecule/default/prepare.yml b/molecule/default/prepare.yml
@@ -7,44 +7,7 @@
       delegate_to: localhost
       community.docker.docker_compose_v2:
         project_name: ibridges_irods_test
-        cli_context:  ../../docker/irods_catalog
-        definition:
-          networks:
-            common_network:
-              name: "{{ lookup('env', 'test_network_name')}}"
-              external: true
-          services:
-            irods-catalog:
-              image: irods-catalog
-              networks:
-                - common_network
-              # build:
-              #     context: ./docker/irods_catalog
-              environment:
-                  - POSTGRES_PASSWORD=testpassword
-            irods-catalog-provider:
-              image: irods-catalog-provider
-              networks:
-                - common_network
-              # build:
-              #     context: ./docker/irods_catalog_provider
-              # network_mode: host
-              depends_on:
-                  - irods-catalog
-            irods-client:
-              # network_mode: host
-              image: irods-client
-              platform: linux/amd64
-              build:
-                  # context: .
-                  dockerfile: ../../docker/irods_client/Dockerfile
-              depends_on:
-                  - irods-catalog-provider
-              tty: true
-              networks:
-                - common_network
-              environment:
-                - CI=1
+        project_src: ../files/
 
     - name: Install ibridges
       ansible.builtin.pip:

diff --git a/molecule/files/docker-compose.yml b/molecule/files/docker-compose.yml
@@ -0,0 +1,35 @@
+version: '3'
+networks:
+  common_network:
+    name: "{{ lookup('env', 'test_network_name')}}"
+    external: true
+services:
+  irods-catalog:
+    image: irods-catalog
+    networks:
+      - common_network
+    build:
+        context: ../../docker/irods_catalog
+    environment:
+        - POSTGRES_PASSWORD=testpassword
+  irods-catalog-provider:
+    image: irods-catalog-provider
+    networks:
+      - common_network
+    build:
+        context: ../../docker/irods_catalog_provider
+    depends_on:
+        - irods-catalog
+  irods-client:
+    image: irods-client
+    platform: linux/amd64
+    build:
+        context: .
+        dockerfile: ../../docker/irods_client/Dockerfile
+    depends_on:
+        - irods-catalog-provider
+    tty: true
+    networks:
+      - common_network
+    environment:
+      - CI=1