From a4e58767a8106d6a6e30b611c98df862cfee58e2 Mon Sep 17 00:00:00 2001 From: Xu Liu Date: Fri, 12 May 2023 20:59:24 +0800 Subject: [PATCH] Revert "Temporarily install Suricata from Ubuntu PPA instead of OISF PPA (#4933)" (#4968) This reverts commit 75f09bc5f6ef661de3e6b4c9b993594cd902e0fa. --- build/images/base/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build/images/base/Dockerfile b/build/images/base/Dockerfile index 280069bf877..f83ec20f7f2 100644 --- a/build/images/base/Dockerfile +++ b/build/images/base/Dockerfile @@ -52,8 +52,9 @@ USER root # chmod in the RUN command below instead. ADD https://raw.githubusercontent.com/kubernetes-sigs/iptables-wrappers/9e6ce59c864623ea71a6f7d59c35fcb13a919b87/iptables-wrapper-installer.sh /iptables-wrapper-installer.sh -RUN apt-get update && apt-get install -y --no-install-recommends ipset jq inotify-tools suricata && \ - rm -rf /var/cache/apt/* /var/lib/apt/lists/* && \ +RUN apt-get update && apt-get install -y --no-install-recommends ipset jq inotify-tools gpg-agent software-properties-common && \ + add-apt-repository ppa:oisf/suricata-${SURICATA_VERSION} && apt-get update && apt-get install -y suricata && \ + apt-get remove -y gpg-agent software-properties-common && apt-get autoremove -y && rm -rf /var/cache/apt/* /var/lib/apt/lists/* && \ chmod +x /iptables-wrapper-installer.sh && \ /iptables-wrapper-installer.sh