Merge pull request #83 from dtandersen/update-0.15.39

Updated to version 0.15.39
Merge branch 'master' into update-0.15.39
2025-07-01 14:38:05 +02:00 · 2017-11-27 14:09:54 -08:00 · 2017-11-27 14:09:28 -08:00 · 2017-11-27 14:07:22 -08:00 · 2017-11-27 19:53:35 +00:00 · 2017-11-24 12:23:33 +00:00
8 changed files with 24 additions and 20 deletions
--- a/0.15/Dockerfile
+++ b/0.15/Dockerfile
@ -1,10 +1,10 @@
-FROM frolvlad/alpine-glibc:alpine-3.5
+FROM frolvlad/alpine-glibc:alpine-3.6

 MAINTAINER https://github.com/dtandersen/docker_factorio_server

 ENV PORT=34197 \
-    VERSION=0.15.6 \
-    SHA1=499e329437a663b6a21579a9665c5f8f92ebb9c5
+    VERSION=0.15.39 \
+    SHA1=ba2de8e847b9b2334a3e187aa107b65f35bbf2d1

 RUN mkdir /opt && \
    apk add --update --no-cache tini pwgen && \
--- a/0.15/build.sh
+++ b/0.15/build.sh
@ -1 +0,0 @@
-sudo docker build --no-cache -t factorio .
--- a/0.15/clean.sh
+++ b/0.15/clean.sh
@ -1 +0,0 @@
-sudo rm -rf /tmp/factorio
--- a/0.15/docker-compose.yml
+++ b/0.15/docker-compose.yml
@ -0,0 +1,8 @@
+version: '2'
+services:
+  factorio:
+    build: .
+    ports:
+     - "34197:34197"
+    volumes:
+     - /tmp/factorio:/factorio
--- a/0.15/docker-entrypoint.sh
+++ b/0.15/docker-entrypoint.sh
@ -21,10 +21,15 @@ if [ ! -f $CONFIG/map-gen-settings.json ]; then
  cp /opt/factorio/data/map-gen-settings.example.json $CONFIG/map-gen-settings.json
 fi

+if [ ! -f $CONFIG/map-settings.json ]; then
+  cp /opt/factorio/data/map-settings.example.json $CONFIG/map-settings.json
+fi
+
 if ! find -L $SAVES -iname \*.zip -mindepth 1 -print | grep -q .; then
  /opt/factorio/bin/x64/factorio \
    --create $SAVES/_autosave1.zip  \
-    --map-gen-settings $CONFIG/map-gen-settings.json
+    --map-gen-settings $CONFIG/map-gen-settings.json \
+    --map-settings $CONFIG/map-settings.json
 fi

 exec /opt/factorio/bin/x64/factorio \
@ -32,5 +37,7 @@ exec /opt/factorio/bin/x64/factorio \
  --start-server-load-latest \
  --server-settings $CONFIG/server-settings.json \
  --server-whitelist $CONFIG/server-whitelist.json \
+  --server-banlist $CONFIG/server-banlist.json \
  --rcon-port 27015 \
-  --rcon-password "$(cat $CONFIG/rconpw)"
+  --rcon-password "$(cat $CONFIG/rconpw)" \
+  --server-id /factorio/config/server-id.json
--- a/0.15/run.sh
+++ b/0.15/run.sh
@ -1,5 +0,0 @@
-sudo docker run --rm -it \
-	-v /tmp/factorio:/factorio \
-	--name factorio \
-	factorio "$@"
-find /tmp/factorio -type f
--- a/0.15/start.sh
+++ b/0.15/start.sh
@ -1,5 +0,0 @@
-sudo docker run -d -p 34197:34197/udp -p 27015:27015/tcp \
-  -v factorio:/factorio \
-  --name factorio \
-  --restart=always  \
-  factorio
--- a/README.md
+++ b/README.md
@ -1,7 +1,8 @@
 # Factorio [![](https://images.microbadger.com/badges/image/dtandersen/factorio.svg)](https://microbadger.com/images/dtandersen/factorio "Get your own image badge on microbadger.com") [![Docker Pulls](https://img.shields.io/docker/pulls/dtandersen/factorio.svg)](https://hub.docker.com/r/dtandersen/factorio/) [![Docker Stars](https://img.shields.io/docker/stars/dtandersen/factorio.svg)](https://hub.docker.com/r/dtandersen/factorio/)

