From d90de08d752ca860877a43c2e935cb6985bce992 Mon Sep 17 00:00:00 2001 From: Daryl Todosichuk Date: Tue, 29 Oct 2024 13:48:53 -0700 Subject: [PATCH] test 15.2 --- .github/workflows/docker-build-dev.yml | 7 ++++--- .github/workflows/docker-build-main.yml | 7 ++++--- .github/workflows/docker-build-test.yml | 4 ++-- applications/scripts/datafix-ab#001.sql | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/docker-build-dev.yml b/.github/workflows/docker-build-dev.yml index a1bfa74..0a106d4 100644 --- a/.github/workflows/docker-build-dev.yml +++ b/.github/workflows/docker-build-dev.yml @@ -66,7 +66,8 @@ jobs: fetch-depth: '1' - name: Get short commitId id: get_commit - run: echo "SHA_SHORT=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT + run: | + echo "SHA_SHORT=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT - name: List merged branch id: get_branch run: | @@ -124,7 +125,7 @@ jobs: run: | echo "$JFROG_PASSWORD" | docker login -u "$JFROG_USERNAME" --password-stdin $JFROG_SERVICE - name: Push application images to Artifactory container registry - run: | + run: | docker tag dotnetapp $JFROG_SERVICE/$JFROG_REPO_PATH/dotnetapp docker push $JFROG_SERVICE/$JFROG_REPO_PATH/dotnetapp docker tag aspnetapp $JFROG_SERVICE/$JFROG_REPO_PATH/aspnetapp @@ -142,7 +143,7 @@ jobs: oc registry login docker login -u unused -p $(oc whoami -t) $OC_REGISTRY - name: Push application images to OpenShift container registry - run: | + run: | docker tag dotnetapp $OC_REGISTRY/$OC_TARGET_PROJECT/dotnetapp docker push $OC_REGISTRY/$OC_TARGET_PROJECT/dotnetapp docker tag aspnetapp $OC_REGISTRY/$OC_TARGET_PROJECT/aspnetapp diff --git a/.github/workflows/docker-build-main.yml b/.github/workflows/docker-build-main.yml index a59f31c..52087b0 100644 --- a/.github/workflows/docker-build-main.yml +++ b/.github/workflows/docker-build-main.yml @@ -64,7 +64,8 @@ jobs: fetch-depth: '1' - name: Get short commitId id: get_commit - run: echo "SHA_SHORT=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT + run: | + echo "SHA_SHORT=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT - name: List merged branch id: get_branch run: | @@ -174,7 +175,7 @@ jobs: run: | echo "$JFROG_PASSWORD" | docker login -u "$JFROG_USERNAME" --password-stdin $JFROG_SERVICE - name: Push application images to Artifactory container registry - run: | + run: | docker tag dotnetapp $JFROG_SERVICE/$JFROG_REPO_PATH/dotnetapp:stable docker push $JFROG_SERVICE/$JFROG_REPO_PATH/dotnetapp:stable docker tag aspnetapp $JFROG_SERVICE/$JFROG_REPO_PATH/aspnetapp:stable @@ -192,7 +193,7 @@ jobs: oc registry login docker login -u unused -p $(oc whoami -t) $OC_REGISTRY - name: Push application images to OpenShift container registry - run: | + run: | docker tag dotnetapp $OC_REGISTRY/$OC_TARGET_PROJECT/dotnetapp:stable docker push $OC_REGISTRY/$OC_TARGET_PROJECT/dotnetapp:stable docker tag aspnetapp $OC_REGISTRY/$OC_TARGET_PROJECT/aspnetapp:stable diff --git a/.github/workflows/docker-build-test.yml b/.github/workflows/docker-build-test.yml index 5c53bf9..aa3a6f1 100644 --- a/.github/workflows/docker-build-test.yml +++ b/.github/workflows/docker-build-test.yml @@ -157,7 +157,7 @@ jobs: run: | echo "$JFROG_PASSWORD" | docker login -u "$JFROG_USERNAME" --password-stdin $JFROG_SERVICE - name: Push application images to Artifactory container registry - run: | + run: | docker tag dotnetapp $JFROG_SERVICE/$JFROG_REPO_PATH/dotnetapp docker push $JFROG_SERVICE/$JFROG_REPO_PATH/dotnetapp docker tag aspnetapp $JFROG_SERVICE/$JFROG_REPO_PATH/aspnetapp @@ -175,7 +175,7 @@ jobs: oc registry login docker login -u unused -p $(oc whoami -t) $OC_REGISTRY - name: Push application images to OpenShift container registry - run: | + run: | docker tag dotnetapp $OC_REGISTRY/$OC_TARGET_PROJECT/dotnetapp docker push $OC_REGISTRY/$OC_TARGET_PROJECT/dotnetapp docker tag aspnetapp $OC_REGISTRY/$OC_TARGET_PROJECT/aspnetapp diff --git a/applications/scripts/datafix-ab#001.sql b/applications/scripts/datafix-ab#001.sql index 1a946aa..c0b7be1 100644 --- a/applications/scripts/datafix-ab#001.sql +++ b/applications/scripts/datafix-ab#001.sql @@ -1 +1 @@ -test 15.1 +test 15.2