ubuntu latest and devel docker images

diff --git a/.travis.yml b/.travis.yml
index 3dde5e0a35a605193883381f569968cbf475052e..e8af9451077c9dc0819adeb4b810a712a2cc21cf 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,8 @@ matrix:
     - env: IMAGE=archlinux-build TARGETS=codecov
     - env: IMAGE=debian-latest-build TARGETS=test
     - env: IMAGE=debian-testing-build TARGETS=test
+    - env: IMAGE=ubuntu-latest-build TARGETS=test
+    - env: IMAGE=ubuntu-devel-build TARGETS=test
 
 script:
     - bash scripts/docker/exec.bash

diff --git a/scripts/docker/exec.bash b/scripts/docker/exec.bash
index b146e7647e712ac85e767f08502776a8736614b1..cb6a6651b8d84b376f78607cb75e59671e33cb5c 100755 (executable)
--- a/scripts/docker/exec.bash
+++ b/scripts/docker/exec.bash
@@ -9,9 +9,15 @@
 
 IMAGE="${IMAGE:-archlinux-build}"
 
+local_conf=""
+
 if [[ "$TARGETS" == *codecov* ]]; then
-       ci_env=`bash <(curl -s https://codecov.io/env)`
+       local_conf="$local_conf $(bash <(curl -s https://codecov.io/env))"
+fi
+
+if [ -e scripts/docker/"${IMAGE}"/env ]; then
+       local_conf="$local_conf --env-file scripts/docker/${IMAGE}/env"
 fi
 
 docker build -t "blank/${IMAGE}" scripts/docker/"${IMAGE}"
-docker run -v "$PWD":/repo ${ci_env} "blank/${IMAGE}" /bin/bash -c "cd /repo && make -j\$(nproc) $TARGETS"
+docker run -v "$PWD":/repo ${local_conf} "blank/${IMAGE}" /bin/bash -c "cd /repo && make -j\$(nproc) $TARGETS"

diff --git a/scripts/docker/ubuntu-devel-build/Dockerfile b/scripts/docker/ubuntu-devel-build/Dockerfile
new file mode 100644 (file)
index 0000000..d1a256b
--- /dev/null
+++ b/scripts/docker/ubuntu-devel-build/Dockerfile
@@ -0,0 +1,4 @@
+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
new file mode 100644 (file)
index 0000000..1f64861
--- /dev/null
+++ b/scripts/docker/ubuntu-latest-build/Dockerfile
@@ -0,0 +1,4 @@
+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
new file mode 100644 (file)
index 0000000..13f8143
--- /dev/null
+++ b/scripts/docker/ubuntu-latest-build/env
@@ -0,0 +1 @@
+LDXXFLAGS=-L/usr/lib/x86_64-linux-gnu