From 643623ba8a0ec89a7a5011261d058da14871306e Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Wed, 26 Feb 2020 16:10:58 -0600 Subject: [PATCH] Disable recommends in python-base and python-builder We disable these on our VM images, so might as well make our container images follow suit. Could make them a smidge smaller. Also do it in the gerrit-base image. Change-Id: Iba60cf5c7009d57c4910f9e4464aff9231598ad6 --- docker/gerrit/base/Dockerfile | 2 ++ docker/python-base/Dockerfile | 2 ++ docker/python-builder/Dockerfile | 2 ++ 3 files changed, 6 insertions(+) diff --git a/docker/gerrit/base/Dockerfile b/docker/gerrit/base/Dockerfile index 24f8803796..63e604e228 100644 --- a/docker/gerrit/base/Dockerfile +++ b/docker/gerrit/base/Dockerfile @@ -20,6 +20,8 @@ RUN assemble FROM docker.io/library/openjdk:8 +RUN echo 'APT::Install-Recommends "0";' > /etc/apt/apt.conf.d/95disable-recommends + # libcgi-pm-perl is for gitweb RUN apt-get update \ && apt-get install -y dumb-init python3-launchpadlib python3-distutils \ diff --git a/docker/python-base/Dockerfile b/docker/python-base/Dockerfile index 5c826fa71f..ffcbb9dd36 100644 --- a/docker/python-base/Dockerfile +++ b/docker/python-base/Dockerfile @@ -15,6 +15,8 @@ FROM docker.io/library/python:3.7-slim +RUN echo 'APT::Install-Recommends "0";' > /etc/apt/apt.conf.d/95disable-recommends + RUN apt-get update \ && apt-get install -y dumb-init libjemalloc2 \ && apt-get clean \ diff --git a/docker/python-builder/Dockerfile b/docker/python-builder/Dockerfile index 08d1afc840..1b0785d90e 100644 --- a/docker/python-builder/Dockerfile +++ b/docker/python-builder/Dockerfile @@ -24,6 +24,8 @@ RUN equivs-build /tmp/python3-dev.control FROM docker.io/library/python:3.7-slim +RUN echo 'APT::Install-Recommends "0";' > /etc/apt/apt.conf.d/95disable-recommends + COPY --from=fake-python /tmp/python3-dev_4.0.0_all.deb /tmp/python3-dev_4.0.0_all.deb COPY scripts/assemble /usr/local/bin/assemble COPY scripts/get-extras-packages /usr/local/bin/get-extras-packages