mirror of
https://github.com/factoriotools/factorio-docker.git
synced 2025-07-07 17:54:41 +02:00
Compare commits
6 Commits
Author | SHA1 | Date | |
---|---|---|---|
5d997bf1c7 | |||
7a08cbb04c | |||
40cc26ca02 | |||
e8705a44b8 | |||
fe9875343f | |||
06729a6097 |
@ -9,8 +9,8 @@ ARG PGID=845
|
|||||||
|
|
||||||
ENV PORT=34197 \
|
ENV PORT=34197 \
|
||||||
RCON_PORT=27015 \
|
RCON_PORT=27015 \
|
||||||
VERSION=0.17.54 \
|
VERSION=0.17.56 \
|
||||||
SHA1=69750604bc9036abdf5e9297dfc975f80b52c573 \
|
SHA1=fdf609a314ab4100b1547b92f718ec24bc9c0eb4 \
|
||||||
SAVES=/factorio/saves \
|
SAVES=/factorio/saves \
|
||||||
CONFIG=/factorio/config \
|
CONFIG=/factorio/config \
|
||||||
MODS=/factorio/mods \
|
MODS=/factorio/mods \
|
||||||
|
@ -25,7 +25,7 @@ print_failure()
|
|||||||
|
|
||||||
update_mod()
|
update_mod()
|
||||||
{
|
{
|
||||||
MOD_NAME="$1"
|
MOD_NAME="${1// /%20}"
|
||||||
|
|
||||||
print_step "Checking for update of mod $MOD_NAME..."
|
print_step "Checking for update of mod $MOD_NAME..."
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
# Factorio [](https://travis-ci.org/factoriotools/factorio-docker) [](https://hub.docker.com/r/factoriotools/factorio/) [](https://hub.docker.com/r/factoriotools/factorio/) [](https://hub.docker.com/r/factoriotools/factorio/) [](https://microbadger.com/images/factoriotools/factorio "Get your own image badge on microbadger.com")
|
# Factorio [](https://travis-ci.org/factoriotools/factorio-docker) [](https://hub.docker.com/r/factoriotools/factorio/) [](https://hub.docker.com/r/factoriotools/factorio/) [](https://hub.docker.com/r/factoriotools/factorio/) [](https://microbadger.com/images/factoriotools/factorio "Get your own image badge on microbadger.com")
|
||||||
|
|
||||||
* `0.17.54`, `0.17`, `latest` [(0.17/Dockerfile)](https://github.com/factoriotools/factorio-docker/blob/master/0.17/Dockerfile)
|
* `0.17.56`, `0.17`, `latest` [(0.17/Dockerfile)](https://github.com/factoriotools/factorio-docker/blob/master/0.17/Dockerfile)
|
||||||
* `0.16.51`, `0.16`, `stable` [(0.16/Dockerfile)](https://github.com/factoriotools/factorio-docker/blob/master/0.16/Dockerfile)
|
* `0.16.51`, `0.16`, `stable` [(0.16/Dockerfile)](https://github.com/factoriotools/factorio-docker/blob/master/0.16/Dockerfile)
|
||||||
* `0.15.40`, `0.15` [(0.15/Dockerfile)](https://github.com/factoriotools/factorio-docker/blob/master/0.15/Dockerfile)
|
* `0.15.40`, `0.15` [(0.15/Dockerfile)](https://github.com/factoriotools/factorio-docker/blob/master/0.15/Dockerfile)
|
||||||
* `0.14.23`, `0.14` [(0.14/Dockerfile)](https://github.com/factoriotools/factorio-docker/blob/master/0.14/Dockerfile)
|
* `0.14.23`, `0.14` [(0.14/Dockerfile)](https://github.com/factoriotools/factorio-docker/blob/master/0.14/Dockerfile)
|
||||||
|
8
build.sh
8
build.sh
@ -23,7 +23,7 @@ else
|
|||||||
if [[ $TRAVIS_BRANCH == master ]] || [[ $TRAVIS_BRANCH == "$VERSION" ]]; then
|
if [[ $TRAVIS_BRANCH == master ]] || [[ $TRAVIS_BRANCH == "$VERSION" ]]; then
|
||||||
TAGS="$DOCKER_REPO:$VERSION -t $DOCKER_REPO:$VERSION_SHORT"
|
TAGS="$DOCKER_REPO:$VERSION -t $DOCKER_REPO:$VERSION_SHORT"
|
||||||
# we are on an incremental build of a tag
|
# we are on an incremental build of a tag
|
||||||
elif [[ $TRAVIS_BRANCH == "${VERSION%-*}" ]]; then
|
elif [[ $VERSION == "${TRAVIS_BRANCH%-*}" ]]; then
|
||||||
TAGS="$DOCKER_REPO:$TRAVIS_BRANCH -t $DOCKER_REPO:$VERSION -t $DOCKER_REPO:$VERSION_SHORT"
|
TAGS="$DOCKER_REPO:$TRAVIS_BRANCH -t $DOCKER_REPO:$VERSION -t $DOCKER_REPO:$VERSION_SHORT"
|
||||||
# we build a other branch than master
|
# we build a other branch than master
|
||||||
elif [[ -n $TRAVIS_BRANCH ]]; then
|
elif [[ -n $TRAVIS_BRANCH ]]; then
|
||||||
@ -46,7 +46,7 @@ docker images
|
|||||||
# latest changes where made in the folder corosponding to the version we build, we are on master and don#t build a PR.
|
# latest changes where made in the folder corosponding to the version we build, we are on master and don#t build a PR.
|
||||||
if [[ $(dirname "$(git diff --name-only HEAD^)") =~ $VERSION_SHORT ]] && [[ $TRAVIS_BRANCH == master ]] && [[ $TRAVIS_PULL_REQUEST_BRANCH == "" ]] ||
|
if [[ $(dirname "$(git diff --name-only HEAD^)") =~ $VERSION_SHORT ]] && [[ $TRAVIS_BRANCH == master ]] && [[ $TRAVIS_PULL_REQUEST_BRANCH == "" ]] ||
|
||||||
# we build a tag and we are not on master
|
# we build a tag and we are not on master
|
||||||
[[ $TRAVIS_BRANCH == "${VERSION%-*}" ]] && [[ $TRAVIS_PULL_REQUEST_BRANCH == "" ]] ||
|
[[ $VERSION == "${TRAVIS_BRANCH%-*}" ]] && [[ $TRAVIS_PULL_REQUEST_BRANCH == "" ]] ||
|
||||||
# we are not in CI
|
# we are not in CI
|
||||||
[[ $CI == "" ]]; then
|
[[ $CI == "" ]]; then
|
||||||
|
|
||||||
@ -55,12 +55,12 @@ if [[ $(dirname "$(git diff --name-only HEAD^)") =~ $VERSION_SHORT ]] && [[ $TRA
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# push a tag on a branch other than master
|
# push a tag on a branch other than master
|
||||||
if [[ -n $TRAVIS_BRANCH ]] && [[ $TRAVIS_BRANCH != "${VERSION%-*}" ]] && [[ $TRAVIS_BRANCH != "master" ]]; then
|
if [[ -n $TRAVIS_BRANCH ]] && [[ $VERSION != "${TRAVIS_BRANCH%-*}" ]] && [[ $TRAVIS_BRANCH != "master" ]]; then
|
||||||
docker push "$DOCKER_REPO:$TRAVIS_BRANCH"
|
docker push "$DOCKER_REPO:$TRAVIS_BRANCH"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# push an incremental tag
|
# push an incremental tag
|
||||||
if [[ $TRAVIS_BRANCH != "${VERSION%-*}" ]]; then
|
if [[ $VERSION == "${TRAVIS_BRANCH%-*}" ]]; then
|
||||||
docker push "$DOCKER_REPO:$TRAVIS_BRANCH"
|
docker push "$DOCKER_REPO:$TRAVIS_BRANCH"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user