From 6aef2ad70b2ab119bb93423ba916f3314e0ca012 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Fri, 28 Jul 2017 20:33:13 -0300 Subject: docker: use one package per line in CentOS config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This ease rebase/cherry-pick, also it is faster to visually find if a package is here. Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20170728233316.13352-2-f4bug@amsat.org> Signed-off-by: Fam Zheng --- tests/docker/dockerfiles/centos6.docker | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/tests/docker/dockerfiles/centos6.docker b/tests/docker/dockerfiles/centos6.docker index 17a4d24d54..9b91e832c2 100644 --- a/tests/docker/dockerfiles/centos6.docker +++ b/tests/docker/dockerfiles/centos6.docker @@ -1,8 +1,18 @@ FROM centos:6 RUN yum install -y epel-release -ENV PACKAGES libfdt-devel ccache \ - tar git make gcc g++ flex bison \ - zlib-devel glib2-devel SDL-devel pixman-devel \ - epel-release +ENV PACKAGES \ + bison \ + ccache \ + flex \ + g++ \ + gcc \ + git \ + glib2-devel \ + libfdt-devel \ + make \ + pixman-devel \ + SDL-devel \ + tar \ + zlib-devel RUN yum install -y $PACKAGES RUN rpm -q $PACKAGES | sort > /packages.txt -- cgit v1.2.1