This is an automated email from the ASF dual-hosted git repository.
technoboy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new b1900712c07 [improve][build] Configure https timeout for apt, copy
config to java-test-image (#21724)
b1900712c07 is described below
commit b1900712c073bb83dd67326cb17561ce5383cf0c
Author: Lari Hotari <lhot...@users.noreply.github.com>
AuthorDate: Thu Dec 14 15:46:48 2023 +0200
[improve][build] Configure https timeout for apt, copy config to
java-test-image (#21724)
---
docker/pulsar/Dockerfile | 2 +-
tests/docker-images/java-test-image/Dockerfile | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/docker/pulsar/Dockerfile b/docker/pulsar/Dockerfile
index 2bd6d402f76..989085a68d7 100644
--- a/docker/pulsar/Dockerfile
+++ b/docker/pulsar/Dockerfile
@@ -59,7 +59,7 @@ ARG JDK_MAJOR_VERSION=17
# Install some utilities
RUN sed -i -e
"s|http://archive\.ubuntu\.com/ubuntu/|${UBUNTU_MIRROR:-http://archive.ubuntu.com/ubuntu/}|g"
\
-e
"s|http://security\.ubuntu\.com/ubuntu/|${UBUNTU_SECURITY_MIRROR:-http://security.ubuntu.com/ubuntu/}|g"
/etc/apt/sources.list \
- && echo 'Acquire::http::Timeout "30";\nAcquire::ftp::Timeout
"30";\nAcquire::Retries "3";' > /etc/apt/apt.conf.d/99timeout_and_retries \
+ && echo 'Acquire::http::Timeout "30";\nAcquire::https::Timeout
"30";\nAcquire::ftp::Timeout "30";\nAcquire::Retries "3";' >
/etc/apt/apt.conf.d/99timeout_and_retries \
&& apt-get update \
&& apt-get -y dist-upgrade \
&& apt-get -y install netcat dnsutils less procps iputils-ping \
diff --git a/tests/docker-images/java-test-image/Dockerfile
b/tests/docker-images/java-test-image/Dockerfile
index 6a9c7d10331..83a440a7602 100644
--- a/tests/docker-images/java-test-image/Dockerfile
+++ b/tests/docker-images/java-test-image/Dockerfile
@@ -39,9 +39,10 @@ ARG JDK_MAJOR_VERSION=17
RUN sed -i -e
"s|http://archive\.ubuntu\.com/ubuntu/|${UBUNTU_MIRROR:-http://archive.ubuntu.com/ubuntu/}|g"
\
-e
"s|http://security\.ubuntu\.com/ubuntu/|${UBUNTU_SECURITY_MIRROR:-http://security.ubuntu.com/ubuntu/}|g"
/etc/apt/sources.list \
+ && echo 'Acquire::http::Timeout "30";\nAcquire::https::Timeout
"30";\nAcquire::ftp::Timeout "30";\nAcquire::Retries "3";' >
/etc/apt/apt.conf.d/99timeout_and_retries \
&& apt-get update \
&& apt-get -y dist-upgrade \
- && apt-get -y install wget apt-transport-https
+ && apt-get -y install ca-certificates wget apt-transport-https
# Install Eclipse Temurin Package
RUN mkdir -p /etc/apt/keyrings \
