From 1bb5fdf2830515d33793c52f298d305bd12b5a60 Mon Sep 17 00:00:00 2001
From: pentarctagon <pentarctagon@tutamail.com>
Date: Thu, 29 Mar 2018 23:51:09 -0500
Subject: [PATCH] Add using dockerfiles based on the LTS and BRANCH env vars

This makes it simpler in the future to have branches that have dependencies that are different from master, rather than having a single image with all necessary dependencies installed, which may at some point end up not being possible to do.
---
 .travis.yml                                            | 10 +++++-----
 .../{Dockerfile-base => Dockerfile-base-1604-master}   |  0
 ...Dockerfile-travis => Dockerfile-travis-1604-master} |  2 +-
 utils/travis/steps/install.sh                          |  2 +-
 utils/travis/steps/script.sh                           |  2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)
 rename docker/{Dockerfile-base => Dockerfile-base-1604-master} (100%)
 rename docker/{Dockerfile-travis => Dockerfile-travis-1604-master} (64%)

diff --git a/.travis.yml b/.travis.yml
index c6ddd67bd9b4..08a11602fc56 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,19 +12,19 @@ cache:
 matrix:
   include:
     - compiler: gcc
-      env: TOOL=scons CXXSTD=14 NLS=true
+      env: TOOL=scons CXXSTD=14 NLS=true LTS=1604 BRANCH=master
 
     - compiler: gcc
-      env: TOOL=scons CXXSTD=14 NLS=false OPT=-O0
+      env: TOOL=scons CXXSTD=14 NLS=false LTS=1604 BRANCH=master OPT=-O0
 
     - compiler: gcc
-      env: TOOL=cmake CXXSTD=14 NLS=false
+      env: TOOL=cmake CXXSTD=14 NLS=false LTS=1604 BRANCH=master
 
     - compiler: clang
-      env: TOOL=scons CXXSTD=14 NLS=false OPT=-O0
+      env: TOOL=scons CXXSTD=14 NLS=false LTS=1604 BRANCH=master OPT=-O0
 
     - compiler: clang
-      env: TOOL=cmake CXXSTD=14 NLS=false
+      env: TOOL=cmake CXXSTD=14 NLS=false LTS=1604 BRANCH=master
 
     - os: osx
       compiler: clang
diff --git a/docker/Dockerfile-base b/docker/Dockerfile-base-1604-master
similarity index 100%
rename from docker/Dockerfile-base
rename to docker/Dockerfile-base-1604-master
diff --git a/docker/Dockerfile-travis b/docker/Dockerfile-travis-1604-master
similarity index 64%
rename from docker/Dockerfile-travis
rename to docker/Dockerfile-travis-1604-master
index c83301eefc2d..da53e338480f 100644
--- a/docker/Dockerfile-travis
+++ b/docker/Dockerfile-travis-1604-master
@@ -1,4 +1,4 @@
-FROM wesnoth/wesnoth:16.04
+FROM wesnoth/wesnoth:1604-master
 
 COPY ./ /home/wesnoth-travis/
 
diff --git a/utils/travis/steps/install.sh b/utils/travis/steps/install.sh
index 80dc0ae0ec07..97078a14e87a 100755
--- a/utils/travis/steps/install.sh
+++ b/utils/travis/steps/install.sh
@@ -30,5 +30,5 @@ if [ "$TRAVIS_OS_NAME" = "osx" ]; then
         export LDFLAGS="-L/usr/local/opt/openssl/lib $LDFLAGS"
     fi
 else
-    docker build -t wesnoth-repo:16.04 -f docker/Dockerfile-travis .
+    docker build -t wesnoth-repo:"$LTS"-"$BRANCH" -f docker/Dockerfile-travis-"$LTS"-"$BRANCH" .
 fi
diff --git a/utils/travis/steps/script.sh b/utils/travis/steps/script.sh
index 3c7a735b52f6..dd02c3e2a3ed 100755
--- a/utils/travis/steps/script.sh
+++ b/utils/travis/steps/script.sh
@@ -33,7 +33,7 @@ if [ "$TRAVIS_OS_NAME" = "osx" ]; then
     fi
 else
     docker run -v "$HOME"/build-cache:/home/wesnoth-travis/build \
-               -v "$HOME"/.ccache:/root/.ccache wesnoth-repo:16.04 \
+               -v "$HOME"/.ccache:/root/.ccache wesnoth-repo:"$LTS"-"$BRANCH" \
                bash -c './utils/travis/docker_run.sh "$@"' \
                bash "$NLS" "$TOOL" "$CC" "$CXX" "$CXXSTD" "$EXTRA_FLAGS_RELEASE" "$WML_TESTS" "$WML_TEST_TIME" "$PLAY_TEST" "$MP_TEST" "$BOOST_TEST" "$LTO"
 fi