From bdefa84f145b28fea615174ecfb8e3288c607010 Mon Sep 17 00:00:00 2001
From: Daniel Hollas <daniel.hollas@bristol.ac.uk>
Date: Fri, 19 Jul 2024 12:22:09 +0100
Subject: [PATCH] Fix Docker build on main branch (#779)

---
 .github/workflows/docker-build-test-upload.yml | 4 ++--
 tests_integration/docker-compose.yml           | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/docker-build-test-upload.yml b/.github/workflows/docker-build-test-upload.yml
index ab62a71fb..c285cf4d0 100644
--- 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
index 9a5a6809b..cd9e4f03c 100644
--- 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