Compare commits

...

7 Commits

Author SHA1 Message Date
18ccac666d update to 0.17.40 2019-05-16 15:59:12 +00:00
830d042e4b Add me (SuperSandro2000) to the Contributors list 2019-05-15 20:05:36 +02:00
a0868ba653 Added build status & latest dockerhub version 2019-05-15 13:26:00 +02:00
7002778ab5 Updated urls 2019-05-15 13:07:30 +02:00
44371283b6 update to 0.17.39 2019-05-14 15:49:11 +00:00
d421adab67 update to 0.17.38 2019-05-10 14:39:11 +00:00
b0cedbbe1b Update docker-entrypoint.sh (#253) 2019-05-10 01:27:25 +02:00
6 changed files with 19 additions and 16 deletions

View File

@ -1,6 +1,6 @@
FROM frolvlad/alpine-glibc:alpine-3.9 FROM frolvlad/alpine-glibc:alpine-3.9
LABEL maintainer="https://github.com/dtandersen/docker_factorio_server" LABEL maintainer="https://github.com/factoriotools/factorio-docker"
ENV VERSION=0.14.23 \ ENV VERSION=0.14.23 \
SHA1=6ef84341c6fc1cf45cfdd6acc8468aaa117b9e8a SHA1=6ef84341c6fc1cf45cfdd6acc8468aaa117b9e8a

View File

@ -1,6 +1,6 @@
FROM frolvlad/alpine-glibc:alpine-3.9 FROM frolvlad/alpine-glibc:alpine-3.9
LABEL maintainer="https://github.com/dtandersen/docker_factorio_server" LABEL maintainer="https://github.com/factoriotools/factorio-docker"
ENV PORT=34197 \ ENV PORT=34197 \
RCON_PORT=27015 \ RCON_PORT=27015 \

View File

@ -1,6 +1,6 @@
FROM frolvlad/alpine-glibc:alpine-3.9 FROM frolvlad/alpine-glibc:alpine-3.9
LABEL maintainer="https://github.com/dtandersen/docker_factorio_server" LABEL maintainer="https://github.com/factoriotools/factorio-docker"
ARG USER=factorio ARG USER=factorio
ARG GROUP=factorio ARG GROUP=factorio

View File

@ -1,6 +1,6 @@
FROM frolvlad/alpine-glibc:alpine-3.9 FROM frolvlad/alpine-glibc:alpine-3.9
LABEL maintainer="https://github.com/dtandersen/docker_factorio_server" LABEL maintainer="https://github.com/factoriotools/factorio-docker"
ARG USER=factorio ARG USER=factorio
ARG GROUP=factorio ARG GROUP=factorio
@ -9,8 +9,8 @@ ARG PGID=845
ENV PORT=34197 \ ENV PORT=34197 \
RCON_PORT=27015 \ RCON_PORT=27015 \
VERSION=0.17.37 \ VERSION=0.17.40 \
SHA1=4af991cb42145854a4803203f31d42f81fea7034 \ SHA1=56bdcb95dbc6d426a51ea2fdd2ff63789a641db7 \
SAVES=/factorio/saves \ SAVES=/factorio/saves \
CONFIG=/factorio/config \ CONFIG=/factorio/config \
MODS=/factorio/mods \ MODS=/factorio/mods \

View File

@ -29,7 +29,8 @@ if [ ! -f "$CONFIG/map-settings.json" ]; then
cp /opt/factorio/data/map-settings.example.json "$CONFIG/map-settings.json" cp /opt/factorio/data/map-settings.example.json "$CONFIG/map-settings.json"
fi fi
if find -L "$SAVES" -iname \*.tmp.zip -mindepth 1 -print | grep -q .; then NRTMPSAVES=$( find -L "$SAVES" -iname \*.tmp.zip -mindepth 1 | wc -l )
if [ $NRTMPSAVES -gt 0 ]; then
# Delete incomplete saves (such as after a forced exit) # Delete incomplete saves (such as after a forced exit)
rm -f "$SAVES/*.tmp.zip" rm -f "$SAVES/*.tmp.zip"
fi fi
@ -46,7 +47,8 @@ else
SU_EXEC="" SU_EXEC=""
fi fi
if ! find -L "$SAVES" -iname \*.zip -mindepth 1 -print | grep -q .; then NRSAVES=$( find -L "$SAVES" -iname \*.zip -mindepth 1 | wc -l )
if [ $NRSAVES -eq 0 ]; then
# Generate a new map if no save ZIPs exist # Generate a new map if no save ZIPs exist
$SU_EXEC /opt/factorio/bin/x64/factorio \ $SU_EXEC /opt/factorio/bin/x64/factorio \
--create "$SAVES/_autosave1.zip" \ --create "$SAVES/_autosave1.zip" \

View File

@ -1,9 +1,9 @@
# Factorio [![](https://images.microbadger.com/badges/image/factoriotools/factorio.svg)](https://microbadger.com/images/factoriotools/factorio "Get your own image badge on microbadger.com") [![Docker Pulls](https://img.shields.io/docker/pulls/factoriotools/factorio.svg)](https://hub.docker.com/r/factoriotools/factorio/) [![Docker Stars](https://img.shields.io/docker/stars/factoriotools/factorio.svg)](https://hub.docker.com/r/factoriotools/factorio/) # Factorio [![Build Status](https://travis-ci.org/factoriotools/factorio-docker.svg?branch=master)](https://travis-ci.org/factoriotools/factorio-docker) [![](https://images.microbadger.com/badges/version/factoriotools/factorio.svg)](https://microbadger.com/images/factoriotools/factorio) [![](https://images.microbadger.com/badges/image/factoriotools/factorio.svg)](https://microbadger.com/images/factoriotools/factorio "Get your own image badge on microbadger.com") [![Docker Pulls](https://img.shields.io/docker/pulls/factoriotools/factorio.svg)](https://hub.docker.com/r/factoriotools/factorio/) [![Docker Stars](https://img.shields.io/docker/stars/factoriotools/factorio.svg)](https://hub.docker.com/r/factoriotools/factorio/)
* `0.17.37`, `0.17`, `latest` [(0.17/Dockerfile)](https://github.com/dtandersen/docker_factorio_server/blob/master/0.17/Dockerfile) * `0.17.40`, `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/dtandersen/docker_factorio_server/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/dtandersen/docker_factorio_server/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/dtandersen/docker_factorio_server/blob/master/0.14/Dockerfile) * `0.14.23`, `0.14` [(0.14/Dockerfile)](https://github.com/factoriotools/factorio-docker/blob/master/0.14/Dockerfile)
*Tag descriptions* *Tag descriptions*
@ -239,10 +239,10 @@ The files in this volume should be owned by the factorio user, uid 845.
[Docker Compose](https://docs.docker.com/compose/install/) is an easy way to run Docker containers. [Docker Compose](https://docs.docker.com/compose/install/) is an easy way to run Docker containers.
First get a [docker-compose.yml](https://github.com/dtandersen/docker_factorio_server/blob/master/0.17/docker-compose.yml) file. To get it from this repository: First get a [docker-compose.yml](https://github.com/factoriotools/factorio-docker/blob/master/0.17/docker-compose.yml) file. To get it from this repository:
``` ```
git clone https://github.com/dtandersen/docker_factorio_server.git git clone https://github.com/factoriotools/factorio-docker.git
cd docker_factorio_server/0.17 cd docker_factorio_server/0.17
``` ```
@ -338,8 +338,9 @@ Use the `PORT` environment variable to start the server on the a different port,
# Contributors # Contributors
* [dtandersen](https://github.com/dtandersen/docker_factorio_server) - Maintainer * [dtandersen](https://github.com/dtandersen) - Maintainer
* [Fank](https://github.com/Fankserver/docker-factorio-watchdog) - Keeper of the Factorio watchdog that keeps the version up-to-date. * [Fank](https://github.com/Fankserver/docker-factorio-watchdog) - Keeper of the Factorio watchdog that keeps the version up-to-date.
* [SuperSandro2000](https://github.com/supersandro2000) - CI Guy
* [DBendit](https://github.com/DBendit/docker_factorio_server) - Admin list, ban list, version updates * [DBendit](https://github.com/DBendit/docker_factorio_server) - Admin list, ban list, version updates
* [Zopanix](https://github.com/zopanix/docker_factorio_server) - Originator * [Zopanix](https://github.com/zopanix/docker_factorio_server) - Originator
* [Rfvgyhn](https://github.com/Rfvgyhn/docker-factorio) - Randomly generate RCON password * [Rfvgyhn](https://github.com/Rfvgyhn/docker-factorio) - Randomly generate RCON password