Move travis' dockerfiles to common directory.

.github/labeler.yml

@@ -28,7 +28,7 @@ CMake:
 
 Docker:
   - .dockerignore
-  - docker/*
+  - utils/dockerbuilds/travis/*
   - utils/travis/docker_run.sh
 
 Docs:

TRAVIS.md

@@ -1,10 +1,10 @@
 To create the base image with Wesnoth's dependencies:
 
-  docker build -t wesnoth:16.04 -f docker/Dockerfile-base docker
+  docker build -t wesnoth:16.04 -f utils/dockerbuilds/travis/Dockerfile-base docker
 
 To create the image that travis will run during a build:
 
-  docker build -t wesnoth-repo:16.04 -f docker/Dockerfile-travis .
+  docker build -t wesnoth-repo:16.04 -f utils/dockerbuilds/travis/Dockerfile-travis .
 
 To push a new base image to Docker Hub
 

utils/travis/steps/install.sh

@@ -31,9 +31,9 @@ else
         echo "po/" >> .dockerignore
     fi
 
-    echo "FROM wesnoth/wesnoth:$LTS-$BRANCH" > docker/Dockerfile-travis-"$LTS"-"$BRANCH"
-    echo "COPY ./ /home/wesnoth-travis/" >> docker/Dockerfile-travis-"$LTS"-"$BRANCH"
-    echo "WORKDIR /home/wesnoth-travis" >> docker/Dockerfile-travis-"$LTS"-"$BRANCH"
+    echo "FROM wesnoth/wesnoth:$LTS-$BRANCH" > utils/dockerbuilds/travis/Dockerfile-travis-"$LTS"-"$BRANCH"
+    echo "COPY ./ /home/wesnoth-travis/" >> utils/dockerbuilds/travis/Dockerfile-travis-"$LTS"-"$BRANCH"
+    echo "WORKDIR /home/wesnoth-travis" >> utils/dockerbuilds/travis/Dockerfile-travis-"$LTS"-"$BRANCH"
 
-    docker build -t wesnoth-repo:"$LTS"-"$BRANCH" -f docker/Dockerfile-travis-"$LTS"-"$BRANCH" .
+    docker build -t wesnoth-repo:"$LTS"-"$BRANCH" -f utils/dockerbuilds/travis/Dockerfile-travis-"$LTS"-"$BRANCH" .
 fi