From 2aef8913ecc06229acec78f31252db38f1c38460 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 6 Apr 2016 07:58:21 +0200
Subject: [PATCH] travis: Don't install recommended packages via apt
This passes --no-install-recommends both for Dockerfiles and Travis
itself.
---
misc/docker/debian-jessie/Dockerfile | 14 +++++++++++---
misc/docker/ubuntu-wily/Dockerfile | 14 +++++++++++---
scripts/dev/ci/install.py | 2 +-
3 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/misc/docker/debian-jessie/Dockerfile b/misc/docker/debian-jessie/Dockerfile
index 1cfa395e7..dcf636d35 100644
--- a/misc/docker/debian-jessie/Dockerfile
+++ b/misc/docker/debian-jessie/Dockerfile
@@ -5,9 +5,17 @@ ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get -y update && \
apt-get -y dist-upgrade && \
- apt-get -y install python3-pyqt5 python3-pyqt5.qtwebkit python-tox \
- python3-sip xvfb git python3-setuptools wget \
- herbstluftwm locales
+ apt-get -y install --no-install-recommends \
+ python3-pyqt5 \
+ python3-pyqt5.qtwebkit \
+ python-tox \
+ python3-sip \
+ xvfb \
+ git \
+ python3-setuptools \
+ wget \
+ herbstluftwm \
+ locales
RUN echo 'en_US.UTF-8 UTF-8' > /etc/locale.gen && locale-gen
RUN useradd user && mkdir /home/user && chown -R user:users /home/user
diff --git a/misc/docker/ubuntu-wily/Dockerfile b/misc/docker/ubuntu-wily/Dockerfile
index 71404a360..241cef873 100644
--- a/misc/docker/ubuntu-wily/Dockerfile
+++ b/misc/docker/ubuntu-wily/Dockerfile
@@ -5,9 +5,17 @@ ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get -y update && \
apt-get -y dist-upgrade && \
- apt-get -y install python3-pyqt5 python3-pyqt5.qtwebkit python-tox \
- python3-sip xvfb git python3-setuptools wget \
- herbstluftwm language-pack-en
+ apt-get -y install --no-install-recommends \
+ python3-pyqt5 \
+ python3-pyqt5.qtwebkit \
+ python-tox \
+ python3-sip \
+ xvfb \
+ git \
+ python3-setuptools \
+ wget \
+ herbstluftwm \
+ language-pack-en
RUN useradd user && mkdir /home/user && chown -R user:users /home/user
USER user
diff --git a/scripts/dev/ci/install.py b/scripts/dev/ci/install.py
index 8e5f57c8c..9979e7949 100644
--- a/scripts/dev/ci/install.py
+++ b/scripts/dev/ci/install.py
@@ -137,7 +137,7 @@ elif TRAVIS_OS == 'linux':
if pkgs:
apt_get(['update'])
- apt_get(['install'] + pkgs)
+ apt_get(['install', '--no-install-recommends'] + pkgs)
if TESTENV == 'flake8':
apt_get(['update'])