mirror of https://github.com/xqemu/xqemu.git
docker testing improvements
-----BEGIN PGP SIGNATURE----- iQFEBAABCAAuFiEEUAN8t5cGD3bwIa1WyjViTGqRccYFAluV630QHGZhbXpAcmVk aGF0LmNvbQAKCRDKNWJMapFxxiiPCACU9AuU4n+PeeBhTR8CvCm8F9sO/gFK86e0 3q5fz0S8NVaGho4WW7CU4GwoluV8dGSWaW2hobDgZdwryUPlEQA8RSbEikKaCyDF ULZEhGbe1PEF2l/IJM5ED/pqqhesXYD0RRCl/8PsJ7tnZ7NZk1BKLM7TqqXTBLSF plxzYQR2hjL1SbAHLXfs6+gTnQsPkFuhkfweBWvNKYuKQdTHPOFFOfjqAV15NFUi 5DAMp4MvLI545xqg6CFMBAo+BNXnydbVzpOx5hduk8McvoZ2t2A/GOFB4JSkde84 NxMEyGO8UPD6m3FjTCYjMkvPUjqE1NwlvpmHDUKkv/wXabxJP3K+ =uLzl -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/famz/tags/docker-pull-request' into staging docker testing improvements # gpg: Signature made Mon 10 Sep 2018 04:56:45 BST # gpg: using RSA key CA35624C6A9171C6 # gpg: Good signature from "Fam Zheng <famz@redhat.com>" # Primary key fingerprint: 5003 7CB7 9706 0F76 F021 AD56 CA35 624C 6A91 71C6 * remotes/famz/tags/docker-pull-request: docker: Clean dangling tarball files docker: Sort CentOS packages docker: Sort Ubuntu packages docker: Sort Fedora packages (i386-cross) docker: Sort Fedora packages Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell
commit
62713b1998
|
|
@ -25,6 +25,7 @@ IMAGES ?= %
|
|||
CUR_TIME := $(shell date +%Y-%m-%d-%H.%M.%S.$$$$)
|
||||
DOCKER_SRC_COPY := $(BUILD_DIR)/docker-src.$(CUR_TIME)
|
||||
|
||||
.DELETE_ON_ERROR: $(DOCKER_SRC_COPY)
|
||||
$(DOCKER_SRC_COPY):
|
||||
@mkdir $@
|
||||
$(if $(SRC_ARCHIVE), \
|
||||
|
|
|
|||
|
|
@ -18,10 +18,10 @@ ENV PACKAGES \
|
|||
libfdt-devel \
|
||||
librdmacm-devel \
|
||||
lzo-devel \
|
||||
nettle-devel \
|
||||
make \
|
||||
mesa-libEGL-devel \
|
||||
mesa-libgbm-devel \
|
||||
nettle-devel \
|
||||
pixman-devel \
|
||||
SDL-devel \
|
||||
spice-glib-devel \
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1,24 +1,90 @@
|
|||
FROM fedora:28
|
||||
ENV PACKAGES \
|
||||
ccache gettext git tar PyYAML sparse flex bison python3 bzip2 hostname \
|
||||
gcc gcc-c++ llvm clang make perl which bc findutils glib2-devel \
|
||||
libaio-devel pixman-devel zlib-devel libfdt-devel libasan libubsan \
|
||||
bluez-libs-devel brlapi-devel bzip2-devel \
|
||||
device-mapper-multipath-devel glusterfs-api-devel gnutls-devel \
|
||||
gtk3-devel libattr-devel libcap-devel libcap-ng-devel libcurl-devel \
|
||||
libjpeg-devel libpng-devel librbd-devel libssh2-devel libusbx-devel \
|
||||
libxml2-devel lzo-devel ncurses-devel nettle-devel nss-devel \
|
||||
numactl-devel SDL2-devel snappy-devel spice-server-devel \
|
||||
systemtap-sdt-devel usbredir-devel virglrenderer-devel vte3-devel \
|
||||
xen-devel \
|
||||
mingw32-pixman mingw32-glib2 mingw32-gmp mingw32-SDL2 mingw32-pkg-config \
|
||||
mingw32-gtk3 mingw32-gnutls mingw32-nettle mingw32-libtasn1 \
|
||||
mingw32-libjpeg-turbo mingw32-libpng mingw32-curl mingw32-libssh2 \
|
||||
bc \
|
||||
bison \
|
||||
bluez-libs-devel \
|
||||
brlapi-devel \
|
||||
bzip2 \
|
||||
bzip2-devel \
|
||||
ccache \
|
||||
clang \
|
||||
device-mapper-multipath-devel \
|
||||
findutils \
|
||||
flex \
|
||||
gcc \
|
||||
gcc-c++ \
|
||||
gettext \
|
||||
git \
|
||||
glib2-devel \
|
||||
glusterfs-api-devel \
|
||||
gnutls-devel \
|
||||
gtk3-devel \
|
||||
hostname \
|
||||
libaio-devel \
|
||||
libasan \
|
||||
libattr-devel \
|
||||
libcap-devel \
|
||||
libcap-ng-devel \
|
||||
libcurl-devel \
|
||||
libfdt-devel \
|
||||
libjpeg-devel \
|
||||
libpng-devel \
|
||||
librbd-devel \
|
||||
libssh2-devel \
|
||||
libubsan \
|
||||
libusbx-devel \
|
||||
libxml2-devel \
|
||||
llvm \
|
||||
lzo-devel \
|
||||
make \
|
||||
mingw32-bzip2 \
|
||||
mingw64-pixman mingw64-glib2 mingw64-gmp mingw64-SDL2 mingw64-pkg-config \
|
||||
mingw64-gtk3 mingw64-gnutls mingw64-nettle mingw64-libtasn1 \
|
||||
mingw64-libjpeg-turbo mingw64-libpng mingw64-curl mingw64-libssh2 \
|
||||
mingw64-bzip2
|
||||
mingw32-curl \
|
||||
mingw32-glib2 \
|
||||
mingw32-gmp \
|
||||
mingw32-gnutls \
|
||||
mingw32-gtk3 \
|
||||
mingw32-libjpeg-turbo \
|
||||
mingw32-libpng \
|
||||
mingw32-libssh2 \
|
||||
mingw32-libtasn1 \
|
||||
mingw32-nettle \
|
||||
mingw32-pixman \
|
||||
mingw32-pkg-config \
|
||||
mingw32-SDL2 \
|
||||
mingw64-bzip2 \
|
||||
mingw64-curl \
|
||||
mingw64-glib2 \
|
||||
mingw64-gmp \
|
||||
mingw64-gnutls \
|
||||
mingw64-gtk3 \
|
||||
mingw64-libjpeg-turbo \
|
||||
mingw64-libpng \
|
||||
mingw64-libssh2 \
|
||||
mingw64-libtasn1 \
|
||||
mingw64-nettle \
|
||||
mingw64-pixman \
|
||||
mingw64-pkg-config \
|
||||
mingw64-SDL2 \
|
||||
ncurses-devel \
|
||||
nettle-devel \
|
||||
nss-devel \
|
||||
numactl-devel \
|
||||
perl \
|
||||
pixman-devel \
|
||||
python3 \
|
||||
PyYAML \
|
||||
SDL2-devel \
|
||||
snappy-devel \
|
||||
sparse \
|
||||
spice-server-devel \
|
||||
systemtap-sdt-devel \
|
||||
tar \
|
||||
usbredir-devel \
|
||||
virglrenderer-devel \
|
||||
vte3-devel \
|
||||
which \
|
||||
xen-devel \
|
||||
zlib-devel
|
||||
ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3
|
||||
|
||||
RUN dnf install -y $PACKAGES
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue