From 7671b9fcdede81e66d17e69e6483e25ed7f43592 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Sun, 17 Sep 2017 22:16:27 +0200 Subject: [PATCH] Add ninja to dockerfiles --- dockerfiles/32bit/Dockerfile | 2 +- dockerfiles/64bit/Dockerfile | 2 +- dockerfiles/full/Dockerfile | 2 +- dockerfiles/mingw-arch/Dockerfile | 1 + dockerfiles/mingw/Dockerfile | 2 +- dockerfiles/ubuntu_amd64/Dockerfile | 2 +- dockerfiles/ubuntu_i686/Dockerfile | 2 +- 7 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dockerfiles/32bit/Dockerfile b/dockerfiles/32bit/Dockerfile index e9bee6d144..3678e0c8df 100644 --- a/dockerfiles/32bit/Dockerfile +++ b/dockerfiles/32bit/Dockerfile @@ -3,7 +3,7 @@ FROM nfnty/arch-mini RUN echo -e "[archlinuxfr]\nSigLevel = Never\nServer = http://repo.archlinux.fr/\$arch" >> /etc/pacman.conf RUN sed -i '/#\[multilib\]/,/#Include = \/etc\/pacman.d\/mirrorlist/ s/#//' /etc/pacman.conf RUN pacman -Syyu --noconfirm -RUN pacman -S --noconfirm git curl jshon expac yajl wget unzip cmake && pacman -Sc +RUN pacman -S --noconfirm git curl jshon expac yajl wget unzip cmake ninja && pacman -Sc RUN yes | pacman -S gcc-multilib gcc-libs-multilib && pacman -Sc RUN pacman -S --noconfirm --needed make pkg-config patch yaourt grep file sudo gawk fakeroot gzip m4 which util-linux && pacman -Sc diff --git a/dockerfiles/64bit/Dockerfile b/dockerfiles/64bit/Dockerfile index 6c3dc6882d..02c63f7c29 100644 --- a/dockerfiles/64bit/Dockerfile +++ b/dockerfiles/64bit/Dockerfile @@ -1,6 +1,6 @@ FROM nfnty/arch-mini RUN pacman -Syyu --noconfirm -RUN pacman -S --noconfirm gcc gcc-libs git curl jshon expac yajl wget unzip cmake && pacman -Sc +RUN pacman -S --noconfirm gcc gcc-libs git curl jshon expac yajl wget unzip cmake ninja && pacman -Sc RUN pacman -S --noconfirm curl sdl2 speex fontconfig openssl libpng jansson libzip && pacman -Sc RUN pacman -S --noconfirm --needed make pkg-config diff --git a/dockerfiles/full/Dockerfile b/dockerfiles/full/Dockerfile index a4202ee790..4e25d31be6 100644 --- a/dockerfiles/full/Dockerfile +++ b/dockerfiles/full/Dockerfile @@ -1,7 +1,7 @@ FROM nfnty/arch-mini RUN pacman -Syyu --noconfirm -RUN pacman -S --noconfirm git curl jshon expac +RUN pacman -S --noconfirm git curl jshon expac ninja RUN pacman -S --noconfirm --needed base-devel RUN pacman -S --noconfirm yajl diff --git a/dockerfiles/mingw-arch/Dockerfile b/dockerfiles/mingw-arch/Dockerfile index 27b86623d7..e840ac8d1f 100644 --- a/dockerfiles/mingw-arch/Dockerfile +++ b/dockerfiles/mingw-arch/Dockerfile @@ -30,6 +30,7 @@ RUN pacman -S --noconfirm --noprogressbar \ fakeroot \ file \ patch \ + ninja \ && (echo -e "y\ny\n" | pacman -Scc) # Add mingw-repo diff --git a/dockerfiles/mingw/Dockerfile b/dockerfiles/mingw/Dockerfile index 7facaf10e7..d5ae078f7e 100644 --- a/dockerfiles/mingw/Dockerfile +++ b/dockerfiles/mingw/Dockerfile @@ -1,4 +1,4 @@ FROM ubuntu:16.04 RUN apt-get update -RUN apt-get install -y binutils-mingw-w64-i686 gcc-mingw-w64-i686 g++-mingw-w64-i686 cmake pkg-config +RUN apt-get install -y binutils-mingw-w64-i686 gcc-mingw-w64-i686 g++-mingw-w64-i686 cmake pkg-config ninja-build RUN echo "#!/bin/sh\nexport PKG_CONFIG_PATH=/usr/local/cross-tools/i686-w64-mingw32/lib/pkgconfig:/usr/local/cross-tools/orctlibs/lib/pkgconfig\npkg-config \$@" > /usr/local/bin/i686-w64-mingw32-pkg-config && chmod a+x /usr/local/bin/i686-w64-mingw32-pkg-config diff --git a/dockerfiles/ubuntu_amd64/Dockerfile b/dockerfiles/ubuntu_amd64/Dockerfile index 2b3388d23d..b9b826ec78 100644 --- a/dockerfiles/ubuntu_amd64/Dockerfile +++ b/dockerfiles/ubuntu_amd64/Dockerfile @@ -15,4 +15,4 @@ RUN apt-get update \ && ln -s /usr/bin/clang++-4.0 /usr/bin/clang++ RUN apt-get -y upgrade # clang and gcc already installed -RUN apt-get install --no-install-recommends -y cmake libsdl2-dev libsdl2-ttf-dev pkg-config libjansson-dev libspeex-dev libspeexdsp-dev libcurl4-openssl-dev libcrypto++-dev libfontconfig1-dev libfreetype6-dev libpng-dev libzip-dev git libssl-dev +RUN apt-get install --no-install-recommends -y cmake libsdl2-dev libsdl2-ttf-dev pkg-config libjansson-dev libspeex-dev libspeexdsp-dev libcurl4-openssl-dev libcrypto++-dev libfontconfig1-dev libfreetype6-dev libpng-dev libzip-dev git libssl-dev ninja-build diff --git a/dockerfiles/ubuntu_i686/Dockerfile b/dockerfiles/ubuntu_i686/Dockerfile index 220d4b826a..403967c4ef 100644 --- a/dockerfiles/ubuntu_i686/Dockerfile +++ b/dockerfiles/ubuntu_i686/Dockerfile @@ -2,4 +2,4 @@ FROM ubuntu:16.04 RUN dpkg --add-architecture i386 RUN apt-get update RUN apt-get -y upgrade -RUN apt-get install --no-install-recommends -y gcc-multilib g++-multilib cmake libsdl2-dev:i386 libsdl2-ttf-dev:i386 pkg-config:i386 libjansson-dev:i386 libspeex-dev:i386 libspeexdsp-dev:i386 libcurl4-openssl-dev:i386 libcrypto++-dev:i386 libfontconfig1-dev:i386 libfreetype6-dev:i386 libpng-dev:i386 libzip-dev:i386 libssl-dev:i386 +RUN apt-get install --no-install-recommends -y gcc-multilib g++-multilib cmake libsdl2-dev:i386 libsdl2-ttf-dev:i386 pkg-config:i386 libjansson-dev:i386 libspeex-dev:i386 libspeexdsp-dev:i386 libcurl4-openssl-dev:i386 libcrypto++-dev:i386 libfontconfig1-dev:i386 libfreetype6-dev:i386 libpng-dev:i386 libzip-dev:i386 libssl-dev:i386 ninja-build