diff options
| author | Peter Maydell | 2016-06-08 17:31:53 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-06-08 17:31:53 +0200 |
| commit | d36ebffe945d744a1605b30a8fd208b5325c1505 (patch) | |
| tree | eead9c5f06ef43a0b87ba1ede2694d79b6073339 /tests/docker/dockerfiles/ubuntu.docker | |
| parent | Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2016-07-07-tag' in... (diff) | |
| parent | tests/docker: build all targets in test-clang (diff) | |
| download | qemu-d36ebffe945d744a1605b30a8fd208b5325c1505.tar.gz qemu-d36ebffe945d744a1605b30a8fd208b5325c1505.tar.xz qemu-d36ebffe945d744a1605b30a8fd208b5325c1505.zip | |
Merge remote-tracking branch 'remotes/famz/tags/pull-docker-20160608' into staging
Docker testing fixes by Paolo.
# gpg: Signature made Wed 08 Jun 2016 08:20:54 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/pull-docker-20160608:
tests/docker: build all targets in test-clang
tests/docker: support travis test with fedora image
tests/docker: remove unused feature "ccache"
tests/docker: fix test-mingw
tests/docker: make test-full build all targets, not none
tests/docker: fix make-archive-maybe
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/docker/dockerfiles/ubuntu.docker')
| -rw-r--r-- | tests/docker/dockerfiles/ubuntu.docker | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfiles/ubuntu.docker index 725a7ca5d0..a8b88c318c 100644 --- a/tests/docker/dockerfiles/ubuntu.docker +++ b/tests/docker/dockerfiles/ubuntu.docker @@ -2,10 +2,10 @@ FROM ubuntu:14.04 RUN echo "deb http://archive.ubuntu.com/ubuntu/ trusty universe multiverse" >> \ /etc/apt/sources.list RUN apt-get update -RUN apt-get -y install \ +RUN apt-get -y install flex bison \ libusb-1.0-0-dev libiscsi-dev librados-dev libncurses5-dev \ libseccomp-dev libgnutls-dev libssh2-1-dev libspice-server-dev \ libspice-protocol-dev libnss3-dev libfdt-dev \ libgtk-3-dev libvte-2.90-dev libsdl1.2-dev libpng12-dev libpixman-1-dev \ git make ccache python-yaml gcc clang sparse -ENV FEATURES clang ccache pyyaml +ENV FEATURES clang pyyaml |