From 0ffa72877e1d3aec291cb82356aba00e372ccd8f Mon Sep 17 00:00:00 2001
From: linoman <2051016+linoman@users.noreply.github.com>
Date: Thu, 27 Jul 2023 09:56:31 +0200
Subject: [PATCH] Chore: Bump keycloak version (#72386)

* Bump keycloak version

* Remove troubleshooting

* Remove script for M1 machines
---
 .../oauth/docker-build-keycloak-m1-image.sh     |  9 ---------
 .../blocks/auth/oauth/docker-compose.yaml       |  2 +-
 devenv/docker/blocks/auth/oauth/readme.md       | 17 -----------------
 3 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 devenv/docker/blocks/auth/oauth/docker-build-keycloak-m1-image.sh

diff --git a/devenv/docker/blocks/auth/oauth/docker-build-keycloak-m1-image.sh b/devenv/docker/blocks/auth/oauth/docker-build-keycloak-m1-image.sh
deleted file mode 100644
index 46c1ef09fa3..00000000000
--- a/devenv/docker/blocks/auth/oauth/docker-build-keycloak-m1-image.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#/bin/sh
-
-VERSION=12.0.1 # set version here
-
-cd /tmp
-git clone git@github.com:keycloak/keycloak-containers.git
-cd keycloak-containers/server
-git checkout $VERSION
-docker build -t "quay.io/keycloak/keycloak:${VERSION}" .
diff --git a/devenv/docker/blocks/auth/oauth/docker-compose.yaml b/devenv/docker/blocks/auth/oauth/docker-compose.yaml
index 762e3c5a7a9..f322a879757 100644
--- a/devenv/docker/blocks/auth/oauth/docker-compose.yaml
+++ b/devenv/docker/blocks/auth/oauth/docker-compose.yaml
@@ -10,7 +10,7 @@
     restart: unless-stopped
 
   oauthkeycloak:
-    image: quay.io/keycloak/keycloak:21.1
+    image: quay.io/keycloak/keycloak:22.0
     container_name: oauthkeycloak
     command: --spi-login-protocol-openid-connect-legacy-logout-redirect-uri=true start-dev
     environment:
diff --git a/devenv/docker/blocks/auth/oauth/readme.md b/devenv/docker/blocks/auth/oauth/readme.md
index a935f2c8682..e9bdab5e1ba 100644
--- a/devenv/docker/blocks/auth/oauth/readme.md
+++ b/devenv/docker/blocks/auth/oauth/readme.md
@@ -120,20 +120,3 @@ docker-compose exec -T oauthkeycloakdb bash -c "pg_dump -U keycloak keycloak" >
 - grafana oauth editor login:         oauth-editor:grafana
 - grafana oauth admin login:          oauth-admin:grafana
 - grafana oauth server admin login:   oauth-grafanaadmin:grafana
-
-# Troubleshooting
-
-## Mac M1 Users
-
-The new arm64 architecture does not build for the latest docker image of keycloak. Refer to https://github.com/docker/for-mac/issues/5310 for the issue to see if it resolved.
-Until then you need to build the docker image locally and then run `devenv`.
-
-1. Remove any lingering keycloak image
-```sh
-$ docker rmi $(docker images | grep 'keycloak')
-```
-1. Build keycloak image locally
-```sh
-$ ./docker-build-keycloak-m1-image.sh
-```
-1. Start from beginning of this readme