Update Dockerfile setup to use HTTPS sources.

Closes #3037
spring-projects · Nov 7, 2024 · 3ab32da · 3ab32da
1 parent 171790b
commit 3ab32da
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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; \