diff --git a/docker/base-image/Dockerfile b/docker/base-image/Dockerfile index e8337a04ad1..4a0b5ad1dc6 100644 --- a/docker/base-image/Dockerfile +++ b/docker/base-image/Dockerfile @@ -1,5 +1,4 @@ -FROM eclipse-temurin:11.0.15_10-jre-alpine@sha256:d401c4025eb1ead95cf2ca83cd5155bff8756527a4f4e9820570900e835f5ba4 - +FROM azul/zulu-openjdk-alpine:17.0.9-jre LABEL maintainer="Flowable " RUN apk add --no-cache ttf-dejavu && rm -rf /var/cache/apk/* diff --git a/docker/base-image/README.md b/docker/base-image/README.md index c695e1cd3c1..3401ea1f101 100644 --- a/docker/base-image/README.md +++ b/docker/base-image/README.md @@ -1,6 +1,6 @@ # Flowable Docker base image -Extends from eclipse-temurin:11.0.15_10-jdk-alpine +Extends from azul/zulu-openjdk-alpine:17.0.9-jre Adds `flowable:flowable` user which can be used to 'step down' from root when executing Flowable applications. diff --git a/docker/base-image/build.sh b/docker/base-image/build.sh index f02fcbe077b..3f092e38fa3 100755 --- a/docker/base-image/build.sh +++ b/docker/base-image/build.sh @@ -1,8 +1,9 @@ #!/bin/bash set -eou pipefail -readonly IMAGE=${1:-"flowable/flowable-jre:11.0.15"} +readonly IMAGE=${1:-"flowable/flowable-jre:17.0.9"} echo "Image name: ${IMAGE}" echo "Building image..." -docker build -t ${IMAGE} -f Dockerfile . +docker buildx create --name container --driver=docker-container +docker buildx build --tag ${IMAGE} --platform linux/amd64,linux/arm64 --builder container --push . diff --git a/docker/base-image/push.sh b/docker/base-image/push.sh index 1b8c2dd455a..85017c9cc89 100755 --- a/docker/base-image/push.sh +++ b/docker/base-image/push.sh @@ -1,7 +1,7 @@ #!/bin/bash set -eou pipefail -readonly IMAGE=${1:-"flowable/flowable-jre:11.0.15"} +readonly IMAGE=${1:-"flowable/flowable-jre:17.0.9"} echo "Image name: ${IMAGE}" echo "Pushing image..." diff --git a/modules/flowable-app-rest/pom.xml b/modules/flowable-app-rest/pom.xml index d933d1d14c5..2792e5f56e4 100644 --- a/modules/flowable-app-rest/pom.xml +++ b/modules/flowable-app-rest/pom.xml @@ -559,7 +559,7 @@ jib-maven-plugin - flowable/flowable-jre:11.0.15 + flowable/flowable-jre:17.0.9 flowable-rest @@ -601,7 +601,17 @@ jib-maven-plugin - flowable/flowable-jre:11.0.15 + flowable/flowable-jre:17.0.9 + + + amd64 + linux + + + arm64 + linux + + flowable/flowable-rest:${project.version} @@ -647,7 +657,17 @@ jib-maven-plugin - flowable/flowable-jre:11.0.15 + flowable/flowable-jre:17.0.9 + + + amd64 + linux + + + arm64 + linux + + flowable/flowable-rest:${project.version}