From dfdd9693fcbdcdeba16b4c0247f2000dc1360b3c Mon Sep 17 00:00:00 2001 From: Leonardo Di Donato Date: Wed, 26 Feb 2020 19:16:14 +0100 Subject: [PATCH] update(docker): slim images to use falcosecurity new repo and new GPG key Signed-off-by: Leonardo Di Donato --- docker/slim-dev/Dockerfile | 21 +++++++-------------- docker/slim-stable/Dockerfile | 21 +++++++-------------- 2 files changed, 14 insertions(+), 28 deletions(-) diff --git a/docker/slim-dev/Dockerfile b/docker/slim-dev/Dockerfile index e36a58c6..383eb032 100644 --- a/docker/slim-dev/Dockerfile +++ b/docker/slim-dev/Dockerfile @@ -2,9 +2,7 @@ FROM ubuntu:18.04 LABEL maintainer="cncf-falco-dev@lists.cncf.io" -ENV FALCO_REPOSITORY dev - -LABEL RUN="docker run -i -t -v /var/run/docker.sock:/host/var/run/docker.sock -v /dev:/host/dev -v /proc:/host/proc:ro -v /boot:/host/boot:ro -v /lib/modules:/host/lib/modules:ro -v /usr:/host/usr:ro --name NAME IMAGE" +LABEL RUN="docker run -i -t -v /var/run/docker.sock:/host/var/run/docker.sock -v /dev:/host/dev -v /proc:/host/proc:ro -v /boot:/host/boot:ro -v /lib/modules:/host/lib/modules:ro -v /usr:/host/usr:ro --name " ENV HOST_ROOT /host @@ -12,22 +10,20 @@ ENV HOME /root RUN cp /etc/skel/.bashrc /root && cp /etc/skel/.profile /root -ADD http://download.draios.com/apt-draios-priority /etc/apt/preferences.d/ - RUN apt-get update \ && apt-get install -y --no-install-recommends \ - # bash-completion \ - # bc \ + # bash-completion \ + # bc \ ca-certificates \ curl \ gnupg2 \ jq \ - # netcat \ - # xz-utils \ + # netcat \ + # xz-utils \ && rm -rf /var/lib/apt/lists/* -RUN curl -s https://s3.amazonaws.com/download.draios.com/DRAIOS-GPG-KEY.public | apt-key add - \ - && curl -s -o /etc/apt/sources.list.d/draios.list http://download.draios.com/$FALCO_REPOSITORY/deb/draios.list \ +RUN curl -s https://falco.org/repo/falcosecurity-3672BA8F.asc | apt-key add - \ + && echo "deb https://dl.bintray.com/falcosecurity/deb-dev stable main" | tee -a /etc/apt/sources.list.d/ falcosecurity.list \ && apt-get update \ && apt-get install -y --no-install-recommends falco \ && apt-get clean \ @@ -44,7 +40,4 @@ RUN sed -e 's/time_format_iso_8601: false/time_format_iso_8601: true/' < /etc/fa RUN rm -df /lib/modules \ && ln -s $HOST_ROOT/lib/modules /lib/modules -#COPY ./entrypoint.sh / -# ENTRYPOINT ["/entrypoint.sh"] - CMD ["/usr/bin/falco", "-o", "time_format_iso_8601=true"] diff --git a/docker/slim-stable/Dockerfile b/docker/slim-stable/Dockerfile index 9083c8c0..df31a582 100644 --- a/docker/slim-stable/Dockerfile +++ b/docker/slim-stable/Dockerfile @@ -2,9 +2,7 @@ FROM ubuntu:18.04 LABEL maintainer="cncf-falco-dev@lists.cncf.io" -ENV FALCO_REPOSITORY stable - -LABEL RUN="docker run -i -t -v /var/run/docker.sock:/host/var/run/docker.sock -v /dev:/host/dev -v /proc:/host/proc:ro -v /boot:/host/boot:ro -v /lib/modules:/host/lib/modules:ro -v /usr:/host/usr:ro --name NAME IMAGE" +LABEL RUN="docker run -i -t -v /var/run/docker.sock:/host/var/run/docker.sock -v /dev:/host/dev -v /proc:/host/proc:ro -v /boot:/host/boot:ro -v /lib/modules:/host/lib/modules:ro -v /usr:/host/usr:ro --name " ENV HOST_ROOT /host @@ -12,22 +10,20 @@ ENV HOME /root RUN cp /etc/skel/.bashrc /root && cp /etc/skel/.profile /root -ADD http://download.draios.com/apt-draios-priority /etc/apt/preferences.d/ - RUN apt-get update \ && apt-get install -y --no-install-recommends \ - # bash-completion \ - # bc \ + # bash-completion \ + # bc \ ca-certificates \ curl \ gnupg2 \ jq \ - # netcat \ - # xz-utils \ + # netcat \ + # xz-utils \ && rm -rf /var/lib/apt/lists/* -RUN curl -s https://s3.amazonaws.com/download.draios.com/DRAIOS-GPG-KEY.public | apt-key add - \ - && curl -s -o /etc/apt/sources.list.d/draios.list http://download.draios.com/$FALCO_REPOSITORY/deb/draios.list \ +RUN curl -s https://falco.org/repo/falcosecurity-3672BA8F.asc | apt-key add - \ + && echo "deb https://dl.bintray.com/falcosecurity/deb stable main" | tee -a /etc/apt/sources.list.d/ falcosecurity.list \ && apt-get update \ && apt-get install -y --no-install-recommends falco \ && apt-get clean \ @@ -44,7 +40,4 @@ RUN sed -e 's/time_format_iso_8601: false/time_format_iso_8601: true/' < /etc/fa RUN rm -df /lib/modules \ && ln -s $HOST_ROOT/lib/modules /lib/modules -#COPY ./entrypoint.sh / -# ENTRYPOINT ["/entrypoint.sh"] - CMD ["/usr/bin/falco", "-o", "time_format_iso_8601=true"]