Skip to content

Commit

Permalink
Create travis dockerfile in the travis script step.
Browse files Browse the repository at this point in the history
This allows having multiple Dockerfile-base-* files without also needing to add a separate Dockerfile-travis-* file due to the FROM line changing.
  • Loading branch information
Pentarctagon committed Apr 1, 2018
1 parent fed46ec commit 3f67c2f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
5 changes: 0 additions & 5 deletions docker/Dockerfile-travis-1604-master

This file was deleted.

4 changes: 4 additions & 0 deletions utils/travis/steps/install.sh
Expand Up @@ -30,5 +30,9 @@ if [ "$TRAVIS_OS_NAME" = "osx" ]; then
export LDFLAGS="-L/usr/local/opt/openssl/lib $LDFLAGS"
fi
else
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"

docker build -t wesnoth-repo:"$LTS"-"$BRANCH" -f docker/Dockerfile-travis-"$LTS"-"$BRANCH" .
fi

0 comments on commit 3f67c2f

Please sign in to comment.