From a6ac34363500678bd6eaa1940e6eed192994ac51 Mon Sep 17 00:00:00 2001 From: Adam Retter Date: Mon, 14 Aug 2023 16:07:43 -0400 Subject: [PATCH] [hotfix] Fix the use of Debian Stretch repositories in the Docker builds --- exist-docker/src/main/resources-filtered/Dockerfile | 2 ++ exist-docker/src/main/resources-filtered/Dockerfile-DEBUG | 2 ++ 2 files changed, 4 insertions(+) diff --git a/exist-docker/src/main/resources-filtered/Dockerfile b/exist-docker/src/main/resources-filtered/Dockerfile index 3db79c43ab8..d4e5550daea 100644 --- a/exist-docker/src/main/resources-filtered/Dockerfile +++ b/exist-docker/src/main/resources-filtered/Dockerfile @@ -22,6 +22,8 @@ # Install latest JRE 8 in Debian Stretch (which is the base of gcr.io/distroless/java:8) FROM debian:stretch-slim as updated-jre +RUN echo "deb http://archive.debian.org/debian stretch main" > /etc/apt/sources.list +RUN echo "deb http://archive.debian.org/debian stretch-backports main" >> /etc/apt/sources.list RUN apt-get update && apt-get -y dist-upgrade RUN apt-get install -y openjdk-8-jre-headless RUN apt-get install -y expat fontconfig # Install tools required by FOP diff --git a/exist-docker/src/main/resources-filtered/Dockerfile-DEBUG b/exist-docker/src/main/resources-filtered/Dockerfile-DEBUG index c1c6c37bb8a..609d1da350c 100644 --- a/exist-docker/src/main/resources-filtered/Dockerfile-DEBUG +++ b/exist-docker/src/main/resources-filtered/Dockerfile-DEBUG @@ -22,6 +22,8 @@ # Use JDK 8 in Debian Stretch (as our production image gcr.io/distroless/java:8 is based on Debian Stretch with just a JRE) FROM debian:stretch-slim +RUN echo "deb http://archive.debian.org/debian stretch main" > /etc/apt/sources.list +RUN echo "deb http://archive.debian.org/debian stretch-backports main" >> /etc/apt/sources.list RUN apt-get update && apt-get -y dist-upgrade RUN apt-get install -y openjdk-8-jdk-headless RUN apt-get install -y expat fontconfig # Install tools required by FOP