From: Philippe Mathieu-Daudé <f4...@amsat.org>
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é <f4...@amsat.org>
Message-Id: <20180818015344.797-3-f4...@amsat.org>
Signed-off-by: Fam Zheng <f...@redhat.com>
---
tests/docker/dockerfiles/fedora-i386-cross.docker | 9 ++++-----
1 file 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 \
+ glib2-devel.i686 \
glibc-devel.i686 \
- glib2-devel.i686 \
- zlib-devel.i686 \
- glib2-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
--
2.17.1
