From e685d72800cb2a53a637200706eb876fda210976 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dulko?= <mdulko@redhat.com>
Date: Tue, 16 Apr 2019 19:49:00 +0200
Subject: [PATCH] Add `yum/dnf clean all` to dockerfiles

In a rather desperate try to shrink our container images this commit
adds `yum/dnf clean all` as part of the building process. This helps to
save around 100 MB in case of centos-based images.

Change-Id: I2aaadab4ffec6e0ad744e82fc9145cd86e14a224
---
 cni.Dockerfile            | 1 +
 cni_py3.Dockerfile        | 1 +
 controller.Dockerfile     | 1 +
 controller_py3.Dockerfile | 1 +
 4 files changed, 4 insertions(+)

diff --git a/cni.Dockerfile b/cni.Dockerfile
index 11f7386e9..73f3da889 100644
--- a/cni.Dockerfile
+++ b/cni.Dockerfile
@@ -15,6 +15,7 @@ RUN pip install -c $UPPER_CONSTRAINTS_FILE /opt/kuryr-kubernetes \
     && mkdir -p /etc/kuryr-cni \
     && cp /opt/kuryr-kubernetes/etc/cni/net.d/* /etc/kuryr-cni \
     && yum -y history undo last \
+    && yum clean all \
     && rm -rf /opt/kuryr-kubernetes \
     && mkdir ${OSLO_LOCK_PATH}
 
diff --git a/cni_py3.Dockerfile b/cni_py3.Dockerfile
index 3c87e6249..574b4e0e9 100644
--- a/cni_py3.Dockerfile
+++ b/cni_py3.Dockerfile
@@ -16,6 +16,7 @@ RUN python3.6 -m ensurepip \
     && mkdir -p /etc/kuryr-cni \
     && cp /opt/kuryr-kubernetes/etc/cni/net.d/* /etc/kuryr-cni \
     && dnf -y history undo last \
+    && dnf clean all \
     && rm -rf /opt/kuryr-kubernetes \
     && mkdir ${OSLO_LOCK_PATH}
 
diff --git a/controller.Dockerfile b/controller.Dockerfile
index 10ab8911b..ebfcc7fe9 100644
--- a/controller.Dockerfile
+++ b/controller.Dockerfile
@@ -11,6 +11,7 @@ COPY . /opt/kuryr-kubernetes
 
 RUN pip install -c $UPPER_CONSTRAINTS_FILE --no-cache-dir /opt/kuryr-kubernetes \
     && yum -y history undo last \
+    && yum clean all \
     && rm -rf /opt/kuryr-kubernetes \
     && groupadd -r kuryr -g 711 \
     && useradd -u 711 -g kuryr \
diff --git a/controller_py3.Dockerfile b/controller_py3.Dockerfile
index 2e6101777..9f633175a 100644
--- a/controller_py3.Dockerfile
+++ b/controller_py3.Dockerfile
@@ -12,6 +12,7 @@ COPY . /opt/kuryr-kubernetes
 RUN python3.6 -m ensurepip \
     && python3.6 -m pip install -c $UPPER_CONSTRAINTS_FILE --no-cache-dir /opt/kuryr-kubernetes \
     && dnf -y history undo last \
+    && dnf clean all \
     && rm -rf /opt/kuryr-kubernetes \
     && groupadd -r kuryr -g 711 \
     && useradd -u 711 -g kuryr \