diff --git a/src/bin/KeycloakVersion.ts b/src/bin/KeycloakVersion.ts index 0cc0f102..825595cf 100644 --- a/src/bin/KeycloakVersion.ts +++ b/src/bin/KeycloakVersion.ts @@ -1,5 +1,5 @@ -export const keycloakVersions = ["11.0.3", "15.0.1"] as const; +export const keycloakVersions = ["11.0.3", "15.0.2"] as const; export type KeycloakVersion = typeof keycloakVersions[number]; diff --git a/src/bin/build-keycloak-theme/build-keycloak-theme.ts b/src/bin/build-keycloak-theme/build-keycloak-theme.ts index f2f0f31e..55aea290 100644 --- a/src/bin/build-keycloak-theme/build-keycloak-theme.ts +++ b/src/bin/build-keycloak-theme/build-keycloak-theme.ts @@ -85,7 +85,7 @@ export function main() { generateDebugFiles({ keycloakThemeBuildingDirPath, themeName, - "keycloakVersion": "15.0.1" + "keycloakVersion": "15.0.2" }); console.log([ @@ -112,6 +112,13 @@ export function main() { ' extraVolumeMounts: |', ' - name: extensions', ' mountPath: /opt/jboss/keycloak/standalone/deployments', + ' extraEnv: |', + ' - name: KEYCLOAK_USER', + ' value: admin', + ' - name: KEYCLOAK_PASSWORD', + ' value: xxxxxxxxx', + ' - name: JAVA_OPTS', + ' value: -Dkeycloak.profile=preview', '', '', 'To test your theme locally, with hot reloading, you can spin up a Keycloak container image with the theme loaded by running:', diff --git a/src/bin/build-keycloak-theme/generateDebugFiles/generateDebugFiles.ts b/src/bin/build-keycloak-theme/generateDebugFiles/generateDebugFiles.ts index 650db4e3..a24fc0a7 100644 --- a/src/bin/build-keycloak-theme/generateDebugFiles/generateDebugFiles.ts +++ b/src/bin/build-keycloak-theme/generateDebugFiles/generateDebugFiles.ts @@ -7,7 +7,7 @@ export const containerLaunchScriptBasename = "start_keycloak_testing_container.s /** Files for being able to run a hot reload keycloak container */ export function generateDebugFiles( params: { - keycloakVersion: "11.0.3" | "15.0.1"; + keycloakVersion: "11.0.3" | "15.0.2"; themeName: string; keycloakThemeBuildingDirPath: string; } @@ -49,13 +49,14 @@ export function generateDebugFiles( `docker build . -t ${dockerImage}`, "", "docker run \\", - " -p 8080:8080 \\", - ` --name ${containerName} \\`, - " -e KEYCLOAK_USER=admin \\", - " -e KEYCLOAK_PASSWORD=admin \\", - ` -v ${pathJoin(keycloakThemeBuildingDirPath, "src", "main", "resources", "theme", themeName) + " -p 8080:8080 \\", + ` --name ${containerName} \\`, + " -e KEYCLOAK_USER=admin \\", + " -e KEYCLOAK_PASSWORD=admin \\", + " -e JAVA_OPTS=-Dkeycloak.profile=preview \\", + ` -v ${pathJoin(keycloakThemeBuildingDirPath, "src", "main", "resources", "theme", themeName) }:/opt/jboss/keycloak/themes/${themeName}:rw \\`, - ` -it ${dockerImage}:latest`, + ` -it ${dockerImage}:latest`, "" ].join("\n"), "utf8" diff --git a/src/bin/build-keycloak-theme/generateDebugFiles/standalone-ha_15.0.1.xml b/src/bin/build-keycloak-theme/generateDebugFiles/standalone-ha_15.0.2.xml similarity index 100% rename from src/bin/build-keycloak-theme/generateDebugFiles/standalone-ha_15.0.1.xml rename to src/bin/build-keycloak-theme/generateDebugFiles/standalone-ha_15.0.2.xml diff --git a/src/bin/build-keycloak-theme/generateKeycloakThemeResources.ts b/src/bin/build-keycloak-theme/generateKeycloakThemeResources.ts index 27b300b9..baf99979 100644 --- a/src/bin/build-keycloak-theme/generateKeycloakThemeResources.ts +++ b/src/bin/build-keycloak-theme/generateKeycloakThemeResources.ts @@ -23,7 +23,7 @@ export function generateKeycloakThemeResources( urlOrigin: undefined | string; extraPagesId: string[]; extraThemeProperties: string[]; - keycloakVersion: "11.0.3" | "15.0.1" + keycloakVersion: "11.0.3" | "15.0.2" } ) { diff --git a/src/lib/i18n/generated_kcMessages/15.0.1/account.ts b/src/lib/i18n/generated_kcMessages/15.0.2/account.ts similarity index 100% rename from src/lib/i18n/generated_kcMessages/15.0.1/account.ts rename to src/lib/i18n/generated_kcMessages/15.0.2/account.ts diff --git a/src/lib/i18n/generated_kcMessages/15.0.1/admin.ts b/src/lib/i18n/generated_kcMessages/15.0.2/admin.ts similarity index 100% rename from src/lib/i18n/generated_kcMessages/15.0.1/admin.ts rename to src/lib/i18n/generated_kcMessages/15.0.2/admin.ts diff --git a/src/lib/i18n/generated_kcMessages/15.0.1/email.ts b/src/lib/i18n/generated_kcMessages/15.0.2/email.ts similarity index 100% rename from src/lib/i18n/generated_kcMessages/15.0.1/email.ts rename to src/lib/i18n/generated_kcMessages/15.0.2/email.ts diff --git a/src/lib/i18n/generated_kcMessages/15.0.1/login.ts b/src/lib/i18n/generated_kcMessages/15.0.2/login.ts similarity index 100% rename from src/lib/i18n/generated_kcMessages/15.0.1/login.ts rename to src/lib/i18n/generated_kcMessages/15.0.2/login.ts diff --git a/src/lib/i18n/kcMessages/login.ts b/src/lib/i18n/kcMessages/login.ts index e3e1226e..ab3cb28a 100644 --- a/src/lib/i18n/kcMessages/login.ts +++ b/src/lib/i18n/kcMessages/login.ts @@ -1,5 +1,5 @@ -import { kcMessages } from "../generated_kcMessages/15.0.1/login"; +import { kcMessages } from "../generated_kcMessages/15.0.2/login"; import { Evt } from "evt"; import { objectKeys } from "tsafe/objectKeys";