From bef504fb3ed7cf0a830cbe7fb74bddc682c03d19 Mon Sep 17 00:00:00 2001 From: Daniel Karbach Date: Wed, 9 Nov 2016 10:48:31 +0100 Subject: [PATCH] ubuntu latest and devel docker images --- .travis.yml | 2 ++ scripts/docker/exec.bash | 10 ++++++++-- scripts/docker/ubuntu-devel-build/Dockerfile | 4 ++++ scripts/docker/ubuntu-latest-build/Dockerfile | 4 ++++ scripts/docker/ubuntu-latest-build/env | 1 + 5 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 scripts/docker/ubuntu-devel-build/Dockerfile create mode 100644 scripts/docker/ubuntu-latest-build/Dockerfile create mode 100644 scripts/docker/ubuntu-latest-build/env diff --git a/.travis.yml b/.travis.yml index 3dde5e0..e8af945 100644 --- 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 b146e76..cb6a665 100755 --- 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 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 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 index 0000000..13f8143 --- /dev/null +++ b/scripts/docker/ubuntu-latest-build/env @@ -0,0 +1 @@ +LDXXFLAGS=-L/usr/lib/x86_64-linux-gnu -- 2.39.2