This is an automated email from the ASF dual-hosted git repository.
chenhang pushed a commit to branch branch-4.15
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/branch-4.15 by this push:
new ff12a561d0 fix: install netcat-openbsd instead of netcat in test image
build (#4476)
ff12a561d0 is described below
commit ff12a561d032082b7c9893b18e893cbf6016533d
Author: ZhangJian He <[email protected]>
AuthorDate: Mon Jul 29 14:33:02 2024 +0800
fix: install netcat-openbsd instead of netcat in test image build (#4476)
Signed-off-by: ZhangJian He <[email protected]>
(cherry picked from commit 56625245d53ce37525fc3f8eb4f3274beecf52eb)
---
tests/docker-images/all-released-versions-image/Dockerfile | 4 ++--
tests/docker-images/current-version-image/Dockerfile | 2 +-
tests/docker-images/statestore-image/Dockerfile | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/docker-images/all-released-versions-image/Dockerfile
b/tests/docker-images/all-released-versions-image/Dockerfile
index a8c761c7e8..b7fd4e2fd1 100644
--- a/tests/docker-images/all-released-versions-image/Dockerfile
+++ b/tests/docker-images/all-released-versions-image/Dockerfile
@@ -17,7 +17,7 @@
# under the License.
#
-FROM eclipse-temurin:8-jdk
+FROM eclipse-temurin:8-jdk-jammy
MAINTAINER Apache BookKeeper <[email protected]>
ENV BK_JOURNALDIR=/opt/bookkeeper/data/journal
@@ -31,7 +31,7 @@ RUN sed -i -e
"s|http://archive\.ubuntu\.com/ubuntu/|${UBUNTU_MIRROR:-http://arc
-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::http::ConnectionAttemptDelayMsec
"2000";\nAcquire::https::Timeout
"30";\nAcquire::https::ConnectionAttemptDelayMsec
"2000";\nAcquire::ftp::Timeout "30";\nAcquire::ftp::ConnectionAttemptDelayMsec
"2000";\nAcquire::Retries "15";' > /etc/apt/apt.conf.d/99timeout_and_retries \
&& apt-get update && apt-get install -qy wget curl supervisor bash
ca-certificates apt-transport-https \
- && apt-get -y install netcat dnsutils less procps iputils-ping \
+ && apt-get -y install netcat-openbsd dnsutils less procps iputils-ping \
&& apt-get install -y --no-install-recommends gpg gpg-agent sudo \
&& echo "dash dash/sh boolean false" | debconf-set-selections \
&& DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash \
diff --git a/tests/docker-images/current-version-image/Dockerfile
b/tests/docker-images/current-version-image/Dockerfile
index 0e489eb5ea..ae171625f4 100644
--- a/tests/docker-images/current-version-image/Dockerfile
+++ b/tests/docker-images/current-version-image/Dockerfile
@@ -45,7 +45,7 @@ RUN set -x \
&& apt-get install -y --no-install-recommends python3 pip \
&& ln -s /usr/bin/python3 /usr/bin/python \
&& apt-get install -y --no-install-recommends gpg gpg-agent wget sudo \
- && apt-get -y install netcat dnsutils less procps iputils-ping \
+ && apt-get -y install netcat-openbsd dnsutils less procps iputils-ping \
&& apt-get -y --purge autoremove \
&& apt-get autoclean \
&& apt-get clean \
diff --git a/tests/docker-images/statestore-image/Dockerfile
b/tests/docker-images/statestore-image/Dockerfile
index 5a7a168885..974d11b50c 100644
--- a/tests/docker-images/statestore-image/Dockerfile
+++ b/tests/docker-images/statestore-image/Dockerfile
@@ -40,7 +40,7 @@ RUN set -x \
&& apt-get install -y --no-install-recommends openjdk-17-jdk \
&& apt-get install -y --no-install-recommends python3 pip \
&& ln -s /usr/bin/python3 /usr/bin/python \
- && apt-get -y install netcat dnsutils less procps iputils-ping \
+ && apt-get -y install netcat-openbsd dnsutils less procps iputils-ping \
&& apt-get install -y --no-install-recommends gpg gpg-agent wget sudo \
&& apt-get -y --purge autoremove \
&& apt-get autoclean \
