From 846958003cd3529e6322146d289265859db0ba8e Mon Sep 17 00:00:00 2001 From: Daniel Karbach Date: Wed, 9 Nov 2016 15:12:22 +0100 Subject: [PATCH] use docker tags to select distro release --- scripts/docker/archlinux-build/Dockerfile | 14 +++++++++++++- scripts/docker/archlinux-run/Dockerfile | 13 +++++++++++++ scripts/docker/debian-build-latest/Dockerfile | 16 ++++++++++++++++ scripts/docker/debian-build-testing/Dockerfile | 16 ++++++++++++++++ scripts/docker/debian-latest-build/Dockerfile | 4 ---- scripts/docker/debian-testing-build/Dockerfile | 4 ---- scripts/docker/exec.bash | 2 +- scripts/docker/ubuntu-build-devel/Dockerfile | 16 ++++++++++++++++ scripts/docker/ubuntu-build-latest/Dockerfile | 16 ++++++++++++++++ .../env | 0 scripts/docker/ubuntu-devel-build/Dockerfile | 4 ---- scripts/docker/ubuntu-latest-build/Dockerfile | 4 ---- 12 files changed, 91 insertions(+), 18 deletions(-) create mode 100644 scripts/docker/archlinux-run/Dockerfile create mode 100644 scripts/docker/debian-build-latest/Dockerfile create mode 100644 scripts/docker/debian-build-testing/Dockerfile delete mode 100644 scripts/docker/debian-latest-build/Dockerfile delete mode 100644 scripts/docker/debian-testing-build/Dockerfile create mode 100644 scripts/docker/ubuntu-build-devel/Dockerfile create mode 100644 scripts/docker/ubuntu-build-latest/Dockerfile rename scripts/docker/{ubuntu-latest-build => ubuntu-build-latest}/env (100%) delete mode 100644 scripts/docker/ubuntu-devel-build/Dockerfile delete mode 100644 scripts/docker/ubuntu-latest-build/Dockerfile diff --git a/scripts/docker/archlinux-build/Dockerfile b/scripts/docker/archlinux-build/Dockerfile index d63f421..37b1042 100644 --- 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 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 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 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 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 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 ec61e1b..9874c9a 100755 --- 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 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 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-latest-build/env b/scripts/docker/ubuntu-build-latest/env similarity index 100% rename from scripts/docker/ubuntu-latest-build/env rename to scripts/docker/ubuntu-build-latest/env diff --git a/scripts/docker/ubuntu-devel-build/Dockerfile b/scripts/docker/ubuntu-devel-build/Dockerfile deleted file mode 100644 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 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 -- 2.39.2