From 6332e8892a8a782514a25d1f70b5b9f19ace4fb0 Mon Sep 17 00:00:00 2001 From: Bharath Nallapeta Date: Wed, 8 Nov 2023 18:53:44 +0530 Subject: [PATCH] Resolved conflicts (#504) Signed-off-by: bnallapeta --- openshift/keycloak.yaml | 2 +- set-version.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/openshift/keycloak.yaml b/openshift/keycloak.yaml index 9519df766..299a8a849 100644 --- a/openshift/keycloak.yaml +++ b/openshift/keycloak.yaml @@ -65,7 +65,7 @@ objects: value: '${KEYCLOAK_ADMIN_PASSWORD}' - name: KC_PROXY value: 'edge' - image: quay.io/keycloak/keycloak:21.1.1 + image: quay.io/keycloak/keycloak:$$VERSION$$ livenessProbe: failureThreshold: 100 httpGet: diff --git a/set-version.sh b/set-version.sh index 1fd60a671..f244c10a3 100755 --- a/set-version.sh +++ b/set-version.sh @@ -4,5 +4,5 @@ NEW_VERSION=$1 mvn versions:set -Dversion.keycloak=$NEW_VERSION -DnewVersion=$NEW_VERSION -DgenerateBackupPoms=false -DgroupId=org.keycloak* -DartifactId=* -sed -i 's|\$\$VERSION\$\$|'$NEW_VERSION'|g' kubernetes/keycloak.yaml -sed -i 's|\$\$VERSION\$\$|'$NEW_VERSION'|g' openshift/keycloak.yaml +sed -i 's/\$\$VERSION\$\$/'"$NEW_VERSION"'/g' kubernetes/keycloak.yaml +sed -i 's/\$\$VERSION\$\$/'"$NEW_VERSION"'/g' openshift/keycloak.yaml