0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move travis' dockerfiles to common directory.

Browse source
This commit is contained in:
pentarctagon 2019-11-13 19:01:43 -06:00 • committed by Pentarctagon
parent 4c48defdd0
commit a8a5812928
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/labeler.yml vendored
View file

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

4
TRAVIS.md
View file

@ -1,10 +1,10 @@
To create the base image with Wesnoth's dependencies: 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: 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 To push a new base image to Docker Hub

0
docker/Dockerfile-base-1604-master → utils/dockerbuilds/travis/Dockerfile-base-1604-master
View file

0
docker/Dockerfile-base-1804-master → utils/dockerbuilds/travis/Dockerfile-base-1804-master
View file

8
utils/travis/steps/install.sh
View file

@ -31,9 +31,9 @@ else
echo "po/" >> .dockerignore echo "po/" >> .dockerignore
fi fi
echo "FROM wesnoth/wesnoth:$LTS-$BRANCH" > docker/Dockerfile-travis-"$LTS"-"$BRANCH" echo "FROM wesnoth/wesnoth:$LTS-$BRANCH" > utils/dockerbuilds/travis/Dockerfile-travis-"$LTS"-"$BRANCH"
echo "COPY ./ /home/wesnoth-travis/" >> docker/Dockerfile-travis-"$LTS"-"$BRANCH" echo "COPY ./ /home/wesnoth-travis/" >> utils/dockerbuilds/travis/Dockerfile-travis-"$LTS"-"$BRANCH"
echo "WORKDIR /home/wesnoth-travis" >> docker/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 fi