Skip to content

Commit

Permalink
fix: install netcat-openbsd instead of netcat in test image build (#4476
Browse files Browse the repository at this point in the history
)

Signed-off-by: ZhangJian He <shoothzj@gmail.com>
(cherry picked from commit 5662524)
  • Loading branch information
shoothzj authored and hangc0276 committed Aug 5, 2024
1 parent f51f584 commit 66e84ad
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions tests/docker-images/all-released-versions-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# under the License.
#

FROM eclipse-temurin:8-jdk
FROM eclipse-temurin:8-jdk-jammy
MAINTAINER Apache BookKeeper <dev@bookkeeper.apache.org>

ENV BK_JOURNALDIR=/opt/bookkeeper/data/journal
Expand All @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion tests/docker-images/current-version-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion tests/docker-images/statestore-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down

0 comments on commit 66e84ad

Please sign in to comment.