Skip to content

Commit 5a999ba

Browse files
committed
Upgrade to Java 8u345-b01-jdk-focal and pin base image distribution.
See #4208
1 parent be714cf commit 5a999ba

File tree

6 files changed

+13
-8
lines changed

6 files changed

+13
-8
lines changed

ci/openjdk11-mongodb-4.4/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@ ENV DEBIAN_FRONTEND=noninteractive
99
RUN set -eux; \
1010
sed -i -e 's/archive.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \
1111
sed -i -e 's/security.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \
12+
sed -i -e 's/ports.ubuntu.com/mirrors.ocf.berkeley.edu/g' /etc/apt/sources.list && \
1213
sed -i -e 's/http/https/g' /etc/apt/sources.list && \
1314
apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 && \
1415
apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv 656408E390CFB1F5 && \
15-
echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list && \
16+
echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list && \
1617
echo ${TZ} > /etc/timezone
1718

1819
RUN apt-get update && \

ci/openjdk17-mongodb-4.4/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@ ENV DEBIAN_FRONTEND=noninteractive
99
RUN set -eux; \
1010
sed -i -e 's/archive.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \
1111
sed -i -e 's/security.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \
12+
sed -i -e 's/ports.ubuntu.com/mirrors.ocf.berkeley.edu/g' /etc/apt/sources.list && \
1213
sed -i -e 's/http/https/g' /etc/apt/sources.list && \
1314
apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 && \
1415
apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv 656408E390CFB1F5 && \
15-
echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list && \
16+
echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list && \
1617
echo ${TZ} > /etc/timezone
1718

1819
RUN apt-get update && \

ci/openjdk8-mongodb-4.0/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ ARG MONGODB
66
ENV TZ=Etc/UTC
77
ENV DEBIAN_FRONTEND=noninteractive
88

9-
RUN RUN set -eux; \
9+
RUN set -eux; \
1010
sed -i -e 's/archive.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \
1111
sed -i -e 's/security.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \
12+
sed -i -e 's/ports.ubuntu.com/mirrors.ocf.berkeley.edu/g' /etc/apt/sources.list && \
1213
sed -i -e 's/http/https/g' /etc/apt/sources.list && \
1314
apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 && \
1415
apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv 9DA31620334BD75D9DCB49F368818C72E52529D4 && \

ci/openjdk8-mongodb-4.4/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@ ENV DEBIAN_FRONTEND=noninteractive
99
RUN set -eux; \
1010
sed -i -e 's/archive.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \
1111
sed -i -e 's/security.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \
12+
sed -i -e 's/ports.ubuntu.com/mirrors.ocf.berkeley.edu/g' /etc/apt/sources.list && \
1213
sed -i -e 's/http/https/g' /etc/apt/sources.list && \
1314
apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 && \
1415
apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv 656408E390CFB1F5 && \
15-
echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list && \
16+
echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list && \
1617
echo ${TZ} > /etc/timezone
1718

1819
RUN apt-get update && \

ci/openjdk8-mongodb-5.0/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@ ENV DEBIAN_FRONTEND=noninteractive
99
RUN set -eux; \
1010
sed -i -e 's/archive.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \
1111
sed -i -e 's/security.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \
12+
sed -i -e 's/ports.ubuntu.com/mirrors.ocf.berkeley.edu/g' /etc/apt/sources.list && \
1213
sed -i -e 's/http/https/g' /etc/apt/sources.list && \
1314
apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 wget && \
1415
# MongoDB 5.0 release signing key
1516
apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv B00A0BD1E2C63C11 && \
1617
# Needed when MongoDB creates a 5.0 folder.
17-
echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/5.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-5.0.list && \
18+
echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/5.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-5.0.list && \
1819
echo ${TZ} > /etc/timezone
1920

2021
RUN apt-get update && \

ci/pipeline.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Java versions
2-
java.main.tag=8u322-b06-jdk
3-
java.next.tag=11.0.14.1_1-jdk
4-
java.lts.tag=17.0.2_8-jdk
2+
java.main.tag=8u345-b01-jdk-focal
3+
java.next.tag=11.0.16.1_1-jdk-focal
4+
java.lts.tag=17.0.4.1_1-jdk-focal
55

66
# Docker container images - standard
77
docker.java.main.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.main.tag}

0 commit comments

Comments
 (0)