From d1b83b9b20cbf94b5bac6f20c693ae65b17ceae2 Mon Sep 17 00:00:00 2001
From: Antoine Toulme <antoine@lunar-ocean.com>
Date: Fri, 26 Jan 2024 16:13:50 -0800
Subject: [PATCH] Upgrade bundle image to Ubuntu 22.04 (#4205)

---
 internal/signalfx-agent/bundle/Dockerfile           | 8 +++++---
 internal/signalfx-agent/bundle/scripts/collect-libs | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/internal/signalfx-agent/bundle/Dockerfile b/internal/signalfx-agent/bundle/Dockerfile
index 68cafafcfe..f738f036a1 100644
--- a/internal/signalfx-agent/bundle/Dockerfile
+++ b/internal/signalfx-agent/bundle/Dockerfile
@@ -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
@@ -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 \
@@ -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
 
@@ -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
diff --git a/internal/signalfx-agent/bundle/scripts/collect-libs b/internal/signalfx-agent/bundle/scripts/collect-libs
index 2d264d2d9d..2984561a26 100755
--- a/internal/signalfx-agent/bundle/scripts/collect-libs
+++ b/internal/signalfx-agent/bundle/scripts/collect-libs
@@ -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