From 97c0e366f75194a05612e6ad3c32019d9676a3ca Mon Sep 17 00:00:00 2001 From: Bernhard B Date: Wed, 21 Feb 2024 16:15:56 +0100 Subject: [PATCH] use standard ubuntu image instead of eclipse-temurin * the eclipse-temurin project doesn't provide a OpenJDK 21 image for armv7. Until this is fixed, we use the standard ubuntu image. --- Dockerfile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8fec926d..3de05764 100644 --- a/Dockerfile +++ b/Dockerfile @@ -141,7 +141,12 @@ RUN cd /tmp/signal-cli-rest-api-src && swag init && go test ./client -v && go bu RUN cd /tmp/signal-cli-rest-api-src/scripts && go build -o jsonrpc2-helper # Start a fresh container for release container -FROM eclipse-temurin:21-jre-jammy + +# eclipse-temurin doesn't provide a OpenJDK 21 image for armv7 (see https://github.com/adoptium/containers/issues/502). Until this +# is fixed we use the standard ubuntu image +#FROM eclipse-temurin:21-jre-jammy + +FROM ubuntu:jammy ENV GIN_MODE=release @@ -154,7 +159,7 @@ ENV BUILD_VERSION=$BUILD_VERSION_ARG RUN dpkg-reconfigure debconf --frontend=noninteractive \ && apt-get -qq update \ - && apt-get -qq install -y --no-install-recommends util-linux supervisor netcat < /dev/null > /dev/null \ + && apt-get -qq install -y --no-install-recommends util-linux supervisor netcat openjdk-21-jre < /dev/null > /dev/null \ && rm -rf /var/lib/apt/lists/* COPY --from=buildcontainer /tmp/signal-cli-rest-api-src/signal-cli-rest-api /usr/bin/signal-cli-rest-api