Docker - Falco - Upgrade to Debian 12 (#2823)

docker/falco/0/debian11/0.36/Dockerfile

@@ -1,10 +1,10 @@
-FROM marketplace.gcr.io/google/c2d-debian11 as ospo
+FROM marketplace.gcr.io/google/debian12 as ospo
 
 # Download Licenses and restricted source-code
 COPY components.csv /components.csv
 COPY source_code.txt /source_code.txt
 
-RUN apt update && apt -y install ca-certificates
+RUN apt update && apt -y install curl ca-certificates
 
 RUN curl -o /download-licenses.sh -L https://raw.githubusercontent.com/GoogleCloudPlatform/click-to-deploy/master/scripts/download-licenses.sh \
 		&& curl -o /download-ref-repos.sh -L https://raw.githubusercontent.com/GoogleCloudPlatform/click-to-deploy/master/scripts/download-ref-repos.sh \
@@ -15,17 +15,17 @@ RUN mkdir -p /usr/src/licenses \
 		&& /download-licenses.sh /components.csv /usr/src/licenses \
 		&& /download-ref-repos.sh /source_code.txt /usr/src
 
-FROM marketplace.gcr.io/google/c2d-debian11
+FROM marketplace.gcr.io/google/debian12
 
 COPY --from=ospo /usr/src /usr/src
 ARG FALCO_VERSION=0.36.2
 ARG VERSION_BUCKET=deb
 ENV VERSION_BUCKET=${VERSION_BUCKET}
 
-ENV FALCO_VERSION ${FALCO_VERSION}
-ENV C2D_RELEASE 0.36.2
-ENV HOST_ROOT /host
-ENV HOME /root
+ENV FALCO_VERSION=${FALCO_VERSION}
+ENV C2D_RELEASE=0.36.2
+ENV HOST_ROOT=/host
+ENV HOME=/root
 
 RUN cp /etc/skel/.bashrc /root && cp /etc/skel/.profile /root
 
@@ -34,8 +34,9 @@ RUN apt-get update \
 	bash-completion \
 	bc \
 	bison \
-	clang-11 \
+	clang \
 	ca-certificates \
+	curl \
 	dkms \
 	flex \
 	gnupg2 \
@@ -44,14 +45,11 @@ RUN apt-get update \
 	libc6-dev \
 	libelf-dev \
 	libssl-dev \
-	llvm-11 \
-	netcat \
+	llvm \
+	netcat-traditional \
 	xz-utils \
 	&& rm -rf /var/lib/apt/lists/*
 
-RUN ln -s /usr/bin/clang-11 /usr/bin/clang \
-	&& ln -s /usr/bin/llc-11 /usr/bin/llc
-
 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 \

docker/falco/exporter/Dockerfile

@@ -1,6 +1,6 @@
-FROM marketplace.gcr.io/google/c2d-debian11
+FROM marketplace.gcr.io/google/debian12
 
-ENV EXPORTER_VERSION 0.8.6
+ENV EXPORTER_VERSION=0.8.7
 
 RUN set -eu \
     # Installing utilities

docker/falco/templates/Dockerfile.template

@@ -6,7 +6,7 @@ FROM {{ .From }} as ospo
 COPY components.csv /components.csv
 COPY source_code.txt /source_code.txt
 
-RUN apt update && apt -y install ca-certificates
+RUN apt update && apt -y install curl ca-certificates
 
 RUN curl -o /download-licenses.sh -L https://raw.githubusercontent.com/GoogleCloudPlatform/click-to-deploy/master/scripts/download-licenses.sh \
 		&& curl -o /download-ref-repos.sh -L https://raw.githubusercontent.com/GoogleCloudPlatform/click-to-deploy/master/scripts/download-ref-repos.sh \
@@ -24,10 +24,10 @@ ARG FALCO_VERSION={{ $falco.Version }}
 ARG VERSION_BUCKET=deb
 ENV VERSION_BUCKET=${VERSION_BUCKET}
 
-ENV FALCO_VERSION ${FALCO_VERSION}
-ENV C2D_RELEASE {{ $falco.Version }}
-ENV HOST_ROOT /host
-ENV HOME /root
+ENV FALCO_VERSION=${FALCO_VERSION}
+ENV C2D_RELEASE={{ $falco.Version }}
+ENV HOST_ROOT=/host
+ENV HOME=/root
 
 RUN cp /etc/skel/.bashrc /root && cp /etc/skel/.profile /root
 
@@ -36,8 +36,9 @@ RUN apt-get update \
 	bash-completion \
 	bc \
 	bison \
-	clang-11 \
+	clang \
 	ca-certificates \
+	curl \
 	dkms \
 	flex \
 	gnupg2 \
@@ -46,14 +47,11 @@ RUN apt-get update \
 	libc6-dev \
 	libelf-dev \
 	libssl-dev \
-	llvm-11 \
-	netcat \
+	llvm \
+	netcat-traditional \
 	xz-utils \
 	&& rm -rf /var/lib/apt/lists/*
 
-RUN ln -s /usr/bin/clang-11 /usr/bin/clang \
-	&& ln -s /usr/bin/llc-11 /usr/bin/llc
-
 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 \

docker/falco/templates/exporter/Dockerfile.template

@@ -2,7 +2,7 @@
 
 FROM {{ .From }}
 
-ENV EXPORTER_VERSION {{ $falco_exporter.Version }}
+ENV EXPORTER_VERSION={{ $falco_exporter.Version }}
 
 RUN set -eu \
     # Installing utilities

docker/falco/versions.yaml

@@ -18,7 +18,7 @@ cloudbuild:
   enable_parallel: false
 versions:
 - dir: 0/debian11/0.36
-  from: marketplace.gcr.io/google/c2d-debian11
+  from: marketplace.gcr.io/google/debian12
   packages:
     falco:
       version: 0.36.2
@@ -34,32 +34,17 @@ versions:
   - '0.36'
   - '0'
   - latest
-- dir: 0/debian11/0.34
-  from: marketplace.gcr.io/google/c2d-debian11
-  packages:
-    falco:
-      version: 0.34.1
-  annotations:
-  - key: com.googleapis.cloudmarketplace.product.service.name
-    value: services/5b7a25d4-ece2-4ae3-b8c3-652b2af4a5ec.cloudpartnerservices.goog
-  repo: falco0
-  tags:
-  - 0.34.1-debian11
-  - 0.34-debian11
-  - 0.34.1
-  - '0.34'
 - dir: exporter
-  from: marketplace.gcr.io/google/c2d-debian11
+  from: marketplace.gcr.io/google/debian12
   packages:
     falco_exporter:
-      sha256: 5bd3367a0f0839ec96a32ad36d86a0c113476a12424771925cf8b5c2da87be65
-      version: 0.8.6
+      version: 0.8.7
   repo: falco-exporter0
   annotations:
   - key: com.googleapis.cloudmarketplace.product.service.name
     value: services/14a94703-d67c-403c-8e1f-f5ad256e6cac.cloudpartnerservices.goog
   tags:
-  - 0.8.6
+  - 0.8.7
   - '0.8'
   - '0'
   - latest