From 0b2babe09087010ce46eeb98948e4615bbbd1666 Mon Sep 17 00:00:00 2001
From: Valera V Harseko <vharseko@3a-systems.ru>
Date: Tue, 23 Jun 2026 16:22:28 +0000
Subject: [PATCH] Fix alpine multi-arch Docker build (conditional JDK)
---
opendj-packages/opendj-docker/Dockerfile-alpine | 5 ++++-
.github/workflows/release.yml | 2 +-
.github/workflows/build.yml | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 43a3045..30b3344 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -416,7 +416,7 @@
file: ./opendj-packages/opendj-docker/Dockerfile-alpine
build-args: |
VERSION=${{ env.release_version }}
- platforms: linux/amd64, linux/arm64/8, linux/s390x, linux/ppc64le, linux/386, linux/arm/v6, linux/arm/v7, linux/riscv64
+ platforms: linux/amd64, linux/arm64/8, linux/s390x, linux/ppc64le, linux/386, linux/riscv64
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5f15ad8..1309c07 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -222,7 +222,7 @@
file: ./opendj-packages/opendj-docker/Dockerfile-alpine
build-args: |
VERSION=${{ github.event.inputs.releaseVersion }}
- platforms: linux/amd64, linux/arm64/8, linux/s390x, linux/ppc64le, linux/386, linux/arm/v6, linux/arm/v7, linux/riscv64
+ platforms: linux/amd64, linux/arm64/8, linux/s390x, linux/ppc64le, linux/386, linux/riscv64
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
diff --git a/opendj-packages/opendj-docker/Dockerfile-alpine b/opendj-packages/opendj-docker/Dockerfile-alpine
index 5794b5d..65f1f0b 100644
--- a/opendj-packages/opendj-docker/Dockerfile-alpine
+++ b/opendj-packages/opendj-docker/Dockerfile-alpine
@@ -38,13 +38,16 @@
ARG VERSION
+ARG TARGETARCH
+
WORKDIR /opt
#COPY opendj-*.zip $OPENDJ_DIST_FILENAME
RUN apk add --update --no-cache --virtual builddeps curl unzip \
&& apk upgrade --update --no-cache \
- && apk add bash openjdk11 \
+ && if [ "$TARGETARCH" = "386" ]; then JDK=openjdk11-jre; else JDK=openjdk25-jre; fi \
+ && apk add bash "$JDK" \
&& if [ -z "$VERSION" ] ; then VERSION="$(curl -i -o - --silent https://api.github.com/repos/OpenIdentityPlatform/OpenDJ/releases/latest | grep -m1 "\"name\"" | cut -d\" -f4)"; fi \
&& if [ ! -f "$OPENDJ_DIST_FILENAME" ]; then echo file exists && curl -L https://github.com/OpenIdentityPlatform/OpenDJ/releases/download/$VERSION/opendj-$VERSION.zip --output $OPENDJ_DIST_FILENAME; fi \
&& unzip $OPENDJ_DIST_FILENAME \
--
Gitblit v1.10.0