Add busybox

DataDog · Dec 22, 2022 · 477ba64 · 477ba64
1 parent 71daf7d
commit 477ba64
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 6 deletions.
diff --git a/deb-arm/Dockerfile b/deb-arm/Dockerfile
@@ -38,7 +38,7 @@ ENV DD_TARGET_ARCH $DD_TARGET_ARCH
 RUN grep -v return /root/.bashrc >> /root/newbashrc && cp /root/newbashrc /root/.bashrc
 
 RUN apt-get update && apt-get install -y fakeroot curl git procps bzip2 \
-    build-essential pkg-config tar libsystemd-dev libkrb5-dev \
+    build-essential busybox pkg-config tar libsystemd-dev libkrb5-dev \
     gettext libtool autopoint autoconf libtool-bin \
     selinux-basics default-jre
 

diff --git a/deb-x64/Dockerfile b/deb-x64/Dockerfile
@@ -61,7 +61,7 @@ RUN echo "deb http://deb.debian.org/debian jessie main contrib non-free" > /etc/
  echo "deb http://deb.debian.org/debian-security jessie/updates main contrib non-free" > /etc/apt/sources.list.d/security.list
 
 RUN apt-get update && apt-get install -y fakeroot procps bzip2 \
-  build-essential pkg-config libssl-dev libcurl4-openssl-dev libexpat-dev libpq-dev libz-dev \
+  build-essential busybox pkg-config libssl-dev libcurl4-openssl-dev libexpat-dev libpq-dev libz-dev \
   libsystemd-journal-dev rpm tar gettext libtool autopoint autoconf pkg-config flex \
   selinux-basics libtool-bin default-jre
 

diff --git a/rpm-arm64/Dockerfile b/rpm-arm64/Dockerfile
@@ -30,7 +30,7 @@ ENV DD_TARGET_ARCH $DD_TARGET_ARCH
 
 # The last two lines contain dependencies for build of newer rpm
 RUN yum -y install @development which perl-ExtUtils-MakeMaker ncurses-compat-libs git procps \
-    curl-devel expat-devel gettext-devel openssl-devel systemd-devel zlib-devel bzip2 glibc-static python-devel tar pkgconfig  \
+    busybox curl-devel expat-devel gettext-devel openssl-devel systemd-devel zlib-devel bzip2 glibc-static python-devel tar pkgconfig  \
     libtool autoconf policycoreutils-python \
     bzip2-devel e2fsprogs-devel file-devel libacl-devel libarchive-devel libattr-devel \
     libxml2-devel lzo-devel nss nss-devel popt-devel sharutils xz-devel java \

diff --git a/rpm-armhf/Dockerfile b/rpm-armhf/Dockerfile
@@ -31,7 +31,7 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 && \
 
 # The last two lines contain dependencies for build of newer rpm
 RUN yum -y install @development which perl-ExtUtils-MakeMaker ncurses-compat-libs git procps \
-    curl-devel expat-devel gettext-devel openssl-devel systemd-devel zlib-devel bzip2 glibc-static tar pkgconfig  \
+    busybox curl-devel expat-devel gettext-devel openssl-devel systemd-devel zlib-devel bzip2 glibc-static tar pkgconfig  \
     libtool autoconf policycoreutils-python \
     bzip2-devel e2fsprogs-devel file-devel libacl-devel libarchive-devel libattr-devel \
     libxml2-devel lzo-devel nss nss-devel popt-devel sharutils xz-devel java \

diff --git a/rpm-x64/Dockerfile b/rpm-x64/Dockerfile
@@ -55,7 +55,7 @@ RUN yum -y install \
   @development \
   which perl-ExtUtils-MakeMaker perl-parent \
   pkgconfig \
-  curl-devel expat-devel gettext-devel openssl-devel zlib-devel bzip2 \
+  busybox curl-devel expat-devel gettext-devel openssl-devel zlib-devel bzip2 \
   glibc-static tar libtool \
   bzip2-devel e2fsprogs-devel file-devel libacl-devel libattr-devel \
   libxml2-devel lzo-devel nss nss-devel popt-devel postgresql-devel sharutils xz-devel java \

diff --git a/suse-x64/Dockerfile b/suse-x64/Dockerfile
@@ -54,7 +54,7 @@ RUN rm /etc/zypp/repos.d/*non*
 # Install all distro-level dependencies
 RUN zypper clean -a && zypper --non-interactive refresh && \
     zypper --non-interactive install \
-      bison bzip2 curl gawk gcc48 gcc48-c++ gdbm-devel gettext-tools git \
+      bison busybox bzip2 curl gawk gcc48 gcc48-c++ gdbm-devel gettext-tools git \
       gettext-runtime less libffi-devel libtool libcurl-devel libexpat-devel \
       libopenssl1_0_0 libopenssl-devel make openssl perl perl-Module-Build \
       patch postgresql-devel procps rsync readline-devel rpm-build sqlite3-devel \

diff --git a/system-probe_arm64/Dockerfile b/system-probe_arm64/Dockerfile
@@ -11,6 +11,7 @@ RUN echo "deb http://deb.debian.org/debian buster-backports main" | tee -a /etc/
 
 RUN apt-get update && apt-get install -y --no-install-recommends apt-utils && apt-get dist-upgrade -y && apt-get install -y --no-install-recommends \
         bison \
+        busybox \
         cmake \
         curl \
         flex \

diff --git a/system-probe_x64/Dockerfile b/system-probe_x64/Dockerfile
@@ -11,6 +11,7 @@ RUN echo "deb http://deb.debian.org/debian buster-backports main" | tee -a /etc/
 
 RUN apt-get update && apt-get install -y --no-install-recommends apt-utils && apt-get dist-upgrade -y && apt-get install -y --no-install-recommends \
         bison \
+        busybox \
         cmake \
         curl \
         flex \
-Original file line number
+Diff line change
@@ Expand Up @@
     RUN apt-get update && apt-get install -y --no-install-recommends apt-utils && apt-get dist-upgrade -y && apt-get install -y --no-install-recommends \
             bison \
+            busybox \
             cmake \
             curl \
             flex \
@@ Expand Down @@