add quay and release jobs

Signed-off-by: Mahendra Paipuri <[email protected]>
mahendrapaipuri · Apr 22, 2024 · 5e83792 · 5e83792
1 parent dae687c
commit 5e83792
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,6 +10,14 @@ on:
         type: string
         description: DockerHub organization
         default: mahendrapaipuri
+      quay_registry:
+        type: string
+        description: Quay registry
+        default: quay.io
+      quay_organization:
+        type: string
+        description: Quay organization
+        default: mahendrapaipuri
   push:
     paths:
       - "go.sum"
@@ -65,11 +73,14 @@ jobs:
       login: ${{ secrets.DOCKER_HUB_LOGIN }}
       password: ${{ secrets.DOCKER_HUB_PASSWORD }}
 
-  # quay:
-  #   needs: [build]
-  #   uses: ./.github/workflows/step_quay.yml
-  #   with:
-  #     registry: "quay.io"
-  #     organization: ${{ inputs.quay_organization }}
-  #     login: ${{ secrets.quay_login }}
-  #     password: ${{ secrets.quay_password }}
+  quay:
+    needs: [build]
+    uses: ./.github/workflows/step_docker.yml
+    # Since workflow_dispatch inputs are only available on manual triggers
+    # we need to set default values to the context vars here
+    with:
+      registry: ${{ inputs.quay_registry || 'quay.io' }}
+      organization: ${{ inputs.quay_organization || 'mahendrapaipuri' }}
+    secrets:  
+      login: ${{ secrets.QUAY_LOGIN }}
+      password: ${{ secrets.QUAY_PASSWORD }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,6 +1,24 @@
 name: Release
 
 on:
+  workflow_dispatch:
+    inputs:
+      docker_hub_registry:
+        type: string
+        description: DockerHub registry
+        default: docker.io
+      docker_hub_organization:
+        type: string
+        description: DockerHub organization
+        default: mahendrapaipuri
+      quay_registry:
+        type: string
+        description: Quay registry
+        default: quay.io
+      quay_organization:
+        type: string
+        description: Quay organization
+        default: mahendrapaipuri
   push:
     # Run workflow on new tags
     tags:
@@ -33,6 +51,30 @@ jobs:
     needs: [cross-build]
     uses: ./.github/workflows/step_packaging.yml
 
+  publish-docker-images:
+    needs: [cross-build]
+    uses: ./.github/workflows/step_docker.yml
+    # Since workflow_dispatch inputs are only available on manual triggers
+    # we need to set default values to the context vars here
+    with:
+      registry: ${{ inputs.quay_registry || 'docker.io' }}
+      organization: ${{ inputs.quay_organization || 'mahendrapaipuri' }}
+    secrets:  
+      login: ${{ secrets.DOCKER_HUB_LOGIN }}
+      password: ${{ secrets.DOCKER_HUB_PASSWORD }}
+
+  publish-quay-images:
+    needs: [cross-build]
+    uses: ./.github/workflows/step_docker.yml
+    # Since workflow_dispatch inputs are only available on manual triggers
+    # we need to set default values to the context vars here
+    with:
+      registry: ${{ inputs.quay_registry || 'quay.io' }}
+      organization: ${{ inputs.quay_organization || 'mahendrapaipuri' }}
+    secrets:  
+      login: ${{ secrets.QUAY_LOGIN }}
+      password: ${{ secrets.QUAY_PASSWORD }}
+
   publish:
     needs: [packaging]
     runs-on: ubuntu-latest

diff --git a/.github/workflows/step_docker.yml b/.github/workflows/step_docker.yml
@@ -47,17 +47,23 @@ jobs:
 
       - name: Build container images
         run: |
-          ls -la .build/linux-amd64
-          ls -la .build/linux-arm64
-          chmod +x -R .build
           make docker DOCKER_IMAGE_TAG=${{ steps.target_branch.outputs.name }} DOCKER_REPO=${{ inputs.registry }}/${{ inputs.organization }}
           docker images
 
       - name: Test container images
         run: make test-docker DOCKER_IMAGE_TAG=${{ steps.target_branch.outputs.name }} DOCKER_REPO=${{ inputs.registry }}/${{ inputs.organization }}
 
-      - name: Publish image for main branch
+      - name: Publish image for current branch/tag
+        if: github.ref == 'refs/heads/main'
         run: |
           echo ${{ secrets.password }} | docker login -u ${{ secrets.login }} --password-stdin ${{ inputs.registry }}
           make docker-publish DOCKER_IMAGE_TAG=${{ steps.target_branch.outputs.name }} DOCKER_REPO=${{ inputs.registry }}/${{ inputs.organization }}
           make docker-manifest DOCKER_IMAGE_TAG=${{ steps.target_branch.outputs.name }} DOCKER_REPO=${{ inputs.registry }}/${{ inputs.organization }}
+
+      - name: Publish image with latest tag
+        if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
+        run: |
+          echo ${{ secrets.password }} | docker login -u ${{ secrets.login }} --password-stdin ${{ inputs.registry }}
+          make docker-tag-latest DOCKER_IMAGE_TAG=${{ steps.target_branch.outputs.name }} DOCKER_REPO=${{ inputs.registry }}/${{ inputs.organization }}
+          make docker-publish DOCKER_IMAGE_TAG=latest DOCKER_REPO=${{ inputs.registry }}/${{ inputs.organization }}
+          make docker-manifest DOCKER_IMAGE_TAG=latest DOCKER_REPO=${{ inputs.registry }}/${{ inputs.organization }}