Commit 2808b467 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Fam Zheng
Browse files

docker: Sort Ubuntu packages 

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: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20180818015344.797-4-f4bug@amsat.org>
Signed-off-by: default avatarFam Zheng <famz@redhat.com>
parent dc587d45

tests/docker/dockerfiles/ubuntu.docker

+52 −9
Original line number Diff line number Diff line
@@ -2,16 +2,59 @@ FROM ubuntu:16.04 
RUN echo "deb http://archive.ubuntu.com/ubuntu/ trusty universe multiverse" >> \

    /etc/apt/sources.list

ENV PACKAGES flex bison \

    libusb-1.0-0-dev libiscsi-dev librados-dev libncurses5-dev libncursesw5-dev \

    libseccomp-dev libgnutls-dev libssh2-1-dev  libspice-server-dev \

    libspice-protocol-dev libnss3-dev libfdt-dev \

    libgtk-3-dev libvte-2.91-dev libsdl2-dev libpng12-dev libpixman-1-dev \

    libvdeplug-dev liblzo2-dev libsnappy-dev libbz2-dev libxen-dev librdmacm-dev libibverbs-dev \

    libsasl2-dev libjpeg-turbo8-dev xfslibs-dev libcap-ng-dev libbrlapi-dev libcurl4-gnutls-dev \

    libbluetooth-dev librbd-dev libaio-dev glusterfs-common libnuma-dev libepoxy-dev libdrm-dev libgbm-dev \

    libjemalloc-dev libcacard-dev libusbredirhost-dev libnfs-dev libcap-dev libattr1-dev \

    ccache \

    clang \

    gcc \

    gettext \

    git \

    glusterfs-common \

    libaio-dev \

    libattr1-dev \

    libbluetooth-dev \

    libbrlapi-dev \

    libbz2-dev \

    libcacard-dev \

    libcap-dev \

    libcap-ng-dev \

    libcurl4-gnutls-dev \

    libdrm-dev \

    libepoxy-dev \

    libfdt-dev \

    libgbm-dev \

    libgnutls-dev \

    libgtk-3-dev \

    libibverbs-dev \

    libiscsi-dev \

    libjemalloc-dev \

    libjpeg-turbo8-dev \

    liblzo2-dev \

    libncurses5-dev \

    libncursesw5-dev \

    libnfs-dev \

    libnss3-dev \

    libnuma-dev \

    libpixman-1-dev \

    libpng12-dev \

    librados-dev \

    librbd-dev \

    librdmacm-dev \

    libsasl2-dev \

    libsdl2-dev \

    libseccomp-dev \

    libsnappy-dev \

    libspice-protocol-dev \

    libspice-server-dev \

    libssh2-1-dev \

    libusb-1.0-0-dev \

    libusbredirhost-dev \

    libvdeplug-dev \

    libvte-2.91-dev \

    libxen-dev \

    make \

    python-yaml \

    sparse \

    texinfo \

    gettext git make ccache python-yaml gcc clang sparse

    xfslibs-dev

RUN apt-get update && \

    apt-get -y install $PACKAGES

RUN dpkg -l $PACKAGES | sort > /packages.txt