Resolved conflicts (#504)

Signed-off-by: bnallapeta <[email protected]>
keycloak · Nov 8, 2023 · 6332e88 · 6332e88
1 parent 0117c09
commit 6332e88
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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