Skip to content

Commit

Permalink
Upgrade bundle image to Ubuntu 22.04 (#4205)
Browse files Browse the repository at this point in the history
  • Loading branch information
atoulme authored Jan 27, 2024
1 parent 7b165cc commit d1b83b9
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
8 changes: 5 additions & 3 deletions internal/signalfx-agent/bundle/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ ARG DOCKER_REPO=docker.io


######## Base image for subsequent stages ########
FROM ${DOCKER_REPO}/ubuntu:20.04 as base
FROM ${DOCKER_REPO}/ubuntu:22.04 as base

ARG ARCH
ENV DEBIAN_FRONTEND noninteractive
Expand Down Expand Up @@ -235,6 +235,7 @@ RUN DISABLE_XENCPU=""; if [ "$ARCH" = "ppc64le" ]; then DISABLE_XENCPU="--disabl
--disable-barometer \
--disable-dpdkstat \
--disable-dpdkevents \
--disable-gmond \
--disable-gps \
--disable-grpc \
--disable-intel_pmu \
Expand Down Expand Up @@ -335,7 +336,8 @@ RUN apt-get install -qq -y \
host \
iproute2 \
netcat \
netcat.openbsd
netcat.openbsd \
libtirpc3

COPY scripts/collect-libs /opt/collect-libs

Expand Down Expand Up @@ -406,7 +408,7 @@ COPY --from=collectd /usr/local/bin/patchelf /bin/
# Pull in the Linux dynamic link loader at a fixed path across all
# architectures. Binaries will later be patched to use this interpreter
# natively.
COPY --from=extra-packages /lib/*-linux-gnu/ld-2.31.so /bin/ld-linux.so
COPY --from=extra-packages /lib/*-linux-gnu/ld-* /bin/ld-linux.so

# Java dependencies
COPY --from=extra-packages /opt/root/jre/ /jre
Expand Down
2 changes: 1 addition & 1 deletion internal/signalfx-agent/bundle/scripts/collect-libs
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ arch=$(uname -m)
if [ "$arch" = "ppc64le" ]; then
arch="powerpc64le"
fi
for lib in /lib/${arch}-linux-gnu/libnss_* /lib/${arch}-linux-gnu/libnsl* $libs $transitive_deps
for lib in /lib/${arch}-linux-gnu/libnss_* /lib/${arch}-linux-gnu/libnsl* /usr/lib/${arch}-linux-gnu/libtirpc* $libs $transitive_deps
do
copy_file_and_links $lib $target_path
done
Expand Down

0 comments on commit d1b83b9

Please sign in to comment.