fix(docker,scripts): do not load falcoctl driver loader when installi…

…ng Falco deb package in docker image. Signed-off-by: Federico Di Pierro <nierro92@gmail.com>
falcosecurity · Apr 15, 2024 · ac61543 · ac61543
1 parent 7cc57a9
commit ac61543
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/docker/driver-loader-legacy/Dockerfile b/docker/driver-loader-legacy/Dockerfile
@@ -92,7 +92,7 @@ RUN rm -rf /usr/bin/clang \
 RUN curl -s https://falco.org/repo/falcosecurity-packages.asc | apt-key add - \
 	&& echo "deb https://download.falco.org/packages/${VERSION_BUCKET} stable main" | tee -a /etc/apt/sources.list.d/falcosecurity.list \
 	&& apt-get update -y \
-	&& if [ "$FALCO_VERSION" = "latest" ]; then apt-get install -y --no-install-recommends falco; else apt-get install -y --no-install-recommends falco=${FALCO_VERSION}; fi \
+	&& if [ "$FALCO_VERSION" = "latest" ]; then FALCO_DRIVER_CHOICE=none apt-get install -y --no-install-recommends falco; else FALCO_DRIVER_CHOICE=none apt-get install -y --no-install-recommends falco=${FALCO_VERSION}; fi \
 	&& apt-get clean \
 	&& rm -rf /var/lib/apt/lists/*
 

diff --git a/docker/falco/Dockerfile b/docker/falco/Dockerfile
@@ -44,7 +44,7 @@ RUN apt-get update \
 RUN curl -s https://falco.org/repo/falcosecurity-packages.asc | apt-key add - \
 	&& echo "deb https://download.falco.org/packages/${VERSION_BUCKET} stable main" | tee -a /etc/apt/sources.list.d/falcosecurity.list \
 	&& apt-get update -y \
-	&& if [ "$FALCO_VERSION" = "latest" ]; then apt-get install -y --no-install-recommends falco; else apt-get install -y --no-install-recommends falco=${FALCO_VERSION}; fi \
+	&& if [ "$FALCO_VERSION" = "latest" ]; then FALCO_DRIVER_CHOICE=none apt-get install -y --no-install-recommends falco; else FALCO_DRIVER_CHOICE=none apt-get install -y --no-install-recommends falco=${FALCO_VERSION}; fi \
 	&& apt-get clean \
 	&& rm -rf /var/lib/apt/lists/*
 

diff --git a/scripts/debian/postinst.in b/scripts/debian/postinst.in
@@ -80,7 +80,7 @@ if [ "$1" = "configure" ]; then
                 ;;
         esac
         if [ -n "$chosen_driver" ]; then
-            echo "[POST-INSTALL] Configure falcoctl driver type:"
+            echo "[POST-INSTALL] Configure falcoctl '$chosen_driver' driver type:"
             if [ "$chosen_driver" = "auto" ];  then
                 # Configure falcoctl to enable all drivers
                 falcoctl driver config --type "modern_ebpf" --type "ebpf" --type "kmod"

diff --git a/scripts/rpm/postinstall.in b/scripts/rpm/postinstall.in
@@ -79,6 +79,7 @@ if [ $1 -ge 1 ]; then
                 ;;
         esac
         if [ -n "$chosen_driver" ]; then
+            echo "[POST-INSTALL] Configure falcoctl '$chosen_driver' driver type:"
             if [ "$chosen_driver" = "auto" ];  then
                 # Configure falcoctl to enable all drivers
                 falcoctl driver config --type "modern_ebpf" --type "ebpf" --type "kmod"