This is an automated email from the ASF dual-hosted git repository.
zrhoffman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new 9893f14c51 Update dockerfile to include various required packages
(#7003)
9893f14c51 is described below
commit 9893f14c516cc18b5a4167c4540cd8aab58b2ea6
Author: Evan Zelkowitz <[email protected]>
AuthorDate: Thu Aug 4 13:19:20 2022 -0600
Update dockerfile to include various required packages (#7003)
* Update dockerfile to include various required packages
* Add missing reqs to CiaB dockerfile
* change indentation to spaces
---
cache-config/testing/docker/trafficserver/Dockerfile | 5 ++++-
infrastructure/cdn-in-a-box/cache/Dockerfile | 2 ++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/cache-config/testing/docker/trafficserver/Dockerfile
b/cache-config/testing/docker/trafficserver/Dockerfile
index 755d47db7b..4b2663811b 100644
--- a/cache-config/testing/docker/trafficserver/Dockerfile
+++ b/cache-config/testing/docker/trafficserver/Dockerfile
@@ -63,10 +63,12 @@ RUN if [[ ${OS_VERSION%%.*} -ge 8 ]]; then \
curl \
gcc-toolset-9 \
gcc-toolset-9-runtime \
+ geoip \
jansson \
jansson-devel \
libmaxminddb \
- libmaxminddb-devel); \
+ libmaxminddb-devel \
+ libuuid ); \
os_toolset="gcc-toolset-9"; \
else \
os_pkgs=(devtoolset-9); \
@@ -103,6 +105,7 @@ RUN if [[ ${OS_VERSION%%.*} -ge 8 ]]; then \
python3 \
sudo \
tcl-devel \
+ xz \
zlib \
zlib-devel \
&& yum clean all
diff --git a/infrastructure/cdn-in-a-box/cache/Dockerfile
b/infrastructure/cdn-in-a-box/cache/Dockerfile
index 0333824a41..4f70fb90a3 100644
--- a/infrastructure/cdn-in-a-box/cache/Dockerfile
+++ b/infrastructure/cdn-in-a-box/cache/Dockerfile
@@ -60,6 +60,7 @@ RUN dnf -y install epel-release && \
libmaxminddb \
libtool-ltdl \
libunwind \
+ libuuid \
# luajit is required by the ATS TSB RPM
luajit \
lzo \
@@ -68,6 +69,7 @@ RUN dnf -y install epel-release && \
openssl \
perl \
tcl \
+ xz \
$additional_packages
RUN dnf install -y bind-utils kyotocabinet-libs initscripts iproute net-tools
nmap-ncat gettext autoconf automake libtool gcc-c++ cronie glibc-devel
openssl-devel && \
