diff --git a/README.md b/README.md index 04a1b4d..b654135 100644 --- a/README.md +++ b/README.md @@ -1 +1,3 @@ Running: `mvn package && docker-compose up` + +Note: You need to add `auth-server` to your hosts file (`/etc/hosts` for linux) and map it to localhost. diff --git a/api-key-ear/Dockerfile b/api-key-ear/Dockerfile index 2495c27..87a4889 100644 --- a/api-key-ear/Dockerfile +++ b/api-key-ear/Dockerfile @@ -1,8 +1,8 @@ -FROM java:8-jre-alpine +FROM openjdk:11-jre-slim -ENV KEYCLOAK_VERSION 6.0.1 +ENV KEYCLOAK_VERSION 12.0.3 -RUN apk add --no-cache ca-certificates openssl && wget https://downloads.jboss.org/keycloak/${KEYCLOAK_VERSION}/keycloak-${KEYCLOAK_VERSION}.tar.gz +RUN apt-get update && apt-get install -y wget && wget https://github.com/keycloak/keycloak/releases/download/${KEYCLOAK_VERSION}/keycloak-${KEYCLOAK_VERSION}.tar.gz RUN tar xvf keycloak-${KEYCLOAK_VERSION}.tar.gz && rm keycloak-${KEYCLOAK_VERSION}.tar.gz diff --git a/api-key-module/pom.xml b/api-key-module/pom.xml index 2013e10..0ec4ccf 100644 --- a/api-key-module/pom.xml +++ b/api-key-module/pom.xml @@ -10,41 +10,29 @@ 4.0.0 api-key-module - - - - org.apache.maven.plugins - maven-compiler-plugin - - 8 - 8 - - - - - 6.0.1 + 11 + 12.0.3 - org.keycloak keycloak-core - ${keyclock.version} + ${keycloak.version} provided org.keycloak keycloak-server-spi - ${keyclock.version} + ${keycloak.version} provided org.keycloak keycloak-model-jpa - ${keyclock.version} + ${keycloak.version} provided diff --git a/dashboard-service/Dockerfile b/dashboard-service/Dockerfile index e4d9c20..24537ec 100644 --- a/dashboard-service/Dockerfile +++ b/dashboard-service/Dockerfile @@ -1,4 +1,4 @@ -FROM maven:3.6-jdk-8-alpine as builder +FROM maven:3-openjdk-11-slim as builder RUN mkdir app @@ -9,7 +9,7 @@ COPY pom.xml . RUN mvn clean package -FROM openjdk:8-jre-alpine +FROM openjdk:11-jre-slim ARG VERSION=0.1 diff --git a/dashboard-service/pom.xml b/dashboard-service/pom.xml index 15adc0e..4dbb406 100644 --- a/dashboard-service/pom.xml +++ b/dashboard-service/pom.xml @@ -15,8 +15,8 @@ Demo project for Spring Boot - 1.8 - 6.0.1 + 11 + 12.0.3 @@ -35,7 +35,7 @@ org.keycloak keycloak-spring-security-adapter - 6.0.1 + ${keycloak.version} diff --git a/docker-compose.yaml b/docker-compose.yaml index 42a4960..e92fec2 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -4,7 +4,7 @@ services: build: api-key-ear environment: REALM_NAME: example - command: ["-Dkeycloak.migration.action=import", "-Dkeycloak.migration.provider=dir", "-Dkeycloak.migration.dir=/import", "-Dkeycloak.migration.strategy=OVERWRITE_EXISTING"] + command: ["-Dkeycloak.migration.action=import", "-Dkeycloak.migration.provider=dir", "-Dkeycloak.migration.dir=/import", "-Dkeycloak.profile.feature.upload_scripts=enabled", "-Dkeycloak.migration.strategy=OVERWRITE_EXISTING"] volumes: - ./api-key-ear/import:/import ports: