Fix multistage build

Matgenix · Sep 9, 2024 · 7577c6c · 7577c6c
1 parent d7c5538
commit 7577c6c
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 140 deletions.
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -46,7 +46,7 @@ jobs:
       - name: Build test bench container
         uses: docker/bake-action@v5
         with:
-          load: true 
+          load: true
           files: tests/integration/dockerfiles/docker-bake.hcl
           set: |
             *.cache-to=type=gha,scope=global,mode=max
@@ -59,6 +59,7 @@ jobs:
         ports:
           - 27017:27017
 
+    needs: [build-test-bench]
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -74,6 +75,17 @@ jobs:
           cache: pip
           cache-dependency-path: pyproject.toml
 
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Load test bench containers
+        uses: docker/bake-action@v5
+        with:
+          load: true
+          files: tests/integration/dockerfiles/docker-bake.hcl
+          set: |
+            *.cache-from=type=gha,scope=global
+
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip

diff --git a/...gration/dockerfiles/Dockerfile.multistage → tests/integration/dockerfiles/Dockerfile b/...gration/dockerfiles/Dockerfile.multistage → tests/integration/dockerfiles/Dockerfile
@@ -91,4 +91,4 @@ RUN mkdir jfr
 USER root
 RUN chmod +x /etc/startup.sh && dos2unix /etc/startup.sh
 USER ${USERNAME}
-CMD "sudo /etc/startup.sh ; /bin/bash -l"
+CMD sudo /etc/startup.sh ; /bin/bash -l
diff --git a/tests/integration/dockerfiles/Dockerfile.sge b/tests/integration/dockerfiles/Dockerfile.sge
diff --git a/tests/integration/dockerfiles/Dockerfile.slurm b/tests/integration/dockerfiles/Dockerfile.slurm
diff --git a/tests/integration/dockerfiles/docker-bake.hcl b/tests/integration/dockerfiles/docker-bake.hcl
@@ -6,7 +6,7 @@ group "default" {
 }
 
 target "slurm" {
-    dockerfile = "./tests/integration/dockerfiles/Dockerfile.slurm"
+    dockerfile = "./tests/integration/dockerfiles/Dockerfile"
     args = {
         QUEUE_SYSTEM = "slurm"
     }
@@ -16,7 +16,7 @@ target "slurm" {
 }
 
 target "sge" {
-    dockerfile = "./tests/integration/dockerfiles/Dockerfile.sge"
+    dockerfile = "./tests/integration/dockerfiles/Dockerfile"
     args = {
         QUEUE_SYSTEM = "sge"
     }