From 5b7a00e47f5fea8959ba348e842c82b438c506be Mon Sep 17 00:00:00 2001 From: Robert Foss Date: Wed, 21 Nov 2018 14:07:34 +0100 Subject: [PATCH] ci: Split docker RUN commands into multiple parts The only reason for wanting this is to lower the chance of being unable to used a cached image incase of changes to the Dockerfile. Reviewed-by: Gurchetan Singh Signed-off-by: Robert Foss Signed-off-by: Jakob Bornecrantz --- ci/Dockerfile | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/ci/Dockerfile b/ci/Dockerfile index 0016abe..b9c01d2 100644 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -17,8 +17,8 @@ RUN echo 'exit 101' >> /usr/sbin/policy-rc.d RUN chmod +x /usr/sbin/policy-rc.d RUN echo deb-src http://deb.debian.org/debian testing main >> /etc/apt/sources.list -RUN apt-get update && \ - apt-get -y install ca-certificates && \ +RUN apt-get update +RUN apt-get -y install ca-certificates && \ apt-get -y install --no-install-recommends \ libgbm-dev \ libxvmc-dev \ @@ -63,15 +63,17 @@ RUN apt-get update && \ python3-setuptools \ python3-wheel \ libwayland-dev \ - libwayland-egl-backend-dev && \ - apt-get -y build-dep --no-install-recommends \ + libwayland-egl-backend-dev + +RUN apt-get -y build-dep --no-install-recommends \ qemu \ libdrm \ mesa \ virglrenderer \ libepoxy \ - piglit && \ - apt-get -y remove valgrind && \ + piglit + +RUN apt-get -y remove valgrind && \ apt-get clean RUN pip3 install meson