Skip to content

Commit

Permalink
updated base image with multi arch build
Browse files Browse the repository at this point in the history
  • Loading branch information
yvoswillens committed Jan 17, 2024
1 parent 681f554 commit a90b378
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 9 deletions.
3 changes: 1 addition & 2 deletions docker/base-image/Dockerfile
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>"
RUN apk add --no-cache ttf-dejavu && rm -rf /var/cache/apk/*

Expand Down
2 changes: 1 addition & 1 deletion docker/base-image/README.md
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
5 changes: 3 additions & 2 deletions docker/base-image/build.sh
Original file line number Diff line number Diff line change
@@ -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 .
2 changes: 1 addition & 1 deletion docker/base-image/push.sh
Original file line number Diff line number Diff line change
@@ -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..."
Expand Down
26 changes: 23 additions & 3 deletions modules/flowable-app-rest/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@
<artifactId>jib-maven-plugin</artifactId>
<configuration>
<from>
<image>flowable/flowable-jre:11.0.15</image>
<image>flowable/flowable-jre:17.0.9</image>
</from>
<to>
<image>flowable-rest</image>
Expand Down Expand Up @@ -601,7 +601,17 @@
<artifactId>jib-maven-plugin</artifactId>
<configuration>
<from>
<image>flowable/flowable-jre:11.0.15</image>
<image>flowable/flowable-jre:17.0.9</image>
<platforms>
<platform>
<architecture>amd64</architecture>
<os>linux</os>
</platform>
<platform>
<architecture>arm64</architecture>
<os>linux</os>
</platform>
</platforms>
</from>
<to>
<image>flowable/flowable-rest:${project.version}</image>
Expand Down Expand Up @@ -647,7 +657,17 @@
<artifactId>jib-maven-plugin</artifactId>
<configuration>
<from>
<image>flowable/flowable-jre:11.0.15</image>
<image>flowable/flowable-jre:17.0.9</image>
<platforms>
<platform>
<architecture>amd64</architecture>
<os>linux</os>
</platform>
<platform>
<architecture>arm64</architecture>
<os>linux</os>
</platform>
</platforms>
</from>
<to>
<image>flowable/flowable-rest:${project.version}</image>
Expand Down

0 comments on commit a90b378

Please sign in to comment.