From 46d10df87014d8b7ea3c2f78f7f71bd8760515d6 Mon Sep 17 00:00:00 2001
From: Alexandru Mahmoud <almahmoud@jhu.edu>
Date: Thu, 16 Sep 2021 17:01:51 -0400
Subject: [PATCH 1/2] Add image building workflow

Remove 'release_' from branch names

Change branch name

Add quay

Quay login
---
 .github/workflows/build_image.yaml | 45 ++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 .github/workflows/build_image.yaml

diff --git a/.github/workflows/build_image.yaml b/.github/workflows/build_image.yaml
new file mode 100644
index 00000000000..47dab58409d
--- /dev/null
+++ b/.github/workflows/build_image.yaml
@@ -0,0 +1,45 @@
+name: Build Image
+on: push
+jobs:
+  test:
+    name: Build image
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      # https://stackoverflow.com/questions/59810838/how-to-get-the-short-sha-for-the-github-workflow
+      - name: Set outputs
+        id: vars
+        run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
+      - name: Set branch name
+        id: branch
+        run: echo "::set-output name=name::$(BRANCH_NAME=${GITHUB_REF##*/}; echo ${BRANCH_NAME/release_/}-auto)"
+      - name: Login to docker hub
+        uses: actions-hub/docker/login@master
+        env:
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+      - run: docker build . -t galaxy/galaxy-min:${{ steps.vars.outputs.sha_short }} -f .k8s_ci.Dockerfile
+      - name: Push to docker hub with commit ID
+        uses: actions-hub/docker@master
+        with:
+          args: push galaxy/galaxy-min:${{ steps.vars.outputs.sha_short }}
+      - run: docker tag galaxy/galaxy-min:${{ steps.vars.outputs.sha_short }} galaxy/galaxy-min:${{ steps.branch.outputs.name }}
+      - name: Push to docker hub with branch name
+        uses: actions-hub/docker@master
+        with:
+          args: push galaxy/galaxy-min:${{ steps.branch.outputs.name }}
+      - run: docker tag galaxy/galaxy-min:${{ steps.vars.outputs.sha_short }} quay.io/galaxy-k8s/galaxy:${{ steps.branch.outputs.name }} && docker tag galaxy/galaxy-min:${{ steps.vars.outputs.sha_short }} quay.io/galaxy-k8s/galaxy:${{ steps.vars.outputs.sha_short }}
+      - name: Login to docker hub
+        uses: actions-hub/docker/login@master
+        env:
+          DOCKER_USERNAME: ${{ secrets.QUAY_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.QUAY_PASSWORD }}
+          DOCKER_REGISTRY_URL: quay.io
+      - name: Push to quay.io with commit ID
+        uses: actions-hub/docker@master
+        with:
+          args: push quay.io/galaxy-k8s/galaxy:${{ steps.vars.outputs.sha_short }}
+      - name: Push to quay.io with branch name
+        uses: actions-hub/docker@master
+        with:
+          args: push quay.io/galaxy-k8s/galaxy:${{ steps.branch.outputs.name }}

From aa7b10e8f8f639225705a822e578de4b1302fd6e Mon Sep 17 00:00:00 2001
From: mvdbeek <m.vandenbeek@gmail.com>
Date: Mon, 1 Nov 2021 13:11:29 +0100
Subject: [PATCH 2/2] Only build docker image for galaxyproject repo

limit concurrency and only build for release and anvil branches.
---
 ...ild_image.yaml => build_container_image.yaml} | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)
 rename .github/workflows/{build_image.yaml => build_container_image.yaml} (89%)

diff --git a/.github/workflows/build_image.yaml b/.github/workflows/build_container_image.yaml
similarity index 89%
rename from .github/workflows/build_image.yaml
rename to .github/workflows/build_container_image.yaml
index 47dab58409d..3c11ea3f064 100644
--- a/.github/workflows/build_image.yaml
+++ b/.github/workflows/build_container_image.yaml
@@ -1,9 +1,17 @@
-name: Build Image
-on: push
+name: Build Container Image
+on:
+  push:
+    branches:
+      - 'release*'
+      - anvil
+concurrency:
+  group: docker-build-${{ github.ref }}
+  cancel-in-progress: true
 jobs:
-  test:
-    name: Build image
+  build:
+    name: Build container image
     runs-on: ubuntu-latest
+    if: github.repository_owner == 'galaxyproject'
     steps:
       - uses: actions/checkout@v2
       # https://stackoverflow.com/questions/59810838/how-to-get-the-short-sha-for-the-github-workflow