Mesa (master): gitlab-ci: Bring ARM docker image install script in line with x86_64
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Oct 22 11:06:18 UTC 2019
Module: Mesa
Branch: master
Commit: 38d42cf1d5937e17d214cb4f289aec828ec034fe
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=38d42cf1d5937e17d214cb4f289aec828ec034fe
Author: Michel Dänzer <mdaenzer at redhat.com>
Date: Thu Oct 10 10:56:08 2019 +0200
gitlab-ci: Bring ARM docker image install script in line with x86_64
Use https:// URLs in the APT configuration.
Drop --no-install-recommends, the image generation template disables
installation of recommended packages in /etc/apt/apt.conf.
Run apt-get autoremove at the end, cleaning up packages which were
installed to satisfy dependencies but are no longer needed.
Reviewed-by: Eric Engestrom <eric.engestrom at intel.com>
---
.gitlab-ci/debian-test-install.sh | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci/debian-test-install.sh b/.gitlab-ci/debian-test-install.sh
index cf0c7fab7b7..85817d161f0 100644
--- a/.gitlab-ci/debian-test-install.sh
+++ b/.gitlab-ci/debian-test-install.sh
@@ -4,9 +4,10 @@ set -e
set -o xtrace
############### Install packages for building
-apt-get update
apt-get -y install ca-certificates
-apt-get -y install --no-install-recommends \
+sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list
+apt-get update
+apt-get -y install \
bc \
bison \
bzip2 \
@@ -102,3 +103,5 @@ apt-get purge -y \
gcc \
git \
ninja-build
+
+apt-get autoremove -y --purge
More information about the mesa-commit
mailing list