Fix Docker build on main branch (#779)

aiidalab · Jul 19, 2024 · bdefa84 · bdefa84
1 parent 71cf2ff
commit bdefa84
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/.github/workflows/docker-build-test-upload.yml b/.github/workflows/docker-build-test-upload.yml
@@ -57,8 +57,8 @@ jobs:
               uses: docker/build-push-action@v5
               with:
                   tags: ${{ steps.meta.outputs.tags }}
-                  load: ${{ github.event.pull_request.head.repo.fork }}
-                  push: ${{ ! github.event.pull_request.head.repo.fork }}
+                  load: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork }}
+                  push: ${{ ! (github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork) }}
                   context: .
                   platforms: linux/amd64
                   cache-to: |

diff --git a/tests_integration/docker-compose.yml b/tests_integration/docker-compose.yml
@@ -1,10 +1,8 @@
 ---
-version: '3.4'
-
 services:
 
     aiidalab:
-        image: ${REGISTRY:-}${QE_IMAGE:-aiidalab/qe}${TAG}
+        image: ${REGISTRY:-}${QE_IMAGE:-aiidalab/qe}${TAG:-}
         environment:
             TZ: Europe/Zurich
             DOCKER_STACKS_JUPYTER_CMD: notebook