Merge pull request #86 from tsuckow/fix-permissions

Fix permissions in #85
2025-07-01 14:38:05 +02:00 · 2017-11-29 20:28:34 -08:00 · 2017-11-29 23:05:43 -05:00 · 2017-11-29 14:44:06 -08:00 · 2017-11-29 14:39:21 -08:00 · 2017-11-29 14:38:50 -08:00
3 changed files with 8 additions and 6 deletions
--- a/0.15/Dockerfile
+++ b/0.15/Dockerfile
@ -3,8 +3,9 @@ FROM frolvlad/alpine-glibc:alpine-3.6
 MAINTAINER https://github.com/dtandersen/docker_factorio_server

 ENV PORT=34197 \
-    VERSION=0.15.24 \
-    SHA1=ad7695bb8011e674109fa51de3223f60793da26d
+    RCON_PORT=27015 \
+    VERSION=0.15.40 \
+    SHA1=f79a975f6b8c0ee87e2fa60f7d1f7133f332c3ec

 RUN mkdir /opt && \
    apk add --update --no-cache tini pwgen && \
@ -20,7 +21,7 @@ RUN mkdir /opt && \

 VOLUME /factorio

-EXPOSE $PORT/udp 27015/tcp
+EXPOSE $PORT/udp $RCON_PORT/tcp

 COPY ./docker-entrypoint.sh /

--- a/0.15/docker-entrypoint.sh
+++ b/0.15/docker-entrypoint.sh
@ -38,6 +38,6 @@ exec /opt/factorio/bin/x64/factorio \
  --server-settings $CONFIG/server-settings.json \
  --server-whitelist $CONFIG/server-whitelist.json \
  --server-banlist $CONFIG/server-banlist.json \
-  --rcon-port 27015 \
+  --rcon-port $RCON_PORT \
  --rcon-password "$(cat $CONFIG/rconpw)" \
  --server-id /factorio/config/server-id.json
--- 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.24`, `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.40`, `0.15`, `latest` [(0.15/Dockerfile)](https://github.com/dtandersen/docker_factorio_server/blob/master/0.15/Dockerfile)
+* `0.15.37`, `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*
Author	SHA1	Message	Date
David Andersen	7a5f3471d6	Merge pull request #86 from tsuckow/fix-permissions Fix permissions in #85	2017-11-29 20:28:34 -08:00
Thomas Suckow	eac273e2d6	Fix permissions in #85	2017-11-29 23:05:43 -05:00
David Andersen	768eaac7b2	Update README.md 0.15.37 is still stable	2017-11-29 14:44:06 -08:00
David Andersen	67a0420f06	Merge pull request #80 from schmic/master Allow to define RCON port as well	2017-11-29 14:39:21 -08:00
David Andersen	b2248d1e8c	Merge branch 'master' into master	2017-11-29 14:38:50 -08:00
David Andersen	60a124f22c	Merge branch 'master' into master	2017-11-29 14:38:08 -08:00
David Andersen	76ee77b674	Merge pull request #84 from dtandersen/update-0.15.40 Updated to version 0.15.40	2017-11-29 14:33:46 -08:00
Florian Kinder	a6f0b66f9b	update to 0.15.40	2017-11-29 21:48:31 +00:00
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
Michael Scherer	ca3a66ca2f	Allow to define RCON port as well	2017-11-12 13:49:58 +01: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