From b163882639a05abced9178955bfd43a2f3f4db58 Mon Sep 17 00:00:00 2001
From: royalcat <k.adamovich20@gmail.com>
Date: Tue, 30 Jul 2024 16:52:18 +0300
Subject: [PATCH] fix discord

---
 .gitmodules        |  3 ---
 Dockerfile         | 17 +++--------------
 providers/keycloak |  1 -
 3 files changed, 3 insertions(+), 18 deletions(-)
 delete mode 100644 .gitmodules
 delete mode 160000 providers/keycloak

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index f70ea82..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "providers/keycloak"]
-	path = providers/keycloak
-	url = https://github.com/andythorne/keycloak-discord
diff --git a/Dockerfile b/Dockerfile
index ad29cb2..9cac289 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,9 @@
 ARG KC_VERSION=25.0
 
 # Discord provider build
-FROM --platform=$BUILDPLATFORM maven:3.9.8-eclipse-temurin-17 AS discord_builder
-
-RUN mkdir /keycloak-discord
+FROM --platform=$BUILDPLATFORM maven:3-openjdk-17 AS discord_builder
+RUN git clone https://github.com/andythorne/keycloak-discord --branch fix-keycloak-25 --depth 1 /keycloak-discord
 WORKDIR /keycloak-discord
-
-
-COPY providers/keycloak/pom.xml .
-COPY providers/keycloak/src .
 RUN mvn package
 
 # Keycloak build
@@ -23,10 +18,7 @@ ENV KC_CACHE=local
 ENV KC_HTTP_ENABLED=true
 ENV KC_PROXY_HEADERS=xforwarded
 
-# ADD --chown=keycloak:keycloak --chmod=644 \
-#     https://github.com/wadahiro/keycloak-discord/releases/download/v0.5.0/keycloak-discord-0.5.0.jar \
-#     /opt/keycloak/providers/discord.jar
-COPY --from=discord_builder --chown=keycloak:keycloak --chmod=644  \
+COPY --from=discord_builder \
     /keycloak-discord/target/keycloak-discord-0.5.1-SNAPSHOT.jar \
     /opt/keycloak/providers/discord.jar
 WORKDIR /opt/keycloak
@@ -34,7 +26,4 @@ RUN /opt/keycloak/bin/kc.sh build
 
 FROM quay.io/keycloak/keycloak:${KC_VERSION}
 COPY --from=builder /opt/keycloak/ /opt/keycloak/
-COPY --from=discord_builder --chown=keycloak:keycloak --chmod=644  \
-    /keycloak-discord/target/keycloak-discord-0.5.1-SNAPSHOT.jar \
-    /opt/keycloak/providers/discord.jar
 ENTRYPOINT ["/opt/keycloak/bin/kc.sh"]
\ No newline at end of file
diff --git a/providers/keycloak b/providers/keycloak
deleted file mode 160000
index af9e562..0000000
--- a/providers/keycloak
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit af9e5623f74b71530b1f6b9877faf0d50b50f8d2