mirror of
https://github.com/factoriotools/factorio-docker.git
synced 2024-12-26 02:48:23 +01:00
Switch to test pt. 2
This commit is contained in:
parent
4afbed52c8
commit
95766e90c9
10
build.sh
10
build.sh
@ -33,7 +33,7 @@ else
|
||||
TAGS="$DOCKER_REPO:$VERSION -t $DOCKER_REPO:$VERSION_SHORT"
|
||||
fi
|
||||
|
||||
if [[ -n $EXTRA_TAG ]]; then
|
||||
if [[ -n ${EXTRA_TAG:-} ]]; then
|
||||
TAGS="$TAGS -t $DOCKER_REPO:$EXTRA_TAG"
|
||||
fi
|
||||
fi
|
||||
@ -55,21 +55,21 @@ if [[ $(dirname "$(git diff --name-only HEAD^)") =~ $VERSION_SHORT ]] && [[ $TRA
|
||||
fi
|
||||
|
||||
# push a tag on a branch other than master
|
||||
if [[ -n "$TRAVIS_BRANCH" ]] && [[ "$TRAVIS_BRANCH" != "${VERSION%-*}" ]] && [[ "$TRAVIS_BRANCH" != "master" ]]; then
|
||||
if [[ -n $TRAVIS_BRANCH ]] && [[ $TRAVIS_BRANCH != "${VERSION%-*}" ]] && [[ $TRAVIS_BRANCH != "master" ]]; then
|
||||
docker push "$DOCKER_REPO:$TRAVIS_BRANCH"
|
||||
fi
|
||||
|
||||
# push an incremental tag
|
||||
if [[ "$TRAVIS_BRANCH" != "${VERSION%-*}" ]]; then
|
||||
if [[ $TRAVIS_BRANCH != "${VERSION%-*}" ]]; then
|
||||
docker push "$DOCKER_REPO:$TRAVIS_BRANCH"
|
||||
fi
|
||||
|
||||
if [[ -n "$TRAVIS_TAG" ]] || [[ "$CI" == "" ]]; then
|
||||
if [[ -n $TRAVIS_TAG ]] || [[ $CI == "" ]]; then
|
||||
docker push "$DOCKER_REPO:$VERSION"
|
||||
docker push "$DOCKER_REPO:$VERSION_SHORT"
|
||||
fi
|
||||
|
||||
if [[ -n "$EXTRA_TAG" ]]; then
|
||||
if [[ -n ${EXTRA_TAG:-} ]]; then
|
||||
docker push "$DOCKER_REPO:$EXTRA_TAG"
|
||||
fi
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user