From d967673e1af894245300dc734496caf0a74701d4 Mon Sep 17 00:00:00 2001
From: vharseko <vharseko@3a-systems.ru>
Date: Thu, 08 Dec 2022 17:57:31 +0000
Subject: [PATCH] Docker add jdk17 platforms: linux/amd64, linux/arm64/8, linux/arm/v7, linux/ppc64le, linux/s390x (#267)
---
.github/workflows/release.yml | 2 +-
.github/workflows/build.yml | 2 +-
opendj-packages/opendj-docker/Dockerfile | 10 +++++-----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d02ab1a..a65d9cd 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -123,7 +123,7 @@
file: ./opendj-packages/opendj-docker/Dockerfile
build-args: |
VERSION=${{ env.release_version }}
- platforms: linux/amd64,linux/arm64/8
+ platforms: linux/amd64, linux/arm64/8, linux/arm/v7, linux/ppc64le, linux/s390x
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 55025e8..b7d8ed1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -165,7 +165,7 @@
file: ./opendj-packages/opendj-docker/Dockerfile
build-args: |
VERSION=${{ github.event.inputs.releaseVersion }}
- platforms: linux/amd64,linux/arm64/8
+ platforms: linux/amd64, linux/arm64/8, linux/arm/v7, linux/ppc64le, linux/s390x
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
diff --git a/opendj-packages/opendj-docker/Dockerfile b/opendj-packages/opendj-docker/Dockerfile
index bfe8454..85816bd 100644
--- a/opendj-packages/opendj-docker/Dockerfile
+++ b/opendj-packages/opendj-docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:17
+FROM eclipse-temurin:17-jre-jammy
MAINTAINER Open Identity Platform Community <open-identity-platform-opendj@googlegroups.com>
@@ -20,12 +20,12 @@
WORKDIR /opt
-RUN microdnf upgrade --nodocs \
- && microdnf install --nodocs curl unzip findutils \
+RUN apt-get update \
+ && apt-get install -y --no-install-recommends curl unzip \
&& curl -L https://github.com/OpenIdentityPlatform/OpenDJ/releases/download/$VERSION/opendj-$VERSION.zip --output opendj-$VERSION.zip \
&& unzip opendj-$VERSION.zip \
- && microdnf remove unzip \
- && microdnf clean all\
+ && apt-get remove -y --purge curl unzip \
+ && rm -rf /var/lib/apt/lists/* \
&& rm -r opendj-*.zip \
&& groupadd $OPENDJ_USER \
&& useradd -m -r -u 1001 -g $OPENDJ_USER $OPENDJ_USER \
--
Gitblit v1.10.0