From e0309230e2d2754c42930dd123e1b9979960a3bb Mon Sep 17 00:00:00 2001
From: Nicholas Devenish <ndevenish@gmail.com>
Date: Fri, 12 Dec 2025 10:05:51 +0000
Subject: [PATCH 1/5] Add a "Build Image" Github action

---
 .github/workflows/docker-image.yml | 31 ++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 .github/workflows/docker-image.yml

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
new file mode 100644
index 000000000..4a5c7e22d
--- /dev/null
+++ b/.github/workflows/docker-image.yml
@@ -0,0 +1,31 @@
+name: Docker Image CI
+
+on:
+  push:
+    branches: ["main"]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Get commit ID
+        id: vars
+        run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+      - name: Build and push Docker image
+        id: push
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          platforms: linux/amd64
+          tags: ghcr.io/diamondlightsource/python-dlstbx:latest,ghcr.io/diamondlightsource/python-dlstbx:${{ steps.vars.outputs.sha_short }}

From 2c3e0ef851bb1d6a79165f2af2203f232fdbfa68 Mon Sep 17 00:00:00 2001
From: Nicholas Devenish <ndevenish@gmail.com>
Date: Fri, 12 Dec 2025 10:06:31 +0000
Subject: [PATCH 2/5] enable pull_request for testing

---
 .github/workflows/docker-image.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 4a5c7e22d..3e4bed6cf 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -3,7 +3,9 @@ name: Docker Image CI
 on:
   push:
     branches: ["main"]
-
+  pull_request:
+    branches: ["main"]
+    
 jobs:
   build:
     runs-on: ubuntu-latest

From 3368daaaf80f44894848a39ce1be37f1a73474b3 Mon Sep 17 00:00:00 2001
From: Nicholas Devenish <ndevenish@gmail.com>
Date: Fri, 12 Dec 2025 10:08:59 +0000
Subject: [PATCH 3/5] Use Dockerhub directly instead of Harbor

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 70acbc470..c2df12a04 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM harbor.diamond.ac.uk/dockerhub-cache/dials/dials:latest
+FROM dials/dials:latest
 
 RUN yum install bzip2 libXxf86vm rrdtool git -y
 RUN pip install patchelf

From bc801809e954af2b8405b21bd018556a989ca629 Mon Sep 17 00:00:00 2001
From: Nicholas Devenish <ndevenish@gmail.com>
Date: Fri, 12 Dec 2025 10:18:15 +0000
Subject: [PATCH 4/5] Try to rename image to plain 'dlstbx'

---
 .github/workflows/docker-image.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 3e4bed6cf..d01a12629 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -5,7 +5,7 @@ on:
     branches: ["main"]
   pull_request:
     branches: ["main"]
-    
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -30,4 +30,4 @@ jobs:
           context: .
           push: true
           platforms: linux/amd64
-          tags: ghcr.io/diamondlightsource/python-dlstbx:latest,ghcr.io/diamondlightsource/python-dlstbx:${{ steps.vars.outputs.sha_short }}
+          tags: ghcr.io/diamondlightsource/dlstbx:latest,ghcr.io/diamondlightsource/dlstbx:${{ steps.vars.outputs.sha_short }}

From 1e8c9dfbe34e07e1df1c034442ef7fe2c1a36328 Mon Sep 17 00:00:00 2001
From: Nicholas Devenish <ndevenish@gmail.com>
Date: Fri, 12 Dec 2025 10:58:31 +0000
Subject: [PATCH 5/5] Go back to main builds only

---
 .github/workflows/docker-image.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index d01a12629..f668cb6b1 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -3,8 +3,6 @@ name: Docker Image CI
 on:
   push:
     branches: ["main"]
-  pull_request:
-    branches: ["main"]
 
 jobs:
   build: