Skip to content

Commit 0f6ee3d

Browse files
mp911demp911de
committed
Upgrade to Java 8u345-b01-jdk-focal and pin base image distribution.
See #4206
1 parent c3a5f32 commit 0f6ee3d

File tree

6 files changed

+66
-61
lines changed

6 files changed

+66
-61
lines changed

‎ci/openjdk11-mongodb-4.4/Dockerfile‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,16 @@ ENV TZ=Etc/UTC
77
ENV DEBIAN_FRONTEND=noninteractive
88

99
RUN set -eux; \
10-
sed -i -e 's/archive.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list; \
11-
sed -i -e 's/security.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list; \
12-
sed -i -e 's/http/https/g' /etc/apt/sources.list ; \
13-
apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 ; \
14-
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 ${TZ} > /etc/timezone;
10+
sed -i -e 's/archive.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \
11+
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 && \
13+
sed -i -e 's/http/https/g' /etc/apt/sources.list && \
14+
apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 && \
15+
apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv 656408E390CFB1F5 && \
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 && \
17+
echo ${TZ} > /etc/timezone
1718

18-
RUN apt-get update ; \
19-
apt-get install -y mongodb-org=${MONGODB} mongodb-org-server=${MONGODB} mongodb-org-shell=${MONGODB} mongodb-org-mongos=${MONGODB} mongodb-org-tools=${MONGODB} ; \
20-
apt-get clean; \
21-
rm -rf /var/lib/apt/lists/*;
19+
RUN apt-get update && \
20+
apt-get install -y mongodb-org=${MONGODB} mongodb-org-server=${MONGODB} mongodb-org-shell=${MONGODB} mongodb-org-mongos=${MONGODB} mongodb-org-tools=${MONGODB} && \
21+
apt-get clean && \
22+
rm -rf /var/lib/apt/lists/*

‎ci/openjdk17-mongodb-4.4/Dockerfile‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,16 @@ ENV TZ=Etc/UTC
77
ENV DEBIAN_FRONTEND=noninteractive
88

99
RUN set -eux; \
10-
sed -i -e 's/archive.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list; \
11-
sed -i -e 's/security.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list; \
12-
sed -i -e 's/http/https/g' /etc/apt/sources.list ; \
13-
apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 ; \
14-
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 ${TZ} > /etc/timezone;
10+
sed -i -e 's/archive.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \
11+
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 && \
13+
sed -i -e 's/http/https/g' /etc/apt/sources.list && \
14+
apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 && \
15+
apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv 656408E390CFB1F5 && \
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 && \
17+
echo ${TZ} > /etc/timezone
1718

18-
RUN apt-get update ; \
19-
apt-get install -y mongodb-org=${MONGODB} mongodb-org-server=${MONGODB} mongodb-org-shell=${MONGODB} mongodb-org-mongos=${MONGODB} mongodb-org-tools=${MONGODB} ; \
20-
apt-get clean; \
21-
rm -rf /var/lib/apt/lists/*;
19+
RUN apt-get update && \
20+
apt-get install -y mongodb-org=${MONGODB} mongodb-org-server=${MONGODB} mongodb-org-shell=${MONGODB} mongodb-org-mongos=${MONGODB} mongodb-org-tools=${MONGODB} && \
21+
apt-get clean && \
22+
rm -rf /var/lib/apt/lists/*

‎ci/openjdk8-mongodb-4.0/Dockerfile‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,17 @@ ARG MONGODB
66
ENV TZ=Etc/UTC
77
ENV DEBIAN_FRONTEND=noninteractive
88

9-
RUN RUN set -eux; \
10-
sed -i -e 's/archive.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list; \
11-
sed -i -e 's/security.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list; \
12-
sed -i -e 's/http/https/g' /etc/apt/sources.list ; \
13-
apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 ; \
14-
apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv 9DA31620334BD75D9DCB49F368818C72E52529D4 ; \
15-
echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.0.list; \
16-
echo ${TZ} > /etc/timezone;
9+
RUN set -eux; \
10+
sed -i -e 's/archive.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \
11+
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 && \
13+
sed -i -e 's/http/https/g' /etc/apt/sources.list && \
14+
apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 && \
15+
apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv 9DA31620334BD75D9DCB49F368818C72E52529D4 && \
16+
echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.0.list && \
17+
echo ${TZ} > /etc/timezone
1718

18-
RUN apt-get update ; \
19-
apt-get install -y mongodb-org=${MONGODB} mongodb-org-server=${MONGODB} mongodb-org-shell=${MONGODB} mongodb-org-mongos=${MONGODB} mongodb-org-tools=${MONGODB} ; \
20-
apt-get clean; \
21-
rm -rf /var/lib/apt/lists/*;
19+
RUN apt-get update && \
20+
apt-get install -y mongodb-org=${MONGODB} mongodb-org-server=${MONGODB} mongodb-org-shell=${MONGODB} mongodb-org-mongos=${MONGODB} mongodb-org-tools=${MONGODB} && \
21+
apt-get clean && \
22+
rm -rf /var/lib/apt/lists/*

‎ci/openjdk8-mongodb-4.4/Dockerfile‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,18 @@ ENV TZ=Etc/UTC
77
ENV DEBIAN_FRONTEND=noninteractive
88

99
RUN set -eux; \
10-
sed -i -e 's/archive.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list; \
11-
sed -i -e 's/security.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list; \
12-
sed -i -e 's/http/https/g' /etc/apt/sources.list ; \
13-
apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 ; \
14-
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 ${TZ} > /etc/timezone;
10+
sed -i -e 's/archive.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \
11+
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 && \
13+
sed -i -e 's/http/https/g' /etc/apt/sources.list && \
14+
apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 && \
15+
apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv 656408E390CFB1F5 && \
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 && \
17+
echo ${TZ} > /etc/timezone
1718

18-
RUN apt-get update ; \
19-
ln -T /bin/true /usr/bin/systemctl ; \
20-
apt-get install -y mongodb-org=${MONGODB} mongodb-org-server=${MONGODB} mongodb-org-shell=${MONGODB} mongodb-org-mongos=${MONGODB} mongodb-org-tools=${MONGODB} ; \
21-
rm /usr/bin/systemctl ; \
22-
apt-get clean ; \
23-
rm -rf /var/lib/apt/lists/* ;
19+
RUN apt-get update && \
20+
ln -T /bin/true /usr/bin/systemctl && \
21+
apt-get install -y mongodb-org=${MONGODB} mongodb-org-server=${MONGODB} mongodb-org-shell=${MONGODB} mongodb-org-mongos=${MONGODB} mongodb-org-tools=${MONGODB} && \
22+
rm /usr/bin/systemctl && \
23+
apt-get clean && \
24+
rm -rf /var/lib/apt/lists/*

‎ci/openjdk8-mongodb-5.0/Dockerfile‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,18 @@ ENV TZ=Etc/UTC
77
ENV DEBIAN_FRONTEND=noninteractive
88

99
RUN set -eux; \
10-
sed -i -e 's/archive.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list; \
11-
sed -i -e 's/security.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list; \
12-
sed -i -e 's/http/https/g' /etc/apt/sources.list ; \
13-
apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 wget ; \
10+
sed -i -e 's/archive.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \
11+
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 && \
13+
sed -i -e 's/http/https/g' /etc/apt/sources.list && \
14+
apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 wget && \
1415
# MongoDB 5.0 release signing key
15-
apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv B00A0BD1E2C63C11 ; \
16+
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 ${TZ} > /etc/timezone;
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 && \
19+
echo ${TZ} > /etc/timezone
1920

20-
RUN apt-get update; \
21-
apt-get install -y mongodb-org=${MONGODB} mongodb-org-server=${MONGODB} mongodb-org-shell=${MONGODB} mongodb-org-mongos=${MONGODB} mongodb-org-tools=${MONGODB} ; \
22-
apt-get clean; \
23-
rm -rf /var/lib/apt/lists/*;
21+
RUN apt-get update && \
22+
apt-get install -y mongodb-org=${MONGODB} mongodb-org-server=${MONGODB} mongodb-org-shell=${MONGODB} mongodb-org-mongos=${MONGODB} mongodb-org-tools=${MONGODB} && \
23+
apt-get clean && \
24+
rm -rf /var/lib/apt/lists/*

‎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)