diff --git a/oci/datadog/agent/00InstallRecommends b/oci/datadog/agent/00InstallRecommends new file mode 100644 index 0000000..96d6728 --- /dev/null +++ b/oci/datadog/agent/00InstallRecommends @@ -0,0 +1 @@ +APT::Install-Recommends "false"; diff --git a/oci/datadog/agent/99DpkgForceConf b/oci/datadog/agent/99DpkgForceConf new file mode 100644 index 0000000..f2f7559 --- /dev/null +++ b/oci/datadog/agent/99DpkgForceConf @@ -0,0 +1 @@ +Dpkg::Options::="--force-confdef --force-confnew"; diff --git a/oci/datadog/agent/Dockerfile b/oci/datadog/agent/Dockerfile index 9559533..69e1236 100644 --- a/oci/datadog/agent/Dockerfile +++ b/oci/datadog/agent/Dockerfile @@ -2,8 +2,9 @@ FROM artifact.onwalk.net/k8s/datadog/agent:7.43.1 LABEL maintainer "Datadog " -ARG CIBUILD -RUN apt update && export DEBIAN_FRONTEND=noninteractive | apt install ca-certificates curl -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" +ADD 99DpkgForceConf /etc/apt/apt.conf.d/99DpkgForceConf +ADD 00InstallRecommends /etc/apt/apt.conf.d/00InstallRecommends +RUN apt update && export DEBIAN_FRONTEND=noninteractive | apt install ca-certificates curl -y RUN apt install -f && dpkg --configure -a RUN cd /usr/local/share/ca-certificates/ && curl http://certinfo.roche.com/rootcerts/Roche%20Root%20CA%201.cer -o RocheRootCA1.cer && \ curl http://certinfo.roche.com/rootcerts/RocheEnterpriseCA1.cer -o RocheEnterpriseCA1.cer && \