Skip to content

Commit

Permalink
Merge pull request #5005 from evolvedbinary/6.x.x/hotfix/docker-build
Browse files Browse the repository at this point in the history
[6.x.x] Fix the use of Debian Stretch repositories in the Docker builds
  • Loading branch information
dizzzz authored Aug 30, 2023
2 parents 8bd8732 + a6ac343 commit c1e4b4d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
2 changes: 2 additions & 0 deletions exist-docker/src/main/resources-filtered/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions exist-docker/src/main/resources-filtered/Dockerfile-DEBUG
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit c1e4b4d

Please sign in to comment.