From: Philippe Mathieu-Daudé <f4bug@amsat.org>
Date: Sat, 18 Aug 2018 01:53:42 +0000 (-0300)
Subject: docker: Sort Fedora packages (i386-cross)
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=dc587d450a94686fa0843b8c0d0e1f476a4c239a;p=qemu.git

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>
---

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