aboutsummaryrefslogtreecommitdiff
path: root/tests/docker
diff options
context:
space:
mode:
authorPhilippe Mathieu-Daudé <f4bug@amsat.org>2017-07-28 20:33:13 -0300
committerFam Zheng <famz@redhat.com>2017-08-15 15:16:45 +0800
commit6aef2ad70b2ab119bb93423ba916f3314e0ca012 (patch)
tree846704b6ab020aefeaba279a501794769a2cb0be /tests/docker
parente45eaef9b6ec4af55402980aba726e860f771bb6 (diff)
downloadqemu-6aef2ad70b2ab119bb93423ba916f3314e0ca012.zip
qemu-6aef2ad70b2ab119bb93423ba916f3314e0ca012.tar.gz
qemu-6aef2ad70b2ab119bb93423ba916f3314e0ca012.tar.bz2
docker: use one package per line in CentOS config
This ease rebase/cherry-pick, also it is faster to visually find if a package is here. Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Message-Id: <20170728233316.13352-2-f4bug@amsat.org> Signed-off-by: Fam Zheng <famz@redhat.com>
Diffstat (limited to 'tests/docker')
-rw-r--r--tests/docker/dockerfiles/centos6.docker18
1 files changed, 14 insertions, 4 deletions
diff --git a/tests/docker/dockerfiles/centos6.docker b/tests/docker/dockerfiles/centos6.docker
index 17a4d24..9b91e83 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