diff options
| author | Peter Maydell | 2016-06-02 14:42:52 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-06-02 14:42:52 +0200 |
| commit | cbd614870fce00f46088be7054a7bf5eadcc77ac (patch) | |
| tree | f9ce32fe04033bef86096cee1e6619344a53486d /tests/docker/dockerfiles/ubuntu.docker | |
| parent | Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.7-20160531' into... (diff) | |
| parent | .gitignore: Ignore docker source copy (diff) | |
| download | qemu-cbd614870fce00f46088be7054a7bf5eadcc77ac.tar.gz qemu-cbd614870fce00f46088be7054a7bf5eadcc77ac.tar.xz qemu-cbd614870fce00f46088be7054a7bf5eadcc77ac.zip | |
Merge remote-tracking branch 'remotes/famz/tags/pull-docker-20160601' into staging
v2: Fix warning due to include.
Various temp dir/file changes.
Don't use "find -executable" to be compatible with Mac.
# gpg: Signature made Wed 01 Jun 2016 10:30:33 BST using RSA key ID 6A9171C6
# 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-20160601:
.gitignore: Ignore docker source copy
MAINTAINERS: Add tests/docker
docker: Add EXTRA_CONFIGURE_OPTS
docs: Add text for tests/docker in build-system.txt
docker: Add travis tool
docker: Add mingw test
docker: Add clang test
docker: Add full test
docker: Add quick test
docker: Add common.rc
docker: Add test runner
docker: Add images
Makefile: Rules for docker testing
Makefile: Always include rules.mak
rules.mak: Add "COMMA" constant
tests: Add utilities for docker testing
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 | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfiles/ubuntu.docker new file mode 100644 index 0000000000..725a7ca5d0 --- /dev/null +++ b/tests/docker/dockerfiles/ubuntu.docker @@ -0,0 +1,11 @@ +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 \ + 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 |