From 94338263b5b98dc4d174e214fa692699792407ed Mon Sep 17 00:00:00 2001
From: Manuel Giffels <giffels@gmail.com>
Date: Fri, 10 Nov 2023 09:31:29 +0100
Subject: [PATCH] Fix docker image builds for new releases

---
 .github/workflows/docker-builds.yml | 6 +++---
 docs/source/changelog.rst           | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/docker-builds.yml b/.github/workflows/docker-builds.yml
index a5d5e8ec..dcc501e7 100644
--- a/.github/workflows/docker-builds.yml
+++ b/.github/workflows/docker-builds.yml
@@ -3,7 +3,7 @@ name: Docker Builds
 on:
   push:
     branches:
-      - '**'
+      - 'master'
     tags:
       - '*.*.*'
   pull_request:
@@ -52,7 +52,7 @@ jobs:
               type=raw,value=latest
             images: matterminers/${{ matrix.containers }}
         - name: Login to DockerHub
-          if: github.repository == 'MatterMiners/tardis' && github.ref == 'refs/heads/master'
+          if: github.repository == 'MatterMiners/tardis' && github.event_name != 'pull_request'
           uses: docker/login-action@v2
           with:
             username: ${{ secrets.DOCKERHUB_USERNAME }}
@@ -62,7 +62,7 @@ jobs:
           uses: docker/build-push-action@v4
           with:
             context: containers/${{ matrix.containers }}
-            push: ${{ github.repository == 'MatterMiners/tardis' && github.ref == 'refs/heads/master' }}
+            push: ${{ github.repository == 'MatterMiners/tardis' && github.event_name != 'pull_request' }}
             file: containers/${{ matrix.containers }}/Dockerfile
             tags: ${{ steps.meta.outputs.tags }}
             build-args: |
diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst
index 81f23278..2d48c61e 100644
--- a/docs/source/changelog.rst
+++ b/docs/source/changelog.rst
@@ -1,4 +1,4 @@
-.. Created by changelog.py at 2023-10-10, command
+.. Created by changelog.py at 2023-11-10, command
    '/Users/giffler/.cache/pre-commit/repor6pnmwlm/py_env-python3.10/bin/changelog docs/source/changes compile --categories Added Changed Fixed Security Deprecated --output=docs/source/changelog.rst'
    based on the format of 'https://keepachangelog.com/'