feat: remove no longer need packages from Dockerfiles

wazuh · Feb 13, 2025 · 5147202 · 5147202
1 parent 87ff8ed
commit 5147202
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 110 deletions.
diff --git a/packages/debs/amd64/agent/Dockerfile b/packages/debs/amd64/agent/Dockerfile
@@ -2,16 +2,11 @@ FROM debian:10
 
 ENV DEBIAN_FRONTEND=noninteractive
 
-# Installing necessary packages
 RUN apt-get update && apt-get install -y build-essential \
-            curl wget git gawk devscripts sudo libssl-dev \
-            unzip zip tar texinfo pkg-config clang-tidy uuid \
-            libmpfr-dev libgmp3-dev libmpc-dev autopoint libtool \
-            zlib1g-dev libgcrypt20-dev libmagic-dev libpopt-dev \
-            libmagic-dev libsqlite3-dev  gettext \
-            ninja-build libsystemd-dev libaudit-dev selinux-basics \
-            libarchive-dev debhelper libssl-dev libbz2-dev \
-            && rm -rf /var/lib/apt/lists/*
+    curl wget git devscripts sudo libssl-dev unzip zip \
+    tar pkg-config autopoint libtool gettext ninja-build \
+    libsystemd-dev selinux-basics debhelper \
+    && rm -rf /var/lib/apt/lists/*
 
 RUN echo "deb http://ftp.de.debian.org/debian bullseye main" >>/etc/apt/sources.list && \
     apt-get update && apt-get install -y g++-10 && rm -rf /var/lib/apt/lists/*
@@ -35,23 +30,6 @@ RUN curl -OL https://github.com/Kitware/CMake/releases/download/v3.30.3/cmake-3.
     make -j$(nproc) && make install && ln -fs /usr/local/bin/cmake /usr/bin/cmake && \
     cd / && rm -rf cmake-*
 
-RUN curl -sO https://lua.org/ftp/lua-5.4.7.tar.gz && tar -xzvf lua-5.4.7.tar.gz && \
-    cd lua-5.4.7 && make -j$(nproc) linux CFLAGS+="-fPIC" LDFLAGS+="-fPIC" && make install && \
-    ln -fs /usr/local/bin/lua /usr/bin/lua && cd / && rm -rf lua*
-
-RUN mkdir -p /usr/local/lib/pkgconfig && \
-    echo "# Package Information for pkg-config" > /usr/local/lib/pkgconfig/lua.pc && \
-    echo "prefix=/usr/local" >> /usr/local/lib/pkgconfig/lua.pc && \
-    echo "exec_prefix=\${prefix}" >> /usr/local/lib/pkgconfig/lua.pc && \
-    echo "libdir=\${exec_prefix}/lib" >> /usr/local/lib/pkgconfig/lua.pc && \
-    echo "includedir=\${prefix}/include" >> /usr/local/lib/pkgconfig/lua.pc && \
-    echo "" >> /usr/local/lib/pkgconfig/lua.pc && \
-    echo "Name: Lua" >> /usr/local/lib/pkgconfig/lua.pc && \
-    echo "Description: Lua" >> /usr/local/lib/pkgconfig/lua.pc && \
-    echo "Version: 5.4.7" >> /usr/local/lib/pkgconfig/lua.pc && \
-    echo "Libs: -L\${libdir} -llua -lm" >> /usr/local/lib/pkgconfig/lua.pc && \
-    echo "Cflags: -I\${includedir}" >> /usr/local/lib/pkgconfig/lua.pc
-
 RUN git config --global --add safe.directory /wazuh-local-src
 
 RUN apt update && apt install dirmngr gnupg apt-transport-https ca-certificates -y && \

diff --git a/packages/debs/arm64/agent/Dockerfile b/packages/debs/arm64/agent/Dockerfile
@@ -2,16 +2,11 @@ FROM arm64v8/debian:10
 
 ENV DEBIAN_FRONTEND=noninteractive
 
-# Installing necessary packages
 RUN apt-get update && apt-get install -y build-essential \
-            curl wget git gawk devscripts sudo libssl-dev \
-            unzip zip tar texinfo pkg-config clang-tidy uuid \
-            libmpfr-dev libgmp3-dev libmpc-dev autopoint libtool \
-            zlib1g-dev libgcrypt20-dev libmagic-dev libpopt-dev \
-            libmagic-dev libsqlite3-dev gettext ninja-build \
-            ninja-build libsystemd-dev libaudit-dev selinux-basics \
-            libarchive-dev debhelper libssl-dev libbz2-dev \
-            && rm -rf /var/lib/apt/lists/*
+    curl wget git devscripts sudo libssl-dev unzip zip \
+    tar pkg-config autopoint libtool gettext ninja-build \
+    libsystemd-dev selinux-basics debhelper nuget \
+    && rm -rf /var/lib/apt/lists/*
 
 RUN echo "deb http://ftp.de.debian.org/debian bullseye main" >>/etc/apt/sources.list && \
     apt-get update && apt-get install -y g++-10 && rm -rf /var/lib/apt/lists/*
@@ -35,23 +30,6 @@ RUN curl -OL https://github.com/Kitware/CMake/releases/download/v3.30.3/cmake-3.
     make -j$(nproc) && make install && ln -s /usr/local/bin/cmake /usr/bin/cmake && \
     cd / && rm -rf cmake-*
 
-RUN curl -sO https://lua.org/ftp/lua-5.4.7.tar.gz && tar -xzvf lua-5.4.7.tar.gz && \
-    cd lua-5.4.7 && make -j$(nproc) linux CFLAGS+="-fPIC" LDFLAGS+="-fPIC" && make install && \
-    ln -fs /usr/local/bin/lua /usr/bin/lua && cd / && rm -rf lua*
-
-RUN mkdir -p /usr/local/lib/pkgconfig && \
-    echo "# Package Information for pkg-config" > /usr/local/lib/pkgconfig/lua.pc && \
-    echo "prefix=/usr/local" >> /usr/local/lib/pkgconfig/lua.pc && \
-    echo "exec_prefix=\${prefix}" >> /usr/local/lib/pkgconfig/lua.pc && \
-    echo "libdir=\${exec_prefix}/lib" >> /usr/local/lib/pkgconfig/lua.pc && \
-    echo "includedir=\${prefix}/include" >> /usr/local/lib/pkgconfig/lua.pc && \
-    echo "" >> /usr/local/lib/pkgconfig/lua.pc && \
-    echo "Name: Lua" >> /usr/local/lib/pkgconfig/lua.pc && \
-    echo "Description: Lua" >> /usr/local/lib/pkgconfig/lua.pc && \
-    echo "Version: 5.4.7" >> /usr/local/lib/pkgconfig/lua.pc && \
-    echo "Libs: -L\${libdir} -llua -lm" >> /usr/local/lib/pkgconfig/lua.pc && \
-    echo "Cflags: -I\${includedir}" >> /usr/local/lib/pkgconfig/lua.pc
-
 RUN git config --global --add safe.directory /wazuh-local-src
 
 RUN git clone https://github.com/mono/mono.git && cd mono && \

diff --git a/packages/rpms/amd64/agent/Dockerfile b/packages/rpms/amd64/agent/Dockerfile
@@ -6,20 +6,13 @@ COPY CentOS-Base.repo /etc/yum.repos.d/CentOS-Base.repo
 RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 RUN yum clean all && yum update -y
 
-RUN yum install -y gcc make wget git \
-    openssh-clients sudo gnupg libdb libdb-devel\
-    automake autoconf libtool policycoreutils-python \
-    yum-utils epel-release redhat-rpm-config rpm-devel \
-    autopoint gettext nspr nspr-devel \
-    nss nss-devel magic magic-devel \
-    db4 db4-devel zlib zlib-devel rpm-build bison \
-    sharutils bzip2-devel xz-devel lzo-devel \
-    e2fsprogs-devel libacl-devel libattr-devel \
-    openssl-devel libxml2-devel kexec-tools elfutils \
-    libarchive-devel elfutils-libelf-devel \
-    patchelf elfutils-devel libgcrypt-devel \
-    file-devel gettext-devel curl-devel systemd-devel \
-    ninja-build which python3
+RUN yum install -y gcc make wget git openssh-clients sudo gnupg \
+    libdb-devel libtool policycoreutils-python epel-release \
+    redhat-rpm-config rpm-devel autopoint nspr-devel nss-devel \
+    db4-devel rpm-build bison sharutils lzo-devel e2fsprogs-devel \
+    libacl-devel libattr-devel openssl-devel kexec-tools \
+    libarchive-devel elfutils-libelf-devel patchelf elfutils-devel \
+    libgcrypt-devel file-devel gettext-devel curl-devel systemd-devel
 
 RUN yum-builddep python34 -y
 
@@ -52,21 +45,12 @@ RUN git clone https://github.com/Perl/perl5.git --branch v5.34.0 --single-branch
     make -j$(nproc) && make install && ln -fs /usr/local/bin/perl /bin/perl && \
     cd / && rm -rf perl*
 
-RUN curl -O http://packages.wazuh.com/utils/autoconf/autoconf-2.69.tar.gz && \
-    gunzip autoconf-2.69.tar.gz && tar xvf autoconf-2.69.tar && \
-    cd autoconf-2.69 && ./configure && make -j$(nproc) && \
-    make install && cd / && rm -rf autoconf-*
-
-RUN git clone https://github.com/sqlite/sqlite.git --branch version-3.46.1 --single-branch && \
-    cd sqlite && ./configure && make -j$(nproc) && \
-    make install -j$(nproc) && ln -fs /usr/local/bin/sqlite3 /usr/bin/sqlite3 && \
-    cd / && rm -rf sqlit*
-
 RUN curl -sO https://lua.org/ftp/lua-5.4.7.tar.gz && tar -xzvf lua-5.4.7.tar.gz && \
     cd lua-5.4.7 && make -j$(nproc) linux CFLAGS+="-fPIC" LDFLAGS+="-fPIC" && make install && \
     ln -fs /usr/local/bin/lua /usr/bin/lua && cd / && rm -rf lua*
 
-RUN echo "# Package Information for pkg-config" > /usr/local/lib/pkgconfig/lua.pc && \
+RUN mkdir -p /usr/local/lib/pkgconfig && \
+    echo "# Package Information for pkg-config" > /usr/local/lib/pkgconfig/lua.pc && \
     echo "prefix=/usr/local" >> /usr/local/lib/pkgconfig/lua.pc && \
     echo "exec_prefix=\${prefix}" >> /usr/local/lib/pkgconfig/lua.pc && \
     echo "libdir=\${exec_prefix}/lib" >> /usr/local/lib/pkgconfig/lua.pc && \
@@ -78,10 +62,6 @@ RUN echo "# Package Information for pkg-config" > /usr/local/lib/pkgconfig/lua.p
     echo "Libs: -L\${libdir} -llua -lm" >> /usr/local/lib/pkgconfig/lua.pc && \
     echo "Cflags: -I\${includedir}" >> /usr/local/lib/pkgconfig/lua.pc
 
-RUN git clone https://github.com/rpm-software-management/popt.git --branch popt-1.19-release --single-branch && \
-    cd popt && ./autogen.sh && ./configure && make -j$(nproc) && make install -j$(nproc) && \
-    cd / && rm -rf popt*
-
 RUN git clone https://github.com/rpm-software-management/rpm.git --branch rpm-4.15.1-release --single-branch && \
     cd rpm && ./autogen.sh && make -j$(nproc) && make install && cd / && rm -rf rpm*
 

diff --git a/packages/rpms/arm64/agent/Dockerfile b/packages/rpms/arm64/agent/Dockerfile
@@ -4,20 +4,13 @@ FROM arm64v8/centos:7
 RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
 RUN sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
 
-RUN yum install -y gcc make wget git \
-    openssh-clients sudo gnupg libdb libdb-devel\
-    automake autoconf libtool policycoreutils-python \
-    yum-utils epel-release redhat-rpm-config rpm-devel \
-    autopoint gettext nspr nspr-devel \
-    nss nss-devel magic magic-devel \
-    db4 db4-devel zlib zlib-devel rpm-build bison \
-    sharutils bzip2-devel xz-devel lzo-devel \
-    e2fsprogs-devel libacl-devel libattr-devel \
-    openssl-devel libxml2-devel kexec-tools elfutils \
-    libarchive-devel elfutils-libelf-devel \
-    patchelf elfutils-devel libgcrypt-devel \
-    file-devel gettext-devel curl-devel systemd-devel \
-    which python3
+RUN yum install -y gcc make wget git openssh-clients sudo gnupg \
+    libdb-devel libtool policycoreutils-python epel-release \
+    redhat-rpm-config rpm-devel autopoint nspr-devel nss-devel \
+    db4-devel rpm-build bison sharutils lzo-devel e2fsprogs-devel \
+    libacl-devel libattr-devel openssl-devel kexec-tools \
+    libarchive-devel elfutils-libelf-devel patchelf elfutils-devel \
+    libgcrypt-devel file-devel gettext-devel curl-devel systemd-devel
 
 RUN yum-builddep python34 -y
 
@@ -50,21 +43,12 @@ RUN git clone https://github.com/Perl/perl5.git --branch v5.34.0 --single-branch
     make -j$(nproc) && make install && ln -fs /usr/local/bin/perl /bin/perl && \
     cd / && rm -rf perl*
 
-RUN curl -O http://packages.wazuh.com/utils/autoconf/autoconf-2.69.tar.gz && \
-    gunzip autoconf-2.69.tar.gz && tar xvf autoconf-2.69.tar && \
-    cd autoconf-2.69 && ./configure && make -j$(nproc) && \
-    make install && cd / && rm -rf autoconf-*
-
-RUN git clone https://github.com/sqlite/sqlite.git --branch version-3.46.1 --single-branch && \
-    cd sqlite && ./configure && make -j$(nproc) && \
-    make install -j$(nproc) && ln -fs /usr/local/bin/sqlite3 /usr/bin/sqlite3 && \
-    cd / && rm -rf sqlit*
-
 RUN curl -sO https://lua.org/ftp/lua-5.4.7.tar.gz && tar -xzvf lua-5.4.7.tar.gz && \
     cd lua-5.4.7 && make -j$(nproc) linux CFLAGS+="-fPIC" LDFLAGS+="-fPIC" && make install && \
     ln -fs /usr/local/bin/lua /usr/bin/lua && cd / && rm -rf lua*
 
-RUN echo "# Package Information for pkg-config" > /usr/local/lib/pkgconfig/lua.pc && \
+RUN mkdir -p /usr/local/lib/pkgconfig && \
+    echo "# Package Information for pkg-config" > /usr/local/lib/pkgconfig/lua.pc && \
     echo "prefix=/usr/local" >> /usr/local/lib/pkgconfig/lua.pc && \
     echo "exec_prefix=\${prefix}" >> /usr/local/lib/pkgconfig/lua.pc && \
     echo "libdir=\${exec_prefix}/lib" >> /usr/local/lib/pkgconfig/lua.pc && \
@@ -76,18 +60,23 @@ RUN echo "# Package Information for pkg-config" > /usr/local/lib/pkgconfig/lua.p
     echo "Libs: -L\${libdir} -llua -lm" >> /usr/local/lib/pkgconfig/lua.pc && \
     echo "Cflags: -I\${includedir}" >> /usr/local/lib/pkgconfig/lua.pc
 
-RUN git clone https://github.com/rpm-software-management/popt.git --branch popt-1.19-release --single-branch && \
-    cd popt && ./autogen.sh && ./configure && make -j$(nproc) && make install -j$(nproc) && \
-    cd / && rm -rf popt*
-
 RUN git clone https://github.com/rpm-software-management/rpm.git --branch rpm-4.15.1-release --single-branch && \
     cd rpm && ./autogen.sh && make -j$(nproc) && make install && cd / && rm -rf rpm*
 
 RUN mkdir -p /usr/local/var/lib/rpm && \
     cp /var/lib/rpm/Packages /usr/local/var/lib/rpm/Packages && \
     /usr/local/bin/rpm --rebuilddb && rm -rf /root/rpmbuild
 
+<<<<<<< HEAD
 RUN git clone https://github.com/mono/mono.git && cd mono && ./autogen.sh --prefix=/usr/local && \
     make -j $(nproc) && make install -j $(nproc) && cd .. && rm -rf mono && cert-sync /etc/ssl/certs/ca-bundle.crt
 
 RUN yum install ninja-build -y
+=======
+RUN rpmkeys --import "http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF" && \
+    su -c 'curl https://download.mono-project.com/repo/centos7-stable.repo | tee /etc/yum.repos.d/mono-centos7-stable.repo' && \
+    yum install mono-devel -y
+
+# Needs to be built later, version might be lower than vcpkg requires
+RUN yum install -y ninja-build
+>>>>>>> deac4c5a3 (feat: remove no longer need packages from Dockerfiles)