From 8279dcbef3b2eb4cb613a49c834a1d8220a345cf Mon Sep 17 00:00:00 2001
From: Dustin Jenkins <djenkins.cadc@gmail.com>
Date: Mon, 12 Dec 2022 17:14:03 -0800
Subject: [PATCH 1/4] Build on release.

---
 .github/workflows/build.yml  | 17 ++++++++++++
 .github/workflows/docker.yml | 50 ++++++++++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+)
 create mode 100644 .github/workflows/build.yml
 create mode 100644 .github/workflows/docker.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 0000000..b48f113
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,17 @@
+name: GEMINI CAOM-2 image build
+
+on:
+  release:
+
+jobs:
+  #
+  # Package jobs
+  #
+  package:
+    uses: ./.github/workflows/docker.yml
+    secrets: inherit
+    with:
+      name: gem2caom2
+  #
+  # End Package Jobs
+  #
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
new file mode 100644
index 0000000..71dc787
--- /dev/null
+++ b/.github/workflows/docker.yml
@@ -0,0 +1,50 @@
+name: Docker build and push workflow
+
+env:
+  # Allow the set-env command below
+  ACTIONS_ALLOW_UNSECURE_COMMANDS: true
+
+on:
+  workflow_call:
+    inputs:
+      name:
+        required: true
+        type: string
+    secrets:
+      CI_REGISTRY_USER:
+        required: true
+      CI_REGISTRY_TOKEN:
+        required: true
+      CI_REGISTRY_ORGANIZATION:
+        required: true
+
+jobs:
+  docker-build-publish:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v2
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      -
+        name: Set up Docker BuildX
+        uses: docker/setup-buildx-action@v2
+      -
+        name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.CI_REGISTRY_USER }}
+          password: ${{ secrets.CI_REGISTRY_TOKEN }}
+      -
+        name: Set Docker tag
+        run: |
+          echo "::set-env name=TS_TAG::$(date +'%Y%m%d%H%M')"
+      -
+        name: Build and push
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          push: true
+          tags: ${{ secrets.CI_REGISTRY_ORGANIZATION }}/${{ inputs.name }}:latest, ${{ secrets.CI_REGISTRY_ORGANIZATION }}/${{ inputs.name }}:${TS_TAG}

From b53a9515332a8b0f15369c50ffec6414d97ce443 Mon Sep 17 00:00:00 2001
From: Dustin Jenkins <djenkins.cadc@gmail.com>
Date: Mon, 12 Dec 2022 17:17:37 -0800
Subject: [PATCH 2/4] Timestamp tag.

---
 .github/workflows/docker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 71dc787..e0ba648 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -40,7 +40,7 @@ jobs:
       -
         name: Set Docker tag
         run: |
-          echo "::set-env name=TS_TAG::$(date +'%Y%m%d%H%M')"
+          TS_TAG=$(date +'%Y%m%d%H%M')
       -
         name: Build and push
         uses: docker/build-push-action@v3

From 2d86e1cc48e96604d883d4ba4bb684b33ba39722 Mon Sep 17 00:00:00 2001
From: Dustin Jenkins <djenkins.cadc@gmail.com>
Date: Mon, 12 Dec 2022 17:26:22 -0800
Subject: [PATCH 3/4] Build fixes.

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

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index e0ba648..be5747e 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -40,11 +40,12 @@ jobs:
       -
         name: Set Docker tag
         run: |
-          TS_TAG=$(date +'%Y%m%d%H%M')
+          _TS_TAG=$(date +'%Y%m%d%H%M')
+          echo "::set-env name=TS_TAG::$_TS_TAG"
       -
         name: Build and push
         uses: docker/build-push-action@v3
         with:
           context: .
           push: true
-          tags: ${{ secrets.CI_REGISTRY_ORGANIZATION }}/${{ inputs.name }}:latest, ${{ secrets.CI_REGISTRY_ORGANIZATION }}/${{ inputs.name }}:${TS_TAG}
+          tags: ${{ secrets.CI_REGISTRY_ORGANIZATION }}/${{ inputs.name }}:latest, ${{ secrets.CI_REGISTRY_ORGANIZATION }}/${{ inputs.name }}:${{ env.TS_TAG }}

From 74d6547d0886babd2c37111471bd96175da1bd20 Mon Sep 17 00:00:00 2001
From: Dustin Jenkins <djenkins.cadc@gmail.com>
Date: Wed, 8 Jan 2025 13:06:02 -0800
Subject: [PATCH 4/4] ci: add docker build and push

---
 .github/workflows/docker.yml | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index be5747e..bfe46b2 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -24,16 +24,10 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      -
-        name: Set up Docker BuildX
-        uses: docker/setup-buildx-action@v2
+        uses: actions/checkout@v4
       -
         name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.CI_REGISTRY_USER }}
           password: ${{ secrets.CI_REGISTRY_TOKEN }}
@@ -44,7 +38,7 @@ jobs:
           echo "::set-env name=TS_TAG::$_TS_TAG"
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: true