From 2537bca422371494812d3adfe1646c650bc98169 Mon Sep 17 00:00:00 2001 From: Jared Trouth Date: Tue, 19 Dec 2023 14:24:54 -0600 Subject: [PATCH] fix image tags --- .github/workflows/build-and-push.yaml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-and-push.yaml b/.github/workflows/build-and-push.yaml index 70bf1c7c..79e8db6c 100644 --- a/.github/workflows/build-and-push.yaml +++ b/.github/workflows/build-and-push.yaml @@ -31,13 +31,11 @@ jobs: with: # list of Docker images to use as base name for tags images: | - gcr.io/edc-int-6c5e/rubinobs-api,enable=true - # images: | - # gcr.io/skyviewer/rubinobs-api,enable=${{ github.ref != 'master' && github.ref_type != 'tag' }} - # gcr.io/edc-int-6c5e/rubinobs-api,enable=${{ github.ref == 'master' || github.ref == 'k8s-build-updates' }} - # gcr.io/edc-prod-eef0/rubinobs-api,enable=${{ github.ref_type == 'tag'}} + gcr.io/skyviewer/rubinobs-api,enable=${{ (github.ref != 'master' && github.ref_type != 'tag') || github.base_ref == 'develop' }} + gcr.io/edc-int-6c5e/rubinobs-api,enable=${{ github.ref == 'master' || github.base_ref == 'master'}} + gcr.io/edc-prod-eef0/rubinobs-api,enable=${{ github.ref_type == 'tag'}} flavor: | - latest=true + latest=${{ github.event_name == 'push'}} # generate Docker tags based on the following events/attributes tags: | type=schedule