24 upgrade (#38)

* 24 udpates. added idp-wizard

* removed idp-wizard from 24

* updated admin ui jar

Signed-off-by: Garth <244253+xgp@users.noreply.github.com>

* new admin ui jar that solves the idp link refresh issue.

* updated pom to released versions

---------

Signed-off-by: Garth <244253+xgp@users.noreply.github.com>

.github/workflows/release.yml

@@ -6,10 +6,10 @@ on:
       - main
 
 env:
-  # Version 23.0.7
-  VERSION_MAJOR: 23
+  # Version 24.0.0
+  VERSION_MAJOR: 24
   VERSION_SUBMAJOR: 0
-  VERSION_MINOR: 7
+  VERSION_MINOR: 0
 
 jobs:
   release-public:

Dockerfile

@@ -1,4 +1,4 @@
-FROM quay.io/phasetwo/keycloak-crdb:23.0.7 as builder
+FROM quay.io/phasetwo/keycloak-crdb:24.0.0 as builder
 
 ENV KC_METRICS_ENABLED=true
 ENV KC_HEALTH_ENABLED=true
@@ -17,10 +17,9 @@ COPY ./libs/target/container*/*.jar /opt/keycloak/providers/
 
 RUN /opt/keycloak/bin/kc.sh --verbose build --spi-email-template-provider=freemarker-plus-mustache --spi-email-template-freemarker-plus-mustache-enabled=true --spi-theme-cache-themes=false
 
-FROM quay.io/phasetwo/keycloak-crdb:23.0.7
-
-USER root
+FROM quay.io/phasetwo/keycloak-crdb:24.0.0
 
+#USER root
 # remediation for vulnerabilities
 # no longer works after switch to ubi-micro 
 #RUN microdnf update -y && microdnf clean all && rm -rf /var/cache/yum/* && rm -f /tmp/tls-ca-bundle.pem
@@ -38,5 +37,3 @@ WORKDIR /opt/keycloak
 # this cert shouldn't be used, as it's just to stop the startup from complaining
 RUN keytool -genkeypair -storepass password -storetype PKCS12 -keyalg RSA -keysize 2048 -dname "CN=server" -alias server -ext "SAN:c=DNS:localhost,IP:127.0.0.1" -keystore conf/server.keystore
 
-#ENTRYPOINT ["/opt/keycloak/bin/kc.sh", "-v", "start", "--optimized" ]
-#ENTRYPOINT [ "/opt/keycloak/bin/kc.sh" ]

README.md

@@ -10,16 +10,15 @@ This distribution contains the following extensions:
 
 | Component | Status | Repository | Description |
 | --- | --- | --- | --- |
+| Admin Portal | :white_check_mark: | https://github.com/p2-inc/phasetwo-admin-portal | User self-management for their account and organizations. |
+| Admin UI | :white_check_mark: | https://github.com/p2-inc/keycloak-ui | Admin UI customizations. |
 | Events | :white_check_mark: | https://github.com/p2-inc/keycloak-events | All event listener implementations. |
+| IdP Wizards | :white_check_mark: | https://github.com/p2-inc/idp-wizard | Identity Provider setup wizards for self-management of SSO admins and organizations. |
 | Magic Link | :white_check_mark: | https://github.com/p2-inc/keycloak-magic-link | Magic Link Authentication. Created with an Authenticator or Resource. |
 | Organizations | :white_check_mark: | https://github.com/p2-inc/keycloak-orgs | Organizations multi-tenant entities, resources and APIs. |
 | Themes |  :white_check_mark: | https://github.com/p2-inc/keycloak-themes | Login and email theme customizations via Realm attributes without deploying an extension. |
-| Admin UI | :white_check_mark: | https://github.com/p2-inc/keycloak-ui | Admin UI customizations. |
-| Admin Portal | :white_check_mark: | https://github.com/p2-inc/phasetwo-admin-portal | User self-management for their account and organizations. |
 | User Migration | :white_check_mark: | https://github.com/p2-inc/keycloak-user-migration | User migration storage provider and API client. |
 
-Also, the distribution contains the `keycloak-admin-client` and the dependencies required to run it in this version without Resteasy dependency hell.
-
 ## Differences
 
 This packages a `cache-ispn-jdbc-ping.xml` for setting up Infinispan/JGroups discovery via the `JDBC` ping protocol. To use it, set the environment variable `KC_CACHE_CONFIG_FILE: cache-ispn-jdbc-ping.xml`.
@@ -68,7 +67,7 @@ docker run --name phasetwo_test --rm -p 8080:8080 \
     start-dev --spi-email-template-provider=freemarker-plus-mustache --spi-email-template-freemarker-plus-mustache-enabled=true --spi-theme-cache-themes=false
 ```
 
-There are examples for Postgres and Cockroach in the `examples/` directory. E.g.:
+There are docker compose examples for Postgres and Cockroach in the `examples/` directory. E.g.:
 
 ```
 docker rmi -f phasetwo/phasetwo-keycloak-crdb:latest

docker-compose.yml

@@ -49,7 +49,7 @@ services:
   caddy:
     image: caddy:2.4.6-alpine
     restart: unless-stopped
-    command: caddy reverse-proxy --from https://localhost:443 --to http://keycloak:8080
+    command: caddy reverse-proxy --from https://s01.villamiramar.fr:443 --to http://keycloak:8080
     ports:
       - 80:80
       - 443:443

libs/pom.xml

@@ -20,12 +20,13 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <keycloak.version>23.0.7</keycloak.version>
-    <keycloak-events.version>0.26</keycloak-events.version>
-    <keycloak-magic-link.version>0.25</keycloak-magic-link.version>
-    <keycloak-orgs.version>0.65</keycloak-orgs.version>
-    <keycloak-themes.version>0.24</keycloak-themes.version>
-    <phasetwo-admin-portal.version>0.26</phasetwo-admin-portal.version>
+    <keycloak.version>24.0.0</keycloak.version>
+    <keycloak-events.version>0.27</keycloak-events.version>
+    <keycloak-magic-link.version>0.26</keycloak-magic-link.version>
+    <keycloak-orgs.version>0.67</keycloak-orgs.version>
+    <keycloak-themes.version>0.25</keycloak-themes.version>
+    <phasetwo-admin-portal.version>0.27</phasetwo-admin-portal.version>
+    <phasetwo-idp-wizard.version>0.1</phasetwo-idp-wizard.version>
   </properties>
 
   <dependencies>
@@ -54,6 +55,11 @@
       <artifactId>phasetwo-admin-portal</artifactId>
       <version>${phasetwo-admin-portal.version}</version>
     </dependency>
+    <dependency>
+      <groupId>io.phasetwo</groupId>
+      <artifactId>phasetwo-idp-wizard</artifactId>
+      <version>${phasetwo-idp-wizard.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.wildfly.client</groupId>
       <artifactId>wildfly-client-config</artifactId>