-* `0.15.6`, `0.15`, `latest` [(0.15/Dockerfile)](https://github.com/dtandersen/docker_factorio_server/blob/master/0.15/Dockerfile)
-* `0.14.23`, `0.14`, `stable` [(0.14/Dockerfile)](https://github.com/dtandersen/docker_factorio_server/blob/master/0.14/Dockerfile)
+* `0.15.39`, `0.15`, `latest` [(0.15/Dockerfile)](https://github.com/dtandersen/docker_factorio_server/blob/master/0.15/Dockerfile)
+* `0.15.39`, `stable` [(0.15/Dockerfile)](https://github.com/dtandersen/docker_factorio_server/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.13.20`, `0.13`  [(0.13/Dockerfile)](https://github.com/dtandersen/docker_factorio_server/blob/master/0.13/Dockerfile)

 *Tag descriptions*
@ -94,7 +95,7 @@ Now run the server as before. In about a minute the new version of Factorio shou

 ## Saves

-A new map named `_autosave1.zip` is generated the first time the server is started. The `map-gen-settings.json` file in `/tmp/factorio/config` is used for the map settings. On subsequent runs the newest save is used.
+A new map named `_autosave1.zip` is generated the first time the server is started. The `map-gen-settings.json` and `map-settings.json` files in `/tmp/factorio/config` are used for the map settings. On subsequent runs the newest save is used.

 To load an old save stop the server and run the command `touch oldsave.zip`. This resets the date. Then restart the server. Another option is to delete all saves except one.
Author	SHA1	Message	Date
David Andersen	596eec12b6	Merge pull request #83 from dtandersen/update-0.15.39 Updated to version 0.15.39	2017-11-27 14:09:54 -08:00
David Andersen	e30e313a55	Merge branch 'master' into update-0.15.39	2017-11-27 14:09:28 -08:00
David Andersen	9528901b95	Merge pull request #81 from dtandersen/update-0.15.38 Updated to version 0.15.38	2017-11-27 14:07:22 -08:00
Florian Kinder	16c0f35c97	update to 0.15.39	2017-11-27 19:53:35 +00:00
Florian Kinder	623cd6ac87	update to 0.15.38	2017-11-24 12:23:33 +00:00
David Andersen	bc74c61fc0	Merge pull request #77 from dtandersen/update-0.15.37 Updated to version 0.15.37	2017-10-17 08:31:30 -07:00
Florian Kinder	893124cf43	update to 0.15.37	2017-10-17 14:26:02 +00:00
David Andersen	92130e3b34	Merge pull request #76 from dtandersen/update-0.15.36 Updated to version 0.15.36	2017-10-10 09:43:46 -07:00
Florian Kinder	1194fde627	update to 0.15.36	2017-10-10 15:26:00 +00:00
Florian Kinder	6ae4c0d569	Merge pull request #74 from dtandersen/update-0.15.35 Updated to version 0.15.35	2017-09-30 15:54:39 +02:00
Florian Kinder	11d8626ccd	update to 0.15.35	2017-09-28 13:35:50 +00:00
David Andersen	d1d5e405cb	Update README.md	2017-08-23 12:11:54 -07:00
David Andersen	1c1e374346	Merge pull request #72 from dtandersen/update-0.15.34 Updated to version 0.15.34	2017-08-23 12:10:42 -07:00
Florian Kinder	046a632860	update to 0.15.34	2017-08-23 12:57:11 +00:00
David Andersen	d80ae622fd	Update README.md	2017-08-09 10:52:10 -07:00
David Andersen	07786290c4	Merge pull request #69 from dtandersen/update-0.15.33 Updated to version 0.15.33	2017-08-09 10:07:41 -07:00
Florian Kinder	1e5f88ffd9	update to 0.15.33	2017-08-09 16:12:14 +00:00
David Andersen	672101f0f7	0.15.31 is still stable	2017-08-02 09:34:10 -07:00
David Andersen	7b9d0f514e	Merge pull request #67 from dtandersen/update-0.15.32 Updated to version 0.15.32	2017-08-02 09:30:12 -07:00
Florian Kinder	7e40c62ff6	update to 0.15.32	2017-08-02 11:57:11 +00:00
David Andersen	37fbaa38cf	0.15.31 is stable	2017-07-26 16:37:13 -07:00
David Andersen	b52a39fe03	Merge pull request #65 from dtandersen/update-0.15.31 Updated to version 0.15.31	2017-07-25 12:11:07 -07:00
Florian Kinder	4528be2297	update to 0.15.31	2017-07-25 17:07:12 +00:00
David Andersen	36bb311baa	Merge pull request #64 from dtandersen/update-0.15.30 Updated to version 0.15.30	2017-07-14 18:21:30 +01:00
Florian Kinder	78289a5930	update to 0.15.30	2017-07-14 16:27:19 +00:00
David Andersen	250d5e464d	Merge pull request #63 from dtandersen/update-0.15.29 Updated to version 0.15.29	2017-07-13 21:11:42 +01:00
Florian Kinder	70e61be5b6	update to 0.15.29	2017-07-13 19:42:12 +00:00
David Andersen	e935200821	Merge pull request #62 from dtandersen/update-0.15.28 Updated to version 0.15.28	2017-07-06 10:32:07 -07:00
Florian Kinder	add31ebe53	update to 0.15.28	2017-07-06 16:42:10 +00:00
David Andersen	8e20e6696b	Merge pull request #61 from dtandersen/update-0.15.27 Updated to version 0.15.27	2017-07-03 11:01:28 -07:00
Florian Kinder	126669ca7a	update to 0.15.27	2017-07-03 17:17:11 +00:00
Florian Kinder	67aaa41cd8	Merge pull request #59 from dtandersen/update-0.15.26 Updated to version 0.15.26	2017-07-01 08:32:40 +02:00
Florian Kinder	a61f05709e	update to 0.15.26	2017-06-30 19:42:11 +00:00
David Andersen	0b5c4e144a	Merge pull request #58 from dtandersen/update-0.15.25 Updated to version 0.15.25	2017-06-29 10:42:35 -07:00
Florian Kinder	95c45b7a39	update to 0.15.25	2017-06-29 17:22:13 +00:00
David Andersen	5dbb82debe	Merge pull request #57 from dtandersen/update-0.15.24 Updated to version 0.15.24	2017-06-29 09:59:41 -07:00
Florian Kinder	d85de90142	update to 0.15.24	2017-06-29 10:27:12 +00:00
David Andersen	216ab0a7d5	Merge pull request #54 from dtandersen/update-0.15.23 Updated to version 0.15.23	2017-06-22 10:45:04 -07:00
Florian Kinder	e9c698cbc8	update to 0.15.23	2017-06-22 16:47:12 +00:00
Florian Kinder	8d0eef4e2c	Merge pull request #52 from dtandersen/update-0.15.22 Updated to version 0.15.22	2017-06-22 14:10:48 +02:00
Florian Kinder	110a598ca8	update to 0.15.22	2017-06-21 16:37:12 +00:00
David Andersen	2f0ce132f2	Merge pull request #50 from dtandersen/update-0.15.21 Updated to version 0.15.21	2017-06-15 09:14:28 -07:00
Florian Kinder	96eff95f47	update to 0.15.21	2017-06-15 10:27:11 +00:00
David Andersen	6c5282b855	Merge pull request #48 from dtandersen/update-0.15.20 Updated to version 0.15.20	2017-06-14 10:16:50 -07:00
Florian Kinder	d195fdcdfc	update to 0.15.20	2017-06-14 16:07:12 +00:00
David Andersen	d9a5fac17c	Merge pull request #43 from Entroper/map-settings Add map-settings.json config file	2017-06-08 08:36:51 -07:00
David Andersen	4ec6f41635	Merge pull request #44 from dtandersen/update-0.15.19 Updated to version 0.15.19	2017-06-08 08:35:16 -07:00
Florian Kinder	eb0a7410eb	update to 0.15.19	2017-06-08 11:52:11 +00:00
Entroper	01aeb3b1aa	Add map-settings.json to README	2017-06-06 14:22:31 -04:00
Entroper	91f28e34a2	add map-settings.json config file	2017-06-06 13:20:10 -04:00
David Andersen	7f9f640eff	Merge pull request #41 from dtandersen/update-0.15.18 Updated to version 0.15.18	2017-06-02 01:58:24 -07:00
Florian Kinder	2d99b36f7e	update to 0.15.18	2017-06-02 08:47:04 +00:00
David Andersen	5e71044728	updated to alpine 3.6	2017-06-01 18:31:53 +00:00
David Andersen	52dd896f3c	0.15.17	2017-06-01 11:25:14 -07:00
David Andersen	3a5ce81d2e	Merge pull request #38 from Mettwurscht/patch-2 Update to 0.15.17	2017-06-01 11:24:24 -07:00
Mettwurscht	ad707ee2ad	Update to 0.15.17	2017-06-01 15:39:01 +02:00
David Andersen	61fd28bb36	0.15.16	2017-05-27 12:12:43 -07:00
David Andersen	892a684f98	Merge pull request #36 from Mettwurscht/patch-1 Update to 0.15.16	2017-05-27 12:11:06 -07:00
Mettwurscht	a0cedba383	Update to 0.15.16	2017-05-27 20:07:37 +02:00
David Andersen	893c1b6214	Merge pull request #35 from Dianoga/0.15.15 Update to 0.15.15	2017-05-26 13:20:22 -07:00
Brian Steere	0d79b49393	Update README.md	2017-05-26 15:09:27 -05:00
Brian Steere	9d3f88ed6b	Update to 0.15.15	2017-05-26 15:08:42 -05:00
David Andersen	a0338cc7b3	0.15.14	2017-05-26 10:50:27 -07:00
David Andersen	ed1fe2ba82	Merge pull request #34 from psykzz/patch-2 Update to 0.15.14	2017-05-26 10:47:40 -07:00
Matt Smith	46769a042d	Update to 0.15.14	2017-05-26 17:39:24 +01:00
Ben Kuhl	0a5893578f	Merge pull request #31 from dtandersen/update-v0.15.13-experimental Update to v0.15.13-experimental	2017-05-23 14:47:17 -04:00
bkuhl	59b35f3ac0	Updated to v0.15.13-experimental	2017-05-23 18:45:33 +00:00
David Andersen	8138589baf	Merge pull request #29 from dtandersen/update-v0.15.12-experimental Update to v0.15.12-experimental	2017-05-18 08:56:56 -07:00
David Andersen	2b1115c19a	Merge pull request #26 from dtandersen/server-id server-id / banlist / docker-compose	2017-05-18 08:55:49 -07:00
bkuhl	b6276d7b51	Updated to v0.15.12-experimental	2017-05-18 15:45:34 +00:00
David Andersen	82a15c8f34	removed shell scripts debugging server	2017-05-17 17:15:05 +00:00
David Andersen	0fbcfbf857	added docker-compose.yml	2017-05-17 17:14:01 +00:00
David Andersen	dc89065e68	save the server id	2017-05-17 17:12:33 +00:00
Ben Kuhl	bd5a44dce5	Merge pull request #24 from bkuhl/update-v0.15.11-experimental Update to v0.15.11-experimental	2017-05-16 12:15:18 -04:00
Ben Kuhl	26584556a3	Merge pull request #23 from tsugliani/patch-5 Update to 0.15.11	2017-05-16 12:14:57 -04:00
Ben Kuhl	3a70062289	Merge branch 'master' into update-v0.15.11-experimental	2017-05-16 11:12:16 -04:00
bkuhl	c3fe70f783	Updated to v0.15.11-experimental	2017-05-16 15:10:55 +00:00
Timo Sugliani	7a5732bbcd	Update to 0.15.11	2017-05-16 15:56:00 +02:00
David Andersen	a496ba060b	Merge pull request #22 from bkuhl/update-v0.15.10-experimental Update to v0.15.10-experimental	2017-05-10 11:28:52 -07:00
Ben Kuhl	7e78a4236f	Merge branch 'master' into update-v0.15.10-experimental	2017-05-10 13:52:48 -04:00
Ben Kuhl	0c5ff73adb	Updated to v0.15.10-experimental	2017-05-10 13:52:13 -04:00
David Andersen	9ad1889aeb	0.15.9	2017-05-06 23:59:30 -07:00
David Andersen	2a23a3fe91	0.15.9	2017-05-05 14:54:07 -07:00
David Andersen	cfcbb035a7	Merge pull request #20 from warmwaffles/master Bump to version 0.15.9	2017-05-05 14:53:06 -07:00
Matthew Johnston	10f8b0acb6	Bump to version 0.15.9	2017-05-05 16:13:09 -05:00
David Andersen	c7309c1e5c	0.15.8	2017-05-05 11:05:51 -07:00
David Andersen	c845acc09f	0.15 is still 0.15.6	2017-05-05 09:26:22 -07:00
David Andersen	8bfe8b0261	0.15.7	2017-05-05 06:58:19 -07:00
David Andersen	2c7cfc6c65	Merge pull request #18 from tsugliani/patch-3 Update to 0.15.7	2017-05-05 06:57:37 -07:00
Timo Sugliani	1250578039	Update to 0.15.7	2017-05-05 15:54:30 +02:00