use docker tags to select distro release

diff --git a/scripts/docker/archlinux-build/Dockerfile b/scripts/docker/archlinux-build/Dockerfile
index d63f4218c63a40cedb5565e1d61e10fe668f5821..37b10420fcc12394f9ac8f4cbd3f06d7ec96775b 100644 (file)
--- a/scripts/docker/archlinux-build/Dockerfile
+++ b/scripts/docker/archlinux-build/Dockerfile
@@ -1,3 +1,15 @@
 FROM rafaelsoares/archlinux-devel
 
-RUN sudo pacman -S --noconfirm git glew glm sdl2 sdl2_image sdl2_net sdl2_ttf openal freealut zlib cppunit
+RUN sudo pacman -S --noconfirm \
+       cppunit \
+       freealut \
+       git \
+       glew \
+       glm \
+       openal \
+       sdl2 \
+       sdl2_image \
+       sdl2_net \
+       sdl2_ttf \
+       zlib \
+       ;

diff --git a/scripts/docker/archlinux-run/Dockerfile b/scripts/docker/archlinux-run/Dockerfile
new file mode 100644 (file)
index 0000000..ed69ac9
--- /dev/null
+++ b/scripts/docker/archlinux-run/Dockerfile
@@ -0,0 +1,13 @@
+FROM rafaelsoares/archlinux
+
+RUN sudo pacman -S --noconfirm \
+       freealut \
+       glew \
+       glm \
+       openal \
+       sdl2 \
+       sdl2_image \
+       sdl2_net \
+       sdl2_ttf \
+       zlib \
+       ;

diff --git a/scripts/docker/debian-build-latest/Dockerfile b/scripts/docker/debian-build-latest/Dockerfile
new file mode 100644 (file)
index 0000000..4d4bdaf
--- /dev/null
+++ b/scripts/docker/debian-build-latest/Dockerfile
@@ -0,0 +1,16 @@
+FROM debian:latest
+
+RUN apt update \
+       && apt -y install build-essential
+RUN apt -y install --no-install-recommends \
+       libalut-dev \
+       libcppunit-dev \
+       libglew-dev \
+       libglm-dev \
+       libopenal-dev \
+       libsdl2-dev \
+       libsdl2-image-dev \
+       libsdl2-net-dev \
+       libsdl2-ttf-dev \
+       zlib1g-dev \
+       ;

diff --git a/scripts/docker/debian-build-testing/Dockerfile b/scripts/docker/debian-build-testing/Dockerfile
new file mode 100644 (file)
index 0000000..54e8542
--- /dev/null
+++ b/scripts/docker/debian-build-testing/Dockerfile
@@ -0,0 +1,16 @@
+FROM debian:testing
+
+RUN apt update \
+       && apt -y install build-essential
+RUN apt -y install --no-install-recommends \
+       libalut-dev \
+       libcppunit-dev \
+       libglew-dev \
+       libglm-dev \
+       libopenal-dev \
+       libsdl2-dev \
+       libsdl2-image-dev \
+       libsdl2-net-dev \
+       libsdl2-ttf-dev \
+       zlib1g-dev \
+       ;

diff --git a/scripts/docker/debian-latest-build/Dockerfile b/scripts/docker/debian-latest-build/Dockerfile
deleted file mode 100644 (file)
index 28c1e1c..0000000
--- a/scripts/docker/debian-latest-build/Dockerfile
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM debian:latest
-
-RUN apt update
-RUN apt -y install --no-install-recommends build-essential libglew-dev libglm-dev libsdl2-dev libsdl2-image-dev libsdl2-net-dev libsdl2-ttf-dev libopenal-dev libalut-dev zlib1g-dev libcppunit-dev

diff --git a/scripts/docker/debian-testing-build/Dockerfile b/scripts/docker/debian-testing-build/Dockerfile
deleted file mode 100644 (file)
index ae387e4..0000000
--- a/scripts/docker/debian-testing-build/Dockerfile
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM debian:testing
-
-RUN apt update
-RUN apt -y install --no-install-recommends build-essential libglew-dev libglm-dev libsdl2-dev libsdl2-image-dev libsdl2-net-dev libsdl2-ttf-dev libopenal-dev libalut-dev zlib1g-dev libcppunit-dev

diff --git a/scripts/docker/exec.bash b/scripts/docker/exec.bash
index ec61e1b6e5f88a5f58782768d9ef44594d1d7fa4..9874c9a9f49fbe0b4db2d0d06e790f557eeb89b6 100755 (executable)
--- a/scripts/docker/exec.bash
+++ b/scripts/docker/exec.bash
@@ -10,7 +10,7 @@
 IMAGE="${IMAGE:-archlinux-build}"
 
 image_name="localhorsttv/${IMAGE}"
-image_path="scripts/docker/${IMAGE}"
+image_path="scripts/docker/${IMAGE//:/-}"
 
 build_cmd="cd /repo && make -j\$(nproc) $TARGETS"
 

diff --git a/scripts/docker/ubuntu-build-devel/Dockerfile b/scripts/docker/ubuntu-build-devel/Dockerfile
new file mode 100644 (file)
index 0000000..25c9f6f
--- /dev/null
+++ b/scripts/docker/ubuntu-build-devel/Dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu:devel
+
+RUN apt update \
+       && apt -y install build-essential
+RUN apt -y install --no-install-recommends \
+       libalut-dev \
+       libcppunit-dev \
+       libglew-dev \
+       libglm-dev \
+       libopenal-dev \
+       libsdl2-dev \
+       libsdl2-image-dev \
+       libsdl2-net-dev \
+       libsdl2-ttf-dev \
+       zlib1g-dev \
+       ;

diff --git a/scripts/docker/ubuntu-build-latest/Dockerfile b/scripts/docker/ubuntu-build-latest/Dockerfile
new file mode 100644 (file)
index 0000000..8cfda8c
--- /dev/null
+++ b/scripts/docker/ubuntu-build-latest/Dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu:latest
+
+RUN apt update \
+       && apt -y install build-essential
+RUN apt -y install --no-install-recommends \
+       libalut-dev \
+       libcppunit-dev \
+       libglew-dev \
+       libglm-dev \
+       libopenal-dev \
+       libsdl2-dev \
+       libsdl2-image-dev \
+       libsdl2-net-dev \
+       libsdl2-ttf-dev \
+       zlib1g-dev \
+       ;

diff --git a/scripts/docker/ubuntu-build-latest/env b/scripts/docker/ubuntu-build-latest/env
new file mode 100644 (file)
index 0000000..13f8143
--- /dev/null
+++ b/scripts/docker/ubuntu-build-latest/env
@@ -0,0 +1 @@
+LDXXFLAGS=-L/usr/lib/x86_64-linux-gnu

diff --git a/scripts/docker/ubuntu-devel-build/Dockerfile b/scripts/docker/ubuntu-devel-build/Dockerfile
deleted file mode 100644 (file)
index d1a256b..0000000
--- a/scripts/docker/ubuntu-devel-build/Dockerfile
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM ubuntu:devel
-
-RUN apt update
-RUN apt -y install --no-install-recommends build-essential libglew-dev libglm-dev libsdl2-dev libsdl2-image-dev libsdl2-net-dev libsdl2-ttf-dev libopenal-dev libalut-dev zlib1g-dev libcppunit-dev

diff --git a/scripts/docker/ubuntu-latest-build/Dockerfile b/scripts/docker/ubuntu-latest-build/Dockerfile
deleted file mode 100644 (file)
index 1f64861..0000000
--- a/scripts/docker/ubuntu-latest-build/Dockerfile
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM ubuntu:latest
-
-RUN apt update
-RUN apt -y install --no-install-recommends build-essential libglew-dev libglm-dev libsdl2-dev libsdl2-image-dev libsdl2-net-dev libsdl2-ttf-dev libopenal-dev libalut-dev zlib1g-dev libcppunit-dev

diff --git a/scripts/docker/ubuntu-latest-build/env b/scripts/docker/ubuntu-latest-build/env
deleted file mode 100644 (file)
index 13f8143..0000000
--- a/scripts/docker/ubuntu-latest-build/env
+++ /dev/null
@@ -1 +0,0 @@
-LDXXFLAGS=-L/usr/lib/x86_64-linux-gnu