From 04746326404741e66b6ea5059ac5b9201ebf2aa2 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 31 Oct 2022 10:27:36 +0100 Subject: [PATCH] Upgrade to Java 17.0.4.1_1 and pin base image distribution. See #4215 --- ci/openjdk17-mongodb-4.4/Dockerfile | 3 ++- ci/openjdk17-mongodb-5.0/Dockerfile | 3 ++- ci/openjdk17-mongodb-6.0/Dockerfile | 3 ++- ci/pipeline.properties | 4 ++-- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ci/openjdk17-mongodb-4.4/Dockerfile b/ci/openjdk17-mongodb-4.4/Dockerfile index e62c7b20c..9cda8dd33 100644 --- a/ci/openjdk17-mongodb-4.4/Dockerfile +++ b/ci/openjdk17-mongodb-4.4/Dockerfile @@ -9,10 +9,11 @@ ENV DEBIAN_FRONTEND=noninteractive RUN set -eux; \ sed -i -e 's/archive.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \ sed -i -e 's/security.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \ + sed -i -e 's/ports.ubuntu.com/mirrors.ocf.berkeley.edu/g' /etc/apt/sources.list && \ sed -i -e 's/http/https/g' /etc/apt/sources.list && \ apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 && \ apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv 656408E390CFB1F5 && \ - 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 && \ + 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 && \ echo ${TZ} > /etc/timezone RUN apt-get update && \ diff --git a/ci/openjdk17-mongodb-5.0/Dockerfile b/ci/openjdk17-mongodb-5.0/Dockerfile index 6e5f75761..dc949db94 100644 --- a/ci/openjdk17-mongodb-5.0/Dockerfile +++ b/ci/openjdk17-mongodb-5.0/Dockerfile @@ -9,12 +9,13 @@ ENV DEBIAN_FRONTEND=noninteractive RUN set -eux; \ sed -i -e 's/archive.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \ sed -i -e 's/security.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \ + sed -i -e 's/ports.ubuntu.com/mirrors.ocf.berkeley.edu/g' /etc/apt/sources.list && \ sed -i -e 's/http/https/g' /etc/apt/sources.list && \ apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 wget && \ # MongoDB 5.0 release signing key apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv B00A0BD1E2C63C11 && \ # Needed when MongoDB creates a 5.0 folder. - 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 && \ + 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 && \ echo ${TZ} > /etc/timezone RUN apt-get update && \ diff --git a/ci/openjdk17-mongodb-6.0/Dockerfile b/ci/openjdk17-mongodb-6.0/Dockerfile index a4381ea65..ca838e4c0 100644 --- a/ci/openjdk17-mongodb-6.0/Dockerfile +++ b/ci/openjdk17-mongodb-6.0/Dockerfile @@ -9,12 +9,13 @@ ENV DEBIAN_FRONTEND=noninteractive RUN set -eux; \ sed -i -e 's/archive.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \ sed -i -e 's/security.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \ + sed -i -e 's/ports.ubuntu.com/mirrors.ocf.berkeley.edu/g' /etc/apt/sources.list && \ sed -i -e 's/http/https/g' /etc/apt/sources.list && \ apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 wget && \ # MongoDB 6.0 release signing key wget -qO - https://www.mongodb.org/static/pgp/server-6.0.asc | apt-key add - && \ # Needed when MongoDB creates a 6.0 folder. - 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 && \ + 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 && \ echo ${TZ} > /etc/timezone RUN apt-get update && \ diff --git a/ci/pipeline.properties b/ci/pipeline.properties index 2c369c92a..d41b63b75 100644 --- a/ci/pipeline.properties +++ b/ci/pipeline.properties @@ -1,11 +1,11 @@ # Java versions -java.main.tag=17.0.2_8-jdk +java.main.tag=17.0.4.1_1-jdk-focal # Docker container images - standard docker.java.main.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.main.tag} # Supported versions of MongoDB -docker.mongodb.4.4.version=4.4.12 +docker.mongodb.4.4.version=4.4.17 docker.mongodb.5.0.version=5.0.6 docker.mongodb.6.0.version=6.0.0