From 128fcc7f6a6fe8b440a3586731434959de3cc28f Mon Sep 17 00:00:00 2001
From: Ariya Hidayat <ariya@metabase.com>
Date: Wed, 3 May 2023 07:50:47 -0700
Subject: [PATCH] CI on container build: parametrize the Docker Hub
organization (#30500)
---
.github/workflows/uberjar.yml | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/.github/workflows/uberjar.yml b/.github/workflows/uberjar.yml
index ec85f08b424..e6e2dd55274 100644
--- a/.github/workflows/uberjar.yml
+++ b/.github/workflows/uberjar.yml
@@ -129,15 +129,15 @@ jobs:
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Retag and push images if master (ee)
if: ${{ (github.ref_name == 'master') && matrix.edition == 'ee' }}
- run: docker tag localhost:5000/metabase-dev:${{ steps.extract_branch.outputs.branch }}-ee metabase/metabase-enterprise-head:latest && docker push metabase/metabase-enterprise-head:latest
+ run: docker tag localhost:5000/metabase-dev:${{ steps.extract_branch.outputs.branch }}-ee ${{ github.repository_owner }}/metabase-enterprise-head:latest && docker push ${{ github.repository_owner }}/metabase-enterprise-head:latest
- name: Retag and push images if master (oss)
if: ${{ (github.ref_name == 'master') && matrix.edition == 'oss' }}
- run: docker tag localhost:5000/metabase-dev:${{ steps.extract_branch.outputs.branch }}-oss metabase/metabase-head:latest && docker push metabase/metabase-head:latest
+ run: docker tag localhost:5000/metabase-dev:${{ steps.extract_branch.outputs.branch }}-oss ${{ github.repository_owner }}/metabase-head:latest && docker push ${{ github.repository_owner }}/metabase-head:latest
- name: Retag and push images if dev branch
if: ${{ !(startsWith(github.ref_name,'master') || startsWith(github.ref_name,'backport')) && matrix.edition == 'ee' }}
- run: docker tag localhost:5000/metabase-dev:${{ steps.extract_branch.outputs.branch }}-ee metabase/metabase-dev:${{ steps.extract_branch.outputs.branch }} && docker push metabase/metabase-dev:${{ steps.extract_branch.outputs.branch }}
+ run: docker tag localhost:5000/metabase-dev:${{ steps.extract_branch.outputs.branch }}-ee ${{ github.repository_owner }}/metabase-dev:${{ steps.extract_branch.outputs.branch }} && docker push ${{ github.repository_owner }}/metabase-dev:${{ steps.extract_branch.outputs.branch }}
- name: Run Trivy vulnerability scanner if master (ee)
if: ${{ (github.ref_name == 'master') && matrix.edition == 'ee' }}
@@ -145,7 +145,7 @@ jobs:
env:
TRIVY_OFFLINE_SCAN: true
with:
- image-ref: docker.io/metabase/metabase-enterprise-head:latest
+ image-ref: docker.io/${{ github.repository_owner }}/metabase-enterprise-head:latest
format: sarif
output: trivy-results.sarif
@@ -155,7 +155,7 @@ jobs:
env:
TRIVY_OFFLINE_SCAN: true
with:
- image-ref: docker.io/metabase/metabase-head:latest
+ image-ref: docker.io/${{ github.repository_owner }}/metabase-head:latest
format: sarif
output: trivy-results.sarif
@@ -165,7 +165,7 @@ jobs:
env:
TRIVY_OFFLINE_SCAN: true
with:
- image-ref: docker.io/metabase/metabase-dev:${{ steps.extract_branch.outputs.branch }}
+ image-ref: docker.io/${{ github.repository_owner }}/metabase-dev:${{ steps.extract_branch.outputs.branch }}
format: sarif
output: trivy-results.sarif
@@ -259,7 +259,7 @@ jobs:
run: regctl registry set --tls disabled localhost:5000
- name: Retag and push ubuntu-based images if master (ee)
if: ${{ matrix.edition == 'ee' }}
- run: regctl image copy localhost:5000/metabase-dev:${{ steps.extract_branch.outputs.branch }}-ee-ubuntu metabase/metabase-enterprise-head:latest-ubuntu
+ run: regctl image copy localhost:5000/metabase-dev:${{ steps.extract_branch.outputs.branch }}-ee-ubuntu ${{ github.repository_owner }}/metabase-enterprise-head:latest-ubuntu
- name: Retag and push ubuntu-based images if master (oss)
if: ${{ matrix.edition == 'oss' }}
- run: regctl image copy localhost:5000/metabase-dev:${{ steps.extract_branch.outputs.branch }}-oss-ubuntu metabase/metabase-head:latest-ubuntu
+ run: regctl image copy localhost:5000/metabase-dev:${{ steps.extract_branch.outputs.branch }}-oss-ubuntu ${{ github.repository_owner }}/metabase-head:latest-ubuntu
--
GitLab