diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-10-29 01:57:12 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-29 01:57:12 +0300 |
| commit | 57d3ece5fc4e883fe3d069be7cd207fee8fffa90 (patch) | |
| tree | 5c305b1466a0e011f020b4d29c7fdf96f7864970 /ciimage/Dockerfile | |
| parent | 1a159db8e90fa6b9571a06768d6f1ba08074e819 (diff) | |
| parent | e292369ee20ed84337a52832d765ca544513dba3 (diff) | |
| download | meson-57d3ece5fc4e883fe3d069be7cd207fee8fffa90.tar.gz | |
Merge pull request #2217 from mesonbuild/gcc7
Use GCC 7 for cross compilation tests.
Diffstat (limited to 'ciimage/Dockerfile')
| -rw-r--r-- | ciimage/Dockerfile | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/ciimage/Dockerfile b/ciimage/Dockerfile index 1c9e8d8c5..839a429cb 100644 --- a/ciimage/Dockerfile +++ b/ciimage/Dockerfile @@ -1,16 +1,14 @@ -FROM ubuntu:zesty +FROM ubuntu:artful RUN apt-get -y update && apt-get -y upgrade \ && apt-get -y install git wget unzip \ && apt-get -y build-dep meson \ -&& apt-get -y install qt5-default itstool clang libgtk-3-dev \ -&& apt-get -y install pkg-config-arm-linux-gnueabihf g++-6-arm-linux-gnueabihf \ -&& apt-get -y install valgrind doxygen \ -&& apt-get -y install llvm libsdl2-dev \ +&& apt-get -y install qt5-default clang \ +&& apt-get -y install pkg-config-arm-linux-gnueabihf g++-7-arm-linux-gnueabihf \ +&& apt-get -y install doxygen \ && apt-get -y install python3-pip libxml2-dev libxslt1-dev cmake libyaml-dev \ -&& apt-get -y install openmpi-bin libopenmpi-dev \ -&& apt-get -y install libboost-log-dev \ -&& apt-get -y install libvulkan-dev libpcap-dev libcups2-dev \ +&& apt-get -y install libcups2-dev \ && apt-get -y install gcovr lcov \ +&& apt-get -y install fpga-icestorm arachne-pnr yosys \ && apt-get -y install gtk-sharp2 gtk-sharp2-gapi libglib2.0-cil-dev \ && python3 -m pip install hotdoc codecov |