Skip to content

Commit 0474632

Browse files
committed
Upgrade to Java 17.0.4.1_1 and pin base image distribution.
See spring-projects#4215
1 parent 8aab5e5 commit 0474632

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

ci/openjdk17-mongodb-4.4/Dockerfile

+2-1
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-5.0/Dockerfile

+2-1
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/openjdk17-mongodb-6.0/Dockerfile

+2-1
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 6.0 release signing key
1516
wget -qO - https://www.mongodb.org/static/pgp/server-6.0.asc | apt-key add - && \
1617
# Needed when MongoDB creates a 6.0 folder.
17-
echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/6.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-6.0.list && \
18+
echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/6.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-6.0.list && \
1819
echo ${TZ} > /etc/timezone
1920

2021
RUN apt-get update && \

ci/pipeline.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# Java versions
2-
java.main.tag=17.0.2_8-jdk
2+
java.main.tag=17.0.4.1_1-jdk-focal
33

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

77
# Supported versions of MongoDB
8-
docker.mongodb.4.4.version=4.4.12
8+
docker.mongodb.4.4.version=4.4.17
99
docker.mongodb.5.0.version=5.0.6
1010
docker.mongodb.6.0.version=6.0.0
1111

0 commit comments

Comments
 (0)