aboutsummaryrefslogtreecommitdiff
path: root/tests/docker
diff options
context:
space:
mode:
authorPhilippe Mathieu-Daudé <f4bug@amsat.org>2018-08-17 22:53:42 -0300
committerFam Zheng <famz@redhat.com>2018-09-10 11:50:06 +0800
commitdc587d450a94686fa0843b8c0d0e1f476a4c239a (patch)
tree1a3cf4d41750a2a5aa6e083cbc838cd58172f768 /tests/docker
parent5f8ab4fdf20d64f33c139c2e2df7573caa41c62b (diff)
docker: Sort Fedora packages (i386-cross)
As recommended in https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#sort-multi-line-arguments "This helps to avoid duplication of packages and make the list much easier to update. This also makes PRs a lot easier to read and review." Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Message-Id: <20180818015344.797-3-f4bug@amsat.org> Signed-off-by: Fam Zheng <famz@redhat.com>
Diffstat (limited to 'tests/docker')
-rw-r--r--tests/docker/dockerfiles/fedora-i386-cross.docker9
1 files changed, 4 insertions, 5 deletions
diff --git a/tests/docker/dockerfiles/fedora-i386-cross.docker b/tests/docker/dockerfiles/fedora-i386-cross.docker
index 8fbef2fa53..a4fd895b07 100644
--- a/tests/docker/dockerfiles/fedora-i386-cross.docker
+++ b/tests/docker/dockerfiles/fedora-i386-cross.docker
@@ -1,14 +1,13 @@
FROM fedora:latest
ENV PACKAGES \
gcc \
- glibc-static.i686 \
- glibc-devel.i686 \
- glib2-devel.i686 \
- zlib-devel.i686 \
glib2-devel.i686 \
+ glibc-devel.i686 \
+ glibc-static.i686 \
+ gnutls-devel.i686 \
nettle-devel.i686 \
pixman-devel.i686 \
- gnutls-devel.i686
+ zlib-devel.i686
RUN dnf install -y $PACKAGES
RUN rpm -q $PACKAGES | sort > /packages.txt