ci: build docker compose yaml instead

atsign-foundation · Sep 12, 2023 · 53d8249 · 53d8249
1 parent e71bbfc
commit 53d8249
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 46 deletions.
diff --git a/.github/workflows/end2end_tests.yaml b/.github/workflows/end2end_tests.yaml
@@ -556,12 +556,33 @@ jobs:
           cat sshnp/entrypoint.sh
           cat sshnpd/entrypoint.sh
 
+      - name: Build docker-compose.yaml
+        working-directory: tests/end2end_tests/tests
+        run: |
+          cat docker-compose-base.yaml > docker-compose.yaml
+          cat service-container-sshnp.yaml >> docker-compose.yaml
+          cat '    image: atsigncompany/sshnp-e2e-runtime:local' >> docker-compose.yaml
+          cat '    depends_on:' >> docker-compose.yaml
+          cat '      - image-runtime-local:' >> docker-compose.yaml
+          cat '      - container-sshnpd:' >> docker-compose.yaml
+          cat service-container-sshnpd.yaml >> docker-compose.yaml
+          cat '    image: atsigncompany/sshnp-e2e-runtime:local' >> docker-compose.yaml
+          cat '    depends_on:' >> docker-compose.yaml
+          cat '      - image-runtime-local:' >> docker-compose.yaml
+
+      - name: docker-compose.yaml
+        if: always()
+        working-directory: tests/end2end_tests/tests
+        run: |
+          cat docker-compose.yaml
+
       - name: Build
-        working-directory: tests/end2end_tests/tests/alternate_port_test
-        run: docker compose build
+        working-directory: tests/end2end_tests/tests
+        run: |
+          docker compose build
 
       - name: Test
-        working-directory: tests/end2end_tests/tests/alternate_port_test
+        working-directory: tests/end2end_tests/tests
         run: |
           ${{ env.DOCKER_COMPOSE_UP_CMD }}
 

diff --git a/tests/end2end_tests/tests/alternate_port_test/docker-compose.yaml b/tests/end2end_tests/tests/alternate_port_test/docker-compose.yaml