diff --git a/devops/linux/docker/conf/env/create-env-linux-low-1.sh b/devops/linux/docker/conf/env/create-env-linux-low-1.sh index 01ca02385..bfce6efcc 100755 --- a/devops/linux/docker/conf/env/create-env-linux-low-1.sh +++ b/devops/linux/docker/conf/env/create-env-linux-low-1.sh @@ -62,11 +62,11 @@ export NODE_ENV="production" export REACT_APP_JEMPI_BASE_API_HOST=http://${NODE1_IP} #enable use of keycloak -#export REACT_APP_JEMPI_BASE_API_PORT=50001 -#export REACT_APP_ENABLE_SSO="true" +export REACT_APP_JEMPI_BASE_API_PORT=50001 +export REACT_APP_ENABLE_SSO="true" -export REACT_APP_JEMPI_BASE_API_PORT=50000 -export REACT_APP_ENABLE_SSO="false" +# export REACT_APP_JEMPI_BASE_API_PORT=50000 +# export REACT_APP_ENABLE_SSO="false" export REACT_APP_MOCK_BACKEND="false" export KC_FRONTEND_URL=http://${NODE1_IP}:8080 diff --git a/devops/linux/docker/conf/keycloak/import-jempi-dev-realm.json b/devops/linux/docker/conf/keycloak/import-jempi-dev-realm.json index 4d70d92ad..35ed74d72 100644 --- a/devops/linux/docker/conf/keycloak/import-jempi-dev-realm.json +++ b/devops/linux/docker/conf/keycloak/import-jempi-dev-realm.json @@ -391,10 +391,10 @@ "credentials" : [ { "id" : "30445f2a-9ea5-4658-81e7-a96959e2ab96", "type" : "password", + "temporary": false, "userLabel" : "My password", "createdDate" : 1685983298938, - "secretData" : "{\"value\":\"avydCqOak8Hkxbaat5k1SchwuF0e+nMJC7sEmTM1oAg=\",\"salt\":\"OeiBGFRcnjFaguM2myRzJA==\",\"additionalParameters\":{}}", - "credentialData" : "{\"hashIterations\":27500,\"algorithm\":\"pbkdf2-sha256\",\"additionalParameters\":{}}" + "value": "dev_password_only" } ], "disableableCredentialTypes" : [ ], "requiredActions" : [ ], diff --git a/devops/linux/docker/deployment/deploy-local.sh b/devops/linux/docker/deployment/deploy-local.sh index 851c044fa..8b6b64807 100755 --- a/devops/linux/docker/deployment/deploy-local.sh +++ b/devops/linux/docker/deployment/deploy-local.sh @@ -74,6 +74,7 @@ install_sdkman_and_java_sbt_maven() { echo "Installing sbt... " sdk install sbt + source "$HOME/.sdkman/bin/sdkman-init.sh" } hostname_setup() { diff --git a/devops/linux/docker/deployment/scripts/d-stack-up-app-containers.sh b/devops/linux/docker/deployment/scripts/d-stack-up-app-containers.sh index 64a407e58..fd1ba4e7e 100755 --- a/devops/linux/docker/deployment/scripts/d-stack-up-app-containers.sh +++ b/devops/linux/docker/deployment/scripts/d-stack-up-app-containers.sh @@ -26,6 +26,12 @@ pushd . echo + pushd helper/keycloak + if [ "$REACT_APP_ENABLE_SSO" = "true" ]; then + source ./start-keycloak-test-server.sh + fi + popd + sleep 5 docker stack services ${STACK_NAME} echo diff --git a/documentation/keycloak/README.md b/documentation/keycloak/README.md index 56f49d151..226501161 100644 --- a/documentation/keycloak/README.md +++ b/documentation/keycloak/README.md @@ -260,7 +260,7 @@ KC_REALM_NAME **Username:** dev-user - **Password:** dev-password + **Password:** dev_password_only The admin use for the keycloak server is