From 3ab32dace2354e01ca9ce8f2371b85518ef8c9a9 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 7 Nov 2024 16:38:56 +0100 Subject: [PATCH] Update Dockerfile setup to use HTTPS sources. Closes #3037 --- ci/openjdk17-redis-6.2/Dockerfile | 5 ++++- ci/openjdk17-redis-7.2/Dockerfile | 5 ++++- ci/openjdk17-valkey-7.2/Dockerfile | 5 ++++- ci/openjdk21-redis-6.2/Dockerfile | 7 +++++-- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/ci/openjdk17-redis-6.2/Dockerfile b/ci/openjdk17-redis-6.2/Dockerfile index d20826b6cb..bf7cb4d390 100644 --- a/ci/openjdk17-redis-6.2/Dockerfile +++ b/ci/openjdk17-redis-6.2/Dockerfile @@ -8,7 +8,10 @@ ENV VERSION=${VERSION} COPY ./Makefile / RUN set -eux; \ -# sed -i -e 's/http/https/g' /etc/apt/sources.list ; \ + 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 build-essential ; \ make work/redis/bin/redis-cli work/redis/bin/redis-server VERSION=${VERSION}; \ diff --git a/ci/openjdk17-redis-7.2/Dockerfile b/ci/openjdk17-redis-7.2/Dockerfile index d20826b6cb..bf7cb4d390 100644 --- a/ci/openjdk17-redis-7.2/Dockerfile +++ b/ci/openjdk17-redis-7.2/Dockerfile @@ -8,7 +8,10 @@ ENV VERSION=${VERSION} COPY ./Makefile / RUN set -eux; \ -# sed -i -e 's/http/https/g' /etc/apt/sources.list ; \ + 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 build-essential ; \ make work/redis/bin/redis-cli work/redis/bin/redis-server VERSION=${VERSION}; \ diff --git a/ci/openjdk17-valkey-7.2/Dockerfile b/ci/openjdk17-valkey-7.2/Dockerfile index 1b89b923ae..2c7dfcbce4 100644 --- a/ci/openjdk17-valkey-7.2/Dockerfile +++ b/ci/openjdk17-valkey-7.2/Dockerfile @@ -10,7 +10,10 @@ ENV GH_ORG=valkey-io COPY ./Makefile / RUN set -eux; \ -# sed -i -e 's/http/https/g' /etc/apt/sources.list ; \ + 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 build-essential ; \ make work/valkey/bin/valkey-cli work/valkey/bin/valkey-server VERSION=${VERSION}; \ diff --git a/ci/openjdk21-redis-6.2/Dockerfile b/ci/openjdk21-redis-6.2/Dockerfile index d20826b6cb..a92d2b8fd6 100644 --- a/ci/openjdk21-redis-6.2/Dockerfile +++ b/ci/openjdk21-redis-6.2/Dockerfile @@ -8,9 +8,12 @@ ENV VERSION=${VERSION} COPY ./Makefile / RUN set -eux; \ -# sed -i -e 's/http/https/g' /etc/apt/sources.list ; \ + 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 build-essential ; \ + apt-get install -y build-essential curl ; \ make work/redis/bin/redis-cli work/redis/bin/redis-server VERSION=${VERSION}; \ chmod -R o+rw work; \ apt-get clean; \