From 7ad47d1cbca23076ac80a1f94a4359dd501ec68a Mon Sep 17 00:00:00 2001 From: CSR2017 Date: Mon, 24 Jul 2023 12:25:14 -0500 Subject: [PATCH] Add seperate build steo abd tags for db --- .github/workflows/on-prerelease.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/on-prerelease.yml b/.github/workflows/on-prerelease.yml index cefd035dc..a9eb56893 100644 --- a/.github/workflows/on-prerelease.yml +++ b/.github/workflows/on-prerelease.yml @@ -270,17 +270,20 @@ jobs: if [[ $PACKAGEVERSION =~ "alpha" ]] then # Pre-releases get the tag "pre" - TAGS="${{ env.IMAGE_NAME }}:pre" + APITAGS="${{ env.IMAGE_NAME }}:pre" + DBTAGS="${{ env.DATABASE_IMAGE_NAME }}:pre" else # Releases get the version, plus shortened form for minor release. # We are not using shortened form for major or using "latest" # because they are too imprecise. MINOR=`echo ${PACKAGEVERSION} | awk -F"." '{print $1"."$2}'` - TAGS="${{ env.IMAGE_NAME }}:${PACKAGEVERSION},${{ env.IMAGE_NAME }}:${MINOR}" + APITAGS="${{ env.IMAGE_NAME }}:${PACKAGEVERSION},${{ env.IMAGE_NAME }}:${MINOR}" + DBTAGS="${{ env.DATABASE_IMAGE_NAME }}:${PACKAGEVERSION},${{ env.DATABASE_IMAGE_NAME }}:${MINOR}" fi SEMVERSION=${PACKAGEVERSION:1} # strip off the leading 'v' - echo "TAGS=$TAGS" >> $GITHUB_OUTPUT + echo "APITAGS=$APITAGS" >> $GITHUB_OUTPUT + echo "DBTAGS=$DBTAGS" >> $GITHUB_OUTPUT # echo "VERSION=$SEMVERSION" >> $GITHUB_OUTPUT echo "VERSION=0.0.0-alpha.0.67" >> $GITHUB_OUTPUT @@ -307,7 +310,7 @@ jobs: cache-to: type=inline build-args: VERSION=${{ steps.prepare-tags.outputs.VERSION }} file: api-pgsql.Dockerfile - tags: ${{ steps.prepare-tags.outputs.TAGS }} + tags: ${{ steps.prepare-tags.outputs.APITAGS }} labels: ${{ steps.metaapi.outputs.labels }} push: true @@ -325,6 +328,6 @@ jobs: cache-to: type=inline build-args: VERSION=${{ steps.prepare-tags.outputs.VERSION }} file: Dockerfile - tags: ${{ steps.prepare-tags.outputs.TAGS }} + tags: ${{ steps.prepare-tags.outputs.DBTAGS }} labels: ${{ steps.metadatabase.outputs.labels }} push: true \ No newline at end of file