From 284a4972ae75fa857b33784ef9b1c0fa01ccc3fe Mon Sep 17 00:00:00 2001 From: Valery Kharseko Date: Wed, 22 May 2024 11:18:46 +0300 Subject: [PATCH] Bump Docker to 19-jre and restore linux/s390x linux/arm64/8 platforms (#33) --- .github/workflows/build.yml | 4 ++-- .github/workflows/release.yml | 4 ++-- Dockerfile | 2 +- Dockerfile-alpine | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 70d195a836..f9ec4e2db5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -109,7 +109,7 @@ jobs: file: ./Dockerfile build-args: | VERSION=${{ env.release_version }} - platforms: linux/amd64, linux/arm64/8, linux/arm/v7, linux/ppc64le #, linux/s390x + 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 }} @@ -157,7 +157,7 @@ jobs: file: ./Dockerfile-alpine build-args: | VERSION=${{ env.release_version }} - platforms: linux/amd64, linux/s390x, linux/386, linux/arm/v7, linux/arm/v6, linux/ppc64le #,linux/arm64/8 + platforms: linux/amd64, linux/s390x, linux/386, linux/arm/v7, linux/arm/v6, linux/ppc64le ,linux/arm64/8 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 9fad119c71..dd05cef8ad 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -113,7 +113,7 @@ jobs: file: ./Dockerfile build-args: | VERSION=${{ github.event.inputs.releaseVersion }} - platforms: linux/amd64, linux/arm64/8, linux/arm/v7, linux/ppc64le #, linux/s390x + 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 }} @@ -161,7 +161,7 @@ jobs: file: ./Dockerfile-alpine build-args: | VERSION=${{ github.event.inputs.releaseVersion }} - platforms: linux/amd64, linux/s390x, linux/386, linux/arm/v7, linux/arm/v6, linux/ppc64le #,linux/arm64/8 + platforms: linux/amd64, linux/s390x, linux/386, linux/arm/v7, linux/arm/v6, linux/ppc64le ,linux/arm64/8 push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 48334d21db..39b888a4c2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:8-jre-jammy +FROM eclipse-temurin:19-jre-jammy MAINTAINER Open Identity Platform Community diff --git a/Dockerfile-alpine b/Dockerfile-alpine index a097e4c309..8fed3c7690 100644 --- a/Dockerfile-alpine +++ b/Dockerfile-alpine @@ -15,7 +15,7 @@ WORKDIR /opt RUN apk add --update --no-cache --virtual builddeps curl unzip \ && apk upgrade --update --no-cache \ && apk add bash \ - && apk update && apk add java-snappy && apk add gcompat \ + && apk update \ && bash -c 'if [ ! -z "$VERSION" ] ; then rm -rf ./*.zip ; curl -L https://github.com/OpenIdentityPlatform/OpenIDM/releases/download/$VERSION/openidm-$VERSION.zip --output openidm-$VERSION.zip ; fi' \ && unzip openidm-*.zip && rm -rf *.zip \ && apk del unzip \