diff options
| author | Peter Maydell | 2016-09-09 13:49:41 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-09-09 13:49:41 +0200 |
| commit | c2a57aae9a1c3dd7de77daf5478df10379aeeebf (patch) | |
| tree | 558d7d0bd70a945a4d5c050fcc3a807a9f32c6dc /tests/docker/dockerfiles/min-glib.docker | |
| parent | qtest.c: Allow zero size in memset qtest commands (diff) | |
| parent | docker: silence debootstrap when --quiet is given (diff) | |
| download | qemu-c2a57aae9a1c3dd7de77daf5478df10379aeeebf.tar.gz qemu-c2a57aae9a1c3dd7de77daf5478df10379aeeebf.tar.xz qemu-c2a57aae9a1c3dd7de77daf5478df10379aeeebf.zip | |
Merge remote-tracking branch 'remotes/famz/tags/docker-pull-request' into staging
# gpg: Signature made Fri 09 Sep 2016 05:54:35 BST
# gpg: using RSA key 0xCA35624C6A9171C6
# gpg: Good signature from "Fam Zheng <famz@redhat.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 5003 7CB7 9706 0F76 F021 AD56 CA35 624C 6A91 71C6
* remotes/famz/tags/docker-pull-request:
docker: silence debootstrap when --quiet is given
docker: build debootstrap after cloning
docker: make sure debootstrap is at least 1.0.67
docker: print warning if EXECUTABLE is not set when building debootstrap image
docker: debian-bootstrap.pre: print helpful message if DEB_ARCH/DEB_TYPE unset
docker: debian-bootstrap.pre: print error messages to stderr
docker: avoid dependency on 'realpath' package
docker.py: don't hang on large docker output
docker: Add a glib2-2.22 image
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/docker/dockerfiles/min-glib.docker')
| -rw-r--r-- | tests/docker/dockerfiles/min-glib.docker | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/docker/dockerfiles/min-glib.docker b/tests/docker/dockerfiles/min-glib.docker new file mode 100644 index 0000000000..9f542d5e9c --- /dev/null +++ b/tests/docker/dockerfiles/min-glib.docker @@ -0,0 +1,8 @@ +FROM centos:6 +RUN yum install -y \ + tar git make gcc g++ \ + zlib-devel SDL-devel pixman-devel \ + epel-release +RUN yum install -y libfdt-devel ccache +RUN yum downgrade -y http://vault.centos.org/6.0/os/x86_64/Packages/glib2-2.22.5-5.el6.x86_64.rpm +RUN yum install -y http://vault.centos.org/6.0/os/x86_64/Packages/glib2-devel-2.22.5-5.el6.x86_64.rpm |