Skip to content

Commit 97c0e36

Browse files
author
Bernhard B
committed
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.
1 parent be95cb9 commit 97c0e36

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

Dockerfile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,12 @@ RUN cd /tmp/signal-cli-rest-api-src && swag init && go test ./client -v && go bu
141141
RUN cd /tmp/signal-cli-rest-api-src/scripts && go build -o jsonrpc2-helper
142142

143143
# Start a fresh container for release container
144-
FROM eclipse-temurin:21-jre-jammy
144+
145+
# eclipse-temurin doesn't provide a OpenJDK 21 image for armv7 (see https://github.com/adoptium/containers/issues/502). Until this
146+
# is fixed we use the standard ubuntu image
147+
#FROM eclipse-temurin:21-jre-jammy
148+
149+
FROM ubuntu:jammy
145150

146151
ENV GIN_MODE=release
147152

@@ -154,7 +159,7 @@ ENV BUILD_VERSION=$BUILD_VERSION_ARG
154159

155160
RUN dpkg-reconfigure debconf --frontend=noninteractive \
156161
&& apt-get -qq update \
157-
&& apt-get -qq install -y --no-install-recommends util-linux supervisor netcat < /dev/null > /dev/null \
162+
&& apt-get -qq install -y --no-install-recommends util-linux supervisor netcat openjdk-21-jre < /dev/null > /dev/null \
158163
&& rm -rf /var/lib/apt/lists/*
159164

160165
COPY --from=buildcontainer /tmp/signal-cli-rest-api-src/signal-cli-rest-api /usr/bin/signal-cli-rest-api

0 commit comments

Comments
 (0)