diff options
| author | Michel Dänzer <mdaenzer@redhat.com> | 2019-10-10 10:56:08 +0200 |
|---|---|---|
| committer | Michel Dänzer <michel@daenzer.net> | 2019-10-22 10:26:29 +0000 |
| commit | 38d42cf1d5937e17d214cb4f289aec828ec034fe (patch) | |
| tree | 1c79084e02642b00600cd495989168d36c0bc50d /.gitlab-ci | |
| parent | e3c7e04dfa9bd19159126bb7f36b91a5b186f7a2 (diff) | |
| download | mesa-38d42cf1d5937e17d214cb4f289aec828ec034fe.tar.gz | |
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@intel.com>
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/debian-test-install.sh | 7 |
1 files 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 |