From: Daniel Karbach Date: Thu, 24 Nov 2016 12:03:05 +0000 (+0100) Subject: git is a "runtime" dependency X-Git-Url: https://git.localhorst.tv/?a=commitdiff_plain;h=27d34ab291ed6c574432b1331c7ab61172a097d7;p=blank.git git is a "runtime" dependency at least for the docker container deployment script (and make fetching the assets) --- diff --git a/scripts/docker/archlinux-run/Dockerfile b/scripts/docker/archlinux-run/Dockerfile index 9bf76db..69f59ca 100644 --- a/scripts/docker/archlinux-run/Dockerfile +++ b/scripts/docker/archlinux-run/Dockerfile @@ -1,25 +1,30 @@ FROM base/archlinux -RUN echo 'Server = http://mirror.23media.de/archlinux/$repo/os/$arch' > /etc/pacman.d/mirrorlist && \ - pacman-key --init && \ - pacman-key --populate archlinux && \ - pacman -Sy --noconfirm archlinux-keyring && \ - pacman -S --noconfirm pacman && \ - pacman-db-upgrade && \ - pacman -Su --noconfirm && \ - pacman -S --noconfirm mesa-libgl xorg-server-xvfb && \ - paccache -rk 0 +RUN echo 'Server = http://mirror.23media.de/archlinux/$repo/os/$arch' > /etc/pacman.d/mirrorlist \ + && pacman-key --init \ + && pacman-key --populate archlinux \ + && pacman -Sy --noconfirm archlinux-keyring \ + && pacman -S --noconfirm pacman \ + && pacman-db-upgrade \ + && pacman -Su --noconfirm \ + && pacman -S --noconfirm \ + git \ + make \ + mesa-libgl \ + xorg-server-xvfb \ + && paccache -rk 0 \ + ; RUN pacman -S --needed --noconfirm \ - freealut \ - glew \ - openal \ - sdl2 \ - sdl2_image \ - sdl2_net \ - sdl2_ttf \ - zlib \ - && \ - paccache -rk 0 && \ - mkdir -p /etc/openal && \ - echo -e '[general]\ndrivers = null' > /etc/openal/alsoft.conf + freealut \ + glew \ + openal \ + sdl2 \ + sdl2_image \ + sdl2_net \ + sdl2_ttf \ + zlib \ + && paccache -rk 0 \ + && mkdir -p /etc/openal \ + && echo -e '[general]\ndrivers = null' > /etc/openal/alsoft.conf \ + ; diff --git a/scripts/docker/centos-run-latest/Dockerfile b/scripts/docker/centos-run-latest/Dockerfile index 5c09e0c..e19bd26 100644 --- a/scripts/docker/centos-run-latest/Dockerfile +++ b/scripts/docker/centos-run-latest/Dockerfile @@ -4,6 +4,7 @@ RUN yum -y update \ && yum -y install epel-release \ && yum -y update \ && yum -y install \ + git \ make \ which \ xorg-x11-server-utils \ diff --git a/scripts/docker/debian-run-latest/Dockerfile b/scripts/docker/debian-run-latest/Dockerfile index 838c84d..85c6b82 100644 --- a/scripts/docker/debian-run-latest/Dockerfile +++ b/scripts/docker/debian-run-latest/Dockerfile @@ -3,6 +3,7 @@ FROM debian:latest RUN apt -y update \ && apt -y upgrade \ && apt -y install --no-install-recommends \ + git \ make \ xauth \ xvfb \ diff --git a/scripts/docker/debian-run-testing/Dockerfile b/scripts/docker/debian-run-testing/Dockerfile index c344aa9..8af8716 100644 --- a/scripts/docker/debian-run-testing/Dockerfile +++ b/scripts/docker/debian-run-testing/Dockerfile @@ -3,6 +3,7 @@ FROM debian:testing RUN apt -y update \ && apt -y upgrade \ && apt -y install --no-install-recommends \ + git \ make \ xauth \ xvfb \ @@ -10,15 +11,15 @@ RUN apt -y update \ ; RUN apt -y install --no-install-recommends \ - libalut0 \ - libglew1.10 \ - libglu1-mesa \ - libopenal1 \ - libsdl2-2.0-0 \ - libsdl2-image-2.0-0 \ - libsdl2-net-2.0-0 \ - libsdl2-ttf-2.0-0 \ - zlib1g \ + libalut0 \ + libglew1.10 \ + libglu1-mesa \ + libopenal1 \ + libsdl2-2.0-0 \ + libsdl2-image-2.0-0 \ + libsdl2-net-2.0-0 \ + libsdl2-ttf-2.0-0 \ + zlib1g \ && apt-get -y clean \ && echo -e '[general]\ndrivers = null' > /etc/openal/alsoft.conf \ ; diff --git a/scripts/docker/exec.bash b/scripts/docker/exec.bash index 8244059..3ba2d6f 100755 --- a/scripts/docker/exec.bash +++ b/scripts/docker/exec.bash @@ -27,4 +27,4 @@ if [[ "$TARGETS" == *codecov* ]]; then fi docker build -t "${image_name}" --pull=true "${image_path}" -docker run -v "$PWD":/repo ${local_conf} "${image_name}" sh -c "$xvfb_cmd sh -c 'env ; glewinfo | head ; ${build_cmd}'" +docker run -v "$PWD":/repo ${local_conf} "${image_name}" sh -c "$xvfb_cmd sh -c '${build_cmd}'" diff --git a/scripts/docker/ubuntu-run-devel/Dockerfile b/scripts/docker/ubuntu-run-devel/Dockerfile index e5f0c01..f8cd309 100644 --- a/scripts/docker/ubuntu-run-devel/Dockerfile +++ b/scripts/docker/ubuntu-run-devel/Dockerfile @@ -3,6 +3,7 @@ FROM ubuntu:devel RUN apt -y update \ && apt -y upgrade \ && apt -y install --no-install-recommends \ + git \ make \ xauth \ xvfb \ @@ -10,16 +11,16 @@ RUN apt -y update \ ; -RUN apt -y install --no-install-recommends make \ - libalut0 \ - libglew1.10 \ - libglu1-mesa \ - libopenal1 \ - libsdl2-2.0-0 \ - libsdl2-image-2.0-0 \ - libsdl2-net-2.0-0 \ - libsdl2-ttf-2.0-0 \ - zlib1g \ +RUN apt -y install --no-install-recommends \ + libalut0 \ + libglew1.10 \ + libglu1-mesa \ + libopenal1 \ + libsdl2-2.0-0 \ + libsdl2-image-2.0-0 \ + libsdl2-net-2.0-0 \ + libsdl2-ttf-2.0-0 \ + zlib1g \ && apt-get -y clean \ && echo -e '[general]\ndrivers = null' > /etc/openal/alsoft.conf \ ; diff --git a/scripts/docker/ubuntu-run-latest/Dockerfile b/scripts/docker/ubuntu-run-latest/Dockerfile index 69c11a9..b3b4453 100644 --- a/scripts/docker/ubuntu-run-latest/Dockerfile +++ b/scripts/docker/ubuntu-run-latest/Dockerfile @@ -3,6 +3,7 @@ FROM ubuntu:latest RUN apt update \ && apt -y upgrade \ && apt -y install --no-install-recommends \ + git \ make \ xauth \ xvfb \