From 5a999bacf89c37c0ad3cbd4f749a4751052eab38 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 31 Oct 2022 10:53:45 +0100 Subject: [PATCH] Upgrade to Java 8u345-b01-jdk-focal and pin base image distribution. See #4208 --- ci/openjdk11-mongodb-4.4/Dockerfile | 3 ++- ci/openjdk17-mongodb-4.4/Dockerfile | 3 ++- ci/openjdk8-mongodb-4.0/Dockerfile | 3 ++- ci/openjdk8-mongodb-4.4/Dockerfile | 3 ++- ci/openjdk8-mongodb-5.0/Dockerfile | 3 ++- ci/pipeline.properties | 6 +++--- 6 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ci/openjdk11-mongodb-4.4/Dockerfile b/ci/openjdk11-mongodb-4.4/Dockerfile index e62c7b20c..9cda8dd33 100644 --- a/ci/openjdk11-mongodb-4.4/Dockerfile +++ b/ci/openjdk11-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-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/openjdk8-mongodb-4.0/Dockerfile b/ci/openjdk8-mongodb-4.0/Dockerfile index 9f6b40d9a..d71ef1b78 100644 --- a/ci/openjdk8-mongodb-4.0/Dockerfile +++ b/ci/openjdk8-mongodb-4.0/Dockerfile @@ -6,9 +6,10 @@ ARG MONGODB ENV TZ=Etc/UTC ENV DEBIAN_FRONTEND=noninteractive -RUN RUN set -eux; \ +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 9DA31620334BD75D9DCB49F368818C72E52529D4 && \ diff --git a/ci/openjdk8-mongodb-4.4/Dockerfile b/ci/openjdk8-mongodb-4.4/Dockerfile index 4c5fc8f2b..9da992dad 100644 --- a/ci/openjdk8-mongodb-4.4/Dockerfile +++ b/ci/openjdk8-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/openjdk8-mongodb-5.0/Dockerfile b/ci/openjdk8-mongodb-5.0/Dockerfile index 6e5f75761..f777e3857 100644 --- a/ci/openjdk8-mongodb-5.0/Dockerfile +++ b/ci/openjdk8-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/pipeline.properties b/ci/pipeline.properties index f3c84e052..f3d040ab0 100644 --- a/ci/pipeline.properties +++ b/ci/pipeline.properties @@ -1,7 +1,7 @@ # Java versions -java.main.tag=8u322-b06-jdk -java.next.tag=11.0.14.1_1-jdk -java.lts.tag=17.0.2_8-jdk +java.main.tag=8u345-b01-jdk-focal +java.next.tag=11.0.16.1_1-jdk-focal +java.lts.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}