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 9bf76dbf8c2449a58d4185a6fc2eaf713ec8412f..69f59caf32fef9237b725f8c4dde4ca1c060828d 100644 (file)
--- 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 5c09e0c89aec23f548adc56e60dcde45fc504e0d..e19bd267c9161e323cb91b1b394c448a99dd0a97 100644 (file)
--- 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 838c84db8171a1ceaebd8194a555d6aeeb3dca6e..85c6b820ca7b7b9b1071dac52d5cd67ae76c7462 100644 (file)
--- 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 c344aa963e04a1a45c425caadd74bf85ae93f21c..8af8716236934f07d2c4f0e275d6ae1fb32eb556 100644 (file)
--- 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 824405970abb10dc462a20db015de1cd430ea61f..3ba2d6f44420e43b0e7b719b2b3953930c3af850 100755 (executable)
--- 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 e5f0c01199fd3eb87c9a4e9e41045bfce5aee576..f8cd309e4cd18b43a95056cfe3f326c82145dd97 100644 (file)
--- 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 69c11a91e44a6676cffa0ebdada3ed377e2222ea..b3b44539e62c10d72b7349d8b440e7f6ae96bb1a 100644 (file)
--- 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 \