Skip to content

Commit cc58def

Browse files
authored
Pin a different version of openjdk17 deps in docker for ARM. (#920)
## Summary Addresses a build failure spotted at https://github.com/radixdlt/babylon-node/actions/runs/8797900181/job/24143785471#step:19:527. We recently had to bump a version, but it is not available for ARM (see https://packages.debian.org/bookworm/openjdk-17-jre-headless). ## Testing N/A, a build problem only.
2 parents d1fd27a + cfa0066 commit cc58def

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

.github/workflows/docker.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ jobs:
210210
cache_tag_suffix: arm64
211211
build-args: |
212212
WGET_VERSION=1.21.3-1+b1
213+
OPENJDK_17_VERSION=17.0.10+7-1~deb12u1
213214
VERSION_BRANCH=${{ needs.setup_version_properties.outputs.VERSION_BRANCH }}
214215
VERSION_COMMIT=${{ needs.setup_version_properties.outputs.VERSION_COMMIT }}
215216
VERSION_DISPLAY=${{ needs.setup_version_properties.outputs.VERSION_DISPLAY }}
@@ -298,6 +299,7 @@ jobs:
298299
provenance: "false"
299300
build-args: |
300301
WGET_VERSION=1.21.3-1+b1
302+
OPENJDK_17_VERSION=17.0.10+7-1~deb12u1
301303
VERSION_BRANCH=${{ needs.setup_version_properties.outputs.VERSION_BRANCH }}
302304
VERSION_COMMIT=${{ needs.setup_version_properties.outputs.VERSION_COMMIT }}
303305
VERSION_DISPLAY=${{ needs.setup_version_properties.outputs.VERSION_DISPLAY }}

Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ ENV DEBIAN_FRONTEND noninteractive
2121
CMD ["/bin/bash"]
2222

2323
ARG WGET_VERSION="1.21.3-1+b2"
24+
ARG OPENJDK_17_VERSION="17.0.11+9-1~deb12u1"
2425
ARG VERSION_BRANCH=""
2526
ARG VERSION_COMMIT=""
2627
ARG VERSION_DISPLAY=""
@@ -56,7 +57,7 @@ RUN apt-get update \
5657
wget=${WGET_VERSION} \
5758
software-properties-common=0.99.30-4 \
5859
&& apt-get install -y --no-install-recommends \
59-
openjdk-17-jdk=17.0.11+9-1~deb12u1 \
60+
openjdk-17-jdk=${OPENJDK_17_VERSION} \
6061
&& apt-get clean \
6162
&& rm -rf /var/lib/apt/lists/*
6263

@@ -238,6 +239,8 @@ FROM debian:12.1-slim as app-container
238239
LABEL org.opencontainers.image.source https://github.com/radixdlt/babylon-node
239240
LABEL org.opencontainers.image.authors="devops@radixdlt.com"
240241

242+
ARG OPENJDK_17_VERSION="17.0.11+9-1~deb12u1"
243+
241244
# Install dependencies needed for building the image or running the application
242245
# - unzip is needed for unpacking the java build artifacts
243246
# - daemontools is needed at application runtime for async tasks
@@ -257,7 +260,7 @@ LABEL org.opencontainers.image.authors="devops@radixdlt.com"
257260
# - https://packages.debian.org/bookworm/libc6
258261
RUN apt-get update -y \
259262
&& apt-get -y --no-install-recommends install \
260-
openjdk-17-jre-headless=17.0.11+9-1~deb12u1 \
263+
openjdk-17-jre-headless=${OPENJDK_17_VERSION} \
261264
# https://security-tracker.debian.org/tracker/CVE-2023-38545
262265
curl=7.88.1-10+deb12u5 \
263266
gettext-base=0.21-12 \

0 commit comments

Comments
 (0)