diff --git a/cmake/modules/CPackConfig.cmake b/cmake/modules/CPackConfig.cmake index 428cc99b..6dcea07b 100644 --- a/cmake/modules/CPackConfig.cmake +++ b/cmake/modules/CPackConfig.cmake @@ -30,7 +30,7 @@ set(CPACK_GENERATOR DEB RPM TGZ) set(CPACK_DEBIAN_PACKAGE_SECTION "utils") set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64") set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://www.falco.org") -set(CPACK_DEBIAN_PACKAGE_DEPENDS "dkms (>= 2.1.0.0), libyaml-0-2") +set(CPACK_DEBIAN_PACKAGE_DEPENDS "dkms (>= 2.1.0.0)") set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_BINARY_DIR}/scripts/debian/postinst;${CMAKE_BINARY_DIR}/scripts/debian/prerm;${CMAKE_BINARY_DIR}/scripts/debian/postrm;${PROJECT_SOURCE_DIR}/cmake/cpack/debian/conffiles" ) diff --git a/docker/no-driver/Dockerfile b/docker/no-driver/Dockerfile index f6e86daa..d70594d7 100644 --- a/docker/no-driver/Dockerfile +++ b/docker/no-driver/Dockerfile @@ -13,7 +13,7 @@ WORKDIR / ADD https://bintray.com/api/ui/download/falcosecurity/${VERSION_BUCKET}/x86_64/falco-${FALCO_VERSION}-x86_64.tar.gz / RUN apt-get update -y && \ - apt-get install -y libyaml-0-2 binutils && \ + apt-get install -y binutils && \ tar -xvf falco-${FALCO_VERSION}-x86_64.tar.gz && \ rm -f falco-${FALCO_VERSION}-x86_64.tar.gz && \ mv falco-${FALCO_VERSION}-x86_64 falco && \ @@ -43,9 +43,6 @@ COPY --from=ubuntu /lib/x86_64-linux-gnu/libanl.so.1 \ COPY --from=ubuntu /usr/lib/x86_64-linux-gnu/libstdc++.so.6 \ /usr/lib/x86_64-linux-gnu/libstdc++.so.6 -COPY --from=ubuntu /usr/lib/x86_64-linux-gnu/libyaml-0.so.2.0.5 \ - /usr/lib/x86_64-linux-gnu/libyaml-0.so.2 - COPY --from=ubuntu /etc/ld.so.cache \ /etc/nsswitch.conf \ /etc/ld.so.cache \ diff --git a/docker/tester/root/runners/deb.Dockerfile b/docker/tester/root/runners/deb.Dockerfile index 0c665d27..7790186d 100644 --- a/docker/tester/root/runners/deb.Dockerfile +++ b/docker/tester/root/runners/deb.Dockerfile @@ -6,7 +6,7 @@ RUN test -n FALCO_VERSION ENV FALCO_VERSION ${FALCO_VERSION} RUN apt update -y -RUN apt install dkms libyaml-0-2 -y +RUN apt install dkms -y ADD falco-${FALCO_VERSION}-x86_64.deb / RUN dpkg -i /falco-${FALCO_VERSION}-x86_64.deb diff --git a/docker/tester/root/runners/tar.gz.Dockerfile b/docker/tester/root/runners/tar.gz.Dockerfile index d83f0d69..1ae6f2c7 100644 --- a/docker/tester/root/runners/tar.gz.Dockerfile +++ b/docker/tester/root/runners/tar.gz.Dockerfile @@ -6,7 +6,7 @@ RUN test -n FALCO_VERSION ENV FALCO_VERSION ${FALCO_VERSION} RUN apt update -y -RUN apt install dkms libyaml-0-2 curl -y +RUN apt install dkms curl -y ADD falco-${FALCO_VERSION}-x86_64.tar.gz / RUN cp -R /falco-${FALCO_VERSION}-x86_64/* / diff --git a/test/driver-loader/runner/Dockerfile b/test/driver-loader/runner/Dockerfile index 5a0fbd1d..c0491f7a 100644 --- a/test/driver-loader/runner/Dockerfile +++ b/test/driver-loader/runner/Dockerfile @@ -10,7 +10,6 @@ ENV HOST_ROOT=/host RUN apt-get update -y RUN apt-get install -y --no-install-recommends \ ca-certificates \ - libyaml-0-2 \ dkms \ curl \ gcc \