Updated keycloak client version and docker base image

ing-bank · Sep 6, 2022 · 4128127 · 4128127
1 parent 81a105d
commit 4128127
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/.github/workflows/build-feature.yaml b/.github/workflows/build-feature.yaml
@@ -35,8 +35,7 @@ jobs:
       run: |
         # Login to docker
         echo ${{ secrets.DOCKER_PASSWORD }} | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
-       
+
         # Build docker image
-        ROKKU_STS_VERSION=${GITHUB_REF##*/}
-        echo "Build image for with name $DOCKER_REPO:$ROKKU_STS_VERSION";
-        sbt clean docker:publish;
+        echo "Build image $DOCKER_REPO:${GITHUB_REF##*/}";
+        ROKKU_STS_VERSION=${GITHUB_REF##*/} sbt clean docker:publish;
diff --git a/.github/workflows/build-master.yaml b/.github/workflows/build-master.yaml
@@ -53,10 +53,9 @@ jobs:
         echo ${{ secrets.DOCKER_PASSWORD }} | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
        
         # Build docker image
-        ROKKU_STS_VERSION=$(git describe --tags --abbrev=0)
-        echo "Build image for with name $DOCKER_REPO:$ROKKU_STS_VERSION";
-        sbt clean docker:publish;
+        ROKKU_STS_VERSION=$(git describe --tags --abbrev=0) sbt clean docker:publish;
+        echo "Built image $DOCKER_REPO:$(git describe --tags --abbrev=0)";
 
         # Add latest tag
-        docker tag $DOCKER_REPO:$ROKKU_STS_VERSION $DOCKER_REPO:latest;
+        docker tag $DOCKER_REPO:$(git describe --tags --abbrev=0) $DOCKER_REPO:latest;
         docker push $DOCKER_REPO:latest
diff --git a/build.sbt b/build.sbt
@@ -25,7 +25,7 @@ assemblyJarName in assembly := "rokku-sts.jar"
 
 val akkaVersion = "2.6.19"
 val akkaHttpVersion = "10.2.9"
-val keycloakVersion = "16.1.1"
+val keycloakVersion = "19.0.0"
 val logbackJson = "0.1.5"
 
 libraryDependencies ++= Seq(
@@ -68,7 +68,8 @@ fork := true
 
 dockerExposedPorts := Seq(12345)
 dockerCommands += ExecCmd("ENV", "PROXY_HOST", "0.0.0.0")
-dockerBaseImage := "openjdk:11-slim-buster"
+dockerCommands += ExecCmd("RUN", "apt-get update && apt-get upgrade")
+dockerBaseImage := "openjdk:11-slim-bullseye"
 dockerAlias := docker.DockerAlias(Some("docker.io"), Some("wbaa"), "rokku-sts", Some(rokkuStsVersion))
 
 scalariformPreferences := scalariformPreferences.value