From a8a58129281614988da6aaeef18b11bf55fa596a Mon Sep 17 00:00:00 2001 From: pentarctagon Date: Wed, 13 Nov 2019 19:01:43 -0600 Subject: [PATCH] Move travis' dockerfiles to common directory. --- .github/labeler.yml | 2 +- TRAVIS.md | 4 ++-- .../dockerbuilds/travis}/Dockerfile-base-1604-master | 0 .../dockerbuilds/travis}/Dockerfile-base-1804-master | 0 utils/travis/steps/install.sh | 8 ++++---- 5 files changed, 7 insertions(+), 7 deletions(-) rename {docker => utils/dockerbuilds/travis}/Dockerfile-base-1604-master (100%) rename {docker => utils/dockerbuilds/travis}/Dockerfile-base-1804-master (100%) diff --git a/.github/labeler.yml b/.github/labeler.yml index 2c1772205fc..31d54cbc3ed 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -28,7 +28,7 @@ CMake: Docker: - .dockerignore - - docker/* + - utils/dockerbuilds/travis/* - utils/travis/docker_run.sh Docs: diff --git a/TRAVIS.md b/TRAVIS.md index 13de1104316..f6861168f3f 100644 --- a/TRAVIS.md +++ b/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 diff --git a/docker/Dockerfile-base-1604-master b/utils/dockerbuilds/travis/Dockerfile-base-1604-master similarity index 100% rename from docker/Dockerfile-base-1604-master rename to utils/dockerbuilds/travis/Dockerfile-base-1604-master diff --git a/docker/Dockerfile-base-1804-master b/utils/dockerbuilds/travis/Dockerfile-base-1804-master similarity index 100% rename from docker/Dockerfile-base-1804-master rename to utils/dockerbuilds/travis/Dockerfile-base-1804-master diff --git a/utils/travis/steps/install.sh b/utils/travis/steps/install.sh index 9d580d41243..0d7e74b0dfb 100755 --- a/utils/travis/steps/install.sh +++ b/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