Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Reverted keycloak docker changes

Rich Turner9a7e4cb72b09
diff --git a/keycloak/Dockerfile b/keycloak/Dockerfile
index 24184e1b7..ef59c5a34 100644
--- a/keycloak/Dockerfile
+++ b/keycloak/Dockerfile
@@ -1,4 +1,3 @@
-FROM openremote/deployment:latest as deployment
FROM jboss/keycloak:7.0.1
MAINTAINER [email protected]
@@ -16,7 +15,5 @@ USER 1000
EXPOSE 8080
-COPY --from=deployment /deployment/keycloak/themes/ /opt/jboss/keycloak/themes/
-
ENTRYPOINT ["/opt/jboss/docker-entrypoint.sh"]
CMD ["-b", "0.0.0.0"]
\ No newline at end of file
diff --git a/keycloak/docker-entrypoint.sh b/keycloak/docker-entrypoint.sh
index de27c71f0..b94684f69 100644
--- a/keycloak/docker-entrypoint.sh
+++ b/keycloak/docker-entrypoint.sh
@@ -1,4 +1,16 @@
#!/bin/bash
+# Symlink each theme from deployment this preserves the default keycloak theme, reasons for this mechanism:
+# Cannot volume map a subdir of a named volume
+# Want all customisation to be in the /deployment dir and deployment-data volume
+if [ -d "/deployment/keycloak/themes" ]; then
+ for dir in /deployment/keycloak/themes/*; do
+ if [ -d ${dir} ]; then
+ echo "${dir##*/}"
+ ln -s ${dir} /opt/jboss/keycloak/themes/${dir##*/}
+ fi
+ done
+fi
+
exec /opt/jboss/tools/docker-entrypoint.sh $@
exit $?
\ No newline at end of file