[igt-dev] [PATCH i-g-t 6/8] Dockerfile: Clean package manager caches and squash images

Arkadiusz Hiler
2019-09-03T08:38:20Z

To save some space and bandwidth. Without --squash the caches would get
cleaned up only from the last layer which would save us nothing.

Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
---
.gitlab-ci/pull-or-rebuild.sh | 2 +-
Dockerfile.build-debian | 2 ++
Dockerfile.build-debian-arm64 | 2 ++
Dockerfile.build-debian-armhf | 2 ++
Dockerfile.build-debian-minimal | 2 ++
Dockerfile.build-debian-mips | 2 ++
Dockerfile.build-fedora | 2 ++
7 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci/pull-or-rebuild.sh b/.gitlab-ci/pull-or-rebuild.sh
index 3d71e821..7b3bb84c 100755
--- a/.gitlab-ci/pull-or-rebuild.sh
+++ b/.gitlab-ci/pull-or-rebuild.sh
@@ -44,7 +44,7 @@ if [ "$TYPE" = "base" ]; then
echo "Skipping, already built"
else
echo "Building!"
- podman build --build-arg=CI_COMMIT_SHA=$CI_COMMIT_SHA -t $DOCKERNAME -f $DOCKERFILE .
+ podman build --squash --build-arg=CI_COMMIT_SHA=$CI_COMMIT_SHA -t $DOCKERNAME -f $DOCKERFILE .
podman push $DOCKERNAME
fi

diff --git a/Dockerfile.build-debian b/Dockerfile.build-debian
index 13553c5a..de2adca6 100644
--- a/Dockerfile.build-debian
+++ b/Dockerfile.build-debian
@@ -23,3 +23,5 @@ RUN apt-get install -y \
xutils-dev \
libtool \
make
+
+RUN apt-get clean
diff --git a/Dockerfile.build-debian-arm64 b/Dockerfile.build-debian-arm64
index c9fb28c8..3ea97807 100644
--- a/Dockerfile.build-debian-arm64
+++ b/Dockerfile.build-debian-arm64
@@ -37,3 +37,5 @@ RUN apt-get install -t stretch-backports -y \
libdrm-dev:arm64 \
qemu-user \
qemu-user-static
+
+RUN apt-get clean
diff --git a/Dockerfile.build-debian-armhf b/Dockerfile.build-debian-armhf
index 3a133d84..3e429e2f 100644
--- a/Dockerfile.build-debian-armhf
+++ b/Dockerfile.build-debian-armhf
@@ -37,3 +37,5 @@ RUN apt-get install -t stretch-backports -y \
libdrm-dev:armhf \
qemu-user \
qemu-user-static
+
+RUN apt-get clean
diff --git a/Dockerfile.build-debian-minimal b/Dockerfile.build-debian-minimal
index 63844694..7c23ffc2 100644
--- a/Dockerfile.build-debian-minimal
+++ b/Dockerfile.build-debian-minimal
@@ -23,3 +23,5 @@ RUN apt-get install -y \
RUN apt-get install -t stretch-backports -y \
meson \
libdrm-dev
+
+RUN apt-get clean
diff --git a/Dockerfile.build-debian-mips b/Dockerfile.build-debian-mips
index ee29f5f4..e56e7e75 100644
--- a/Dockerfile.build-debian-mips
+++ b/Dockerfile.build-debian-mips
@@ -37,3 +37,5 @@ RUN apt-get install -t stretch-backports -y \
libdrm-dev:mips \
qemu-user \
qemu-user-static
+
+RUN apt-get clean
diff --git a/Dockerfile.build-fedora b/Dockerfile.build-fedora
index 31056a2a..d94533c6 100644
--- a/Dockerfile.build-fedora
+++ b/Dockerfile.build-fedora
@@ -42,3 +42,5 @@ RUN dnf install -y findutils

# Meson version switching shenanigans
RUN cd /usr/src && curl -O https://files.pythonhosted.org/packages/c0/9b/44cdb8adcbb186be6cba5c93718d0c68f177b0e8082ae00cafa63a1d3535/meson-0.47.0.tar.gz
+
+RUN dnf clean all