Skip to content

Commit 346da54

Browse files
authored
Build container images with buildx (#4147)
1 parent f59c528 commit 346da54

File tree

2 files changed

+4
-24
lines changed

2 files changed

+4
-24
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
# -------------------------
1010
FROM ghcr.io/oracle/oraclelinux:9-slim AS jre-build
1111

12-
ENV JAVA_URL_X64="https://download.java.net/java/GA/jdk19.0.2/fdb695a9d9064ad6b064dc6df578380c/7/GPL/openjdk-19.0.2_linux-x64_bin.tar.gz"
13-
ENV JAVA_URL_AARCH64="https://download.java.net/java/GA/jdk19.0.2/fdb695a9d9064ad6b064dc6df578380c/7/GPL/openjdk-19.0.2_linux-aarch64_bin.tar.gz"
12+
ENV JAVA_URL_X64="https://download.java.net/java/GA/jdk20/bdc68b4b9cbc4ebcb30745c85038d91d/36/GPL/openjdk-20_linux-x64_bin.tar.gz"
13+
ENV JAVA_URL_AARCH64="https://download.java.net/java/GA/jdk20/bdc68b4b9cbc4ebcb30745c85038d91d/36/GPL/openjdk-20_linux-aarch64_bin.tar.gz"
1414

1515
RUN set -eux; \
1616
microdnf -y install gzip tar; \

buildAndPushImage.sh

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -67,28 +67,8 @@ echo "Building image '$name' ..."
6767

6868
# BUILD AND PUSH THE IMAGE (replace all environment variables)
6969
BUILD_START=$(date '+%s')
70-
${WLSIMG_BUILDER:-docker} build $PROXY_SETTINGS --pull --platform linux/amd64 --tag $name-amd64 -f $SCRIPTPATH/Dockerfile $SCRIPTPATH || {
71-
echo "There was an error building the amd64 image."
72-
exit 1
73-
}
74-
${WLSIMG_BUILDER:-docker} push $PROXY_SETTINGS $name-amd64 || {
75-
echo "There was an error pushing the amd64 image."
76-
exit 1
77-
}
78-
${WLSIMG_BUILDER:-docker} build $PROXY_SETTINGS --pull --platform linux/arm64 --tag $name-arm64v8 -f $SCRIPTPATH/Dockerfile $SCRIPTPATH || {
79-
echo "There was an error building the arm64v8 image."
80-
exit 1
81-
}
82-
${WLSIMG_BUILDER:-docker} push $PROXY_SETTINGS $name-arm64v8 || {
83-
echo "There was an error pushing the arm64v8 image."
84-
exit 1
85-
}
86-
${WLSIMG_BUILDER:-docker} manifest create $PROXY_SETTINGS $name --amend $name-amd64 --amend $name-arm64v8 || {
87-
echo "There was an error building the manifest."
88-
exit 1
89-
}
90-
${WLSIMG_BUILDER:-docker} manifest push $PROXY_SETTINGS $name || {
91-
echo "There was an error pushing the manifest."
70+
${WLSIMG_BUILDER:-docker} buildx build $PROXY_SETTINGS --pull --push --platform linux/amd64,linux/arm64 --tag $IMAGE_NAME -f $SCRIPTPATH/Dockerfile $SCRIPTPATH || {
71+
echo "There was an error building and pushing the image."
9272
exit 1
9373
}
9474
BUILD_END=$(date '+%s')

0 commit comments

Comments
 (0)