Compare commits

...

257 Commits

Author SHA1 Message Date
5109bc1b40 update to 0.16.48 2018-06-07 17:33:00 +00:00
5e36f8bad8 update to 0.16.47 2018-05-31 07:47:59 +00:00
d1258008c1 Added catch all to allow custom options for factorio (#169) 2018-05-30 20:37:46 +02:00
275faa1fcc update to 0.16.46 2018-05-29 14:03:01 +00:00
87cf6c051a Fixed wrong checksum 2018-05-23 09:41:09 +02:00
3d8cdfcc1d update to 0.16.45 2018-05-22 20:07:47 +00:00
d3ef74b10d update to 0.16.43 (#162) 2018-05-16 18:03:52 +02:00
b41aad4dc6 update to 0.16.42 (#161) 2018-05-11 18:48:47 +02:00
24ac45dbce Merge pull request #157 from afex/master
Expose script-output to mounted volume
2018-05-04 12:19:56 -07:00
8286ab58ac update to 0.16.41 (#159) 2018-05-03 21:22:40 +02:00
c2d8509aa8 update to 0.16.40 (#158) 2018-05-03 00:53:14 +02:00
b94db83033 setup script-output directory 2018-05-02 12:45:11 -07:00
cc23bb396e expose script-output to volume 2018-05-02 12:44:34 -07:00
1b2fdb298f update to 0.16.39 (#156) 2018-04-30 20:00:30 +02:00
ab277975ae Merge pull request #153 from dtandersen/update-0.16.38
Updated to version 0.16.38
2018-04-26 11:45:23 -07:00
80d8866242 update to 0.16.38 2018-04-26 15:24:39 +00:00
4ec18b2d15 Merge pull request #152 from dtandersen/update-0.16.37
Updated to version 0.16.37
2018-04-23 10:57:13 -07:00
93a3011cd3 update to 0.16.37 2018-04-23 17:44:49 +00:00
15cacdc3da 0.16 is stable 2018-03-29 09:44:34 -07:00
927bcb89a0 Merge pull request #150 from dtandersen/update-0.16.36
Updated to version 0.16.36
2018-03-28 09:40:26 -07:00
4ceff25fc2 update to 0.16.36 2018-03-28 12:54:40 +00:00
5d072db9cc update to 0.16.35 (#149) 2018-03-24 14:37:57 +01:00
216b225681 update to 0.16.34 (#148) 2018-03-23 13:42:54 +01:00
18f3943eaf Merge pull request #146 from dtandersen/update-0.16.33
Updated to version 0.16.33
2018-03-22 10:24:01 -07:00
2725534b2b update to 0.16.33 2018-03-22 17:04:41 +00:00
df35d57455 Merge pull request #145 from dtandersen/update-0.16.32
Updated to version 0.16.32
2018-03-20 08:20:37 -07:00
9adc8ce4bc update to 0.16.32 2018-03-20 12:54:39 +00:00
6272bb0018 update to 0.16.31 (#144) 2018-03-19 20:37:39 +01:00
a989b500b0 moved entrypoints to files directory 2018-03-19 17:28:40 +00:00
66bef56cd2 moved entry points to /; dont put hard link in place of entrypoint folder 2018-03-19 16:58:53 +00:00
10f891cabf don't need to create these 2018-03-14 13:16:23 -07:00
9a7f01f8bf Merge pull request #142 from yukienterprises/temp-save-removal
Remove temp (invalid) saves on container start
2018-03-14 07:56:50 -07:00
877219f9c9 Remove temp (invalid) saves on container start 2018-03-14 23:13:43 +11:00
843bcbff21 update to 0.16.30 (#140) 2018-03-12 23:35:36 +01:00
a7786f03ed updated maintainers 2018-03-12 10:33:05 -07:00
754663df49 Merge pull request #139 from dtandersen/scenario2
Scenario tweaks
2018-03-12 10:00:12 -07:00
9ac04bcff8 moved env to Dockerfile so they can be shared 2018-03-12 16:54:17 +00:00
66d4652302 moved volume creation back as per PR#101; create symlink once 2018-03-12 09:38:40 -07:00
5ddb9ab472 Merge pull request #115 from bplein/master
Add Scenarios Folder, Alternate Entrypoints Folder
2018-03-12 09:29:15 -07:00
9e72f0509a Merge pull request #138 from dtandersen/update-0.16.29
Updated to version 0.16.29
2018-03-12 09:22:49 -07:00
914b12adf4 update to 0.16.29 2018-03-12 16:15:23 +00:00
dc3c040d7c another symlink bug 2018-03-10 17:17:16 -06:00
6a9a596cd8 fix syntax on symlink 2018-03-10 17:11:47 -06:00
eb22dac840 force symlinks 2018-03-10 17:08:09 -06:00
b48bb4c134 Merge branch 'master' of https://github.com/dtandersen/docker_factorio_server 2018-03-09 14:45:36 -06:00
cf5af1aae1 Merge pull request #137 from dtandersen/update-0.16.28
Updated to version 0.16.28
2018-03-05 12:25:24 -08:00
d7f0fe16d7 update to 0.16.28 2018-03-05 18:09:43 +00:00
27c1426109 Merged in dtandersen/factorio changes 2018-03-02 15:40:08 -06:00
a86ac6cafe Merge remote-tracking branch 'upstream/master'
Updating to catch up with upstream
2018-03-02 15:36:31 -06:00
70e08f10f3 update to 0.16.27 (#136) 2018-02-28 19:40:35 +01:00
c28cea29a4 update to 0.16.26 (#135) 2018-02-26 17:30:23 +01:00
e21fc20eb2 Merge pull request #134 from dtandersen/update-0.16.25
Updated to version 0.16.25
2018-02-20 08:14:38 -08:00
c75b7fa830 update to 0.16.25 2018-02-19 20:59:40 +00:00
387383d3e8 Merge pull request #129 from psykzz/patch-3
Fix adduser
2018-02-15 11:45:02 -08:00
c6c94ee180 update to 0.16.24 (#131) 2018-02-15 18:19:26 +01:00
b2908081b4 update to 0.16.23 (#130) 2018-02-12 12:41:55 +01:00
e53c2adc54 Fix adduser 2018-02-03 21:15:07 +00:00
d6da776148 Merge pull request #128 from dtandersen/update-0.16.22
Updated to version 0.16.22
2018-02-02 06:57:23 -08:00
30e5f6dd2d update to 0.16.22 2018-02-02 09:08:50 +00:00
b69fe57291 update to 0.16.21 (#126) 2018-02-01 16:50:20 +01:00
b99c1044ca Merge pull request #123 from dtandersen/update-0.16.20
Updated to version 0.16.20
2018-01-26 14:47:14 -08:00
b37af9bf93 update to 0.16.20 2018-01-26 21:43:48 +00:00
185ee256ff Merge pull request #122 from dtandersen/update-0.16.19
Updated to version 0.16.19
2018-01-25 14:29:24 -08:00
6020015574 update to 0.16.19 2018-01-25 19:53:49 +00:00
a520b87fc8 update to 0.16.18 (#121) 2018-01-23 13:05:56 +01:00
e3abfbbe9b Merge pull request #118 from dtandersen/update-0.16.17
Updated to version 0.16.17
2018-01-22 12:54:07 -08:00
6a135a06bc update to 0.16.17 2018-01-22 20:23:49 +00:00
14fb9ecf35 Typo in Dockerfile 2018-01-16 18:24:35 -06:00
ffef5899e9 Updated Dockerfile to copy in example entrypoints 2018-01-16 18:03:13 -06:00
4449e13675 Added creation and symlinking of scenarios directory, creation and symlinking of an entrypoints directory for custom entrypoints, and two examples of using entrypoints with scenarios 2018-01-16 17:59:28 -06:00
189395d5c8 Merge pull request #112 from dtandersen/update-0.16.16
Updated to version 0.16.16
2018-01-10 09:15:09 -08:00
4c1ea766f4 update to 0.16.16 2018-01-10 16:48:33 +00:00
9ce9a63cfc alpine 3.7 2018-01-09 14:59:21 -08:00
8d16422fcb Merge pull request #110 from dtandersen/update-0.16.15
Updated to version 0.16.15
2018-01-05 13:48:40 -08:00
628c7a34aa update to 0.16.15 2018-01-05 20:28:30 +00:00
eafc933ca5 Merge pull request #109 from dtandersen/update-0.16.14
Updated to version 0.16.14
2018-01-04 14:48:22 -08:00
0175ddbca9 update to 0.16.14 2018-01-04 21:08:30 +00:00
d994449808 Merge pull request #108 from dtandersen/update-0.16.13
Updated to version 0.16.13
2018-01-03 14:46:07 -08:00
4e63b2654e update to 0.16.13 2018-01-03 21:53:30 +00:00
abe6054b27 Merge pull request #107 from dtandersen/update-0.16.12
Updated to version 0.16.12
2017-12-31 09:29:11 -08:00
4fc35c3cdb update to 0.16.12 2017-12-31 12:18:31 +00:00
081b0c244f vagrant 2017-12-30 23:22:09 -08:00
a331033196 updated lan game docs 2017-12-30 21:07:06 -08:00
1e3d6d7886 docker compose instructions 2017-12-30 20:40:58 -08:00
2474da335e minor text changes 2017-12-30 20:34:18 -08:00
648b81edf8 Merge pull request #101 from smessmer/patch-1
Fix volume permissions for docker-compose
2017-12-30 20:26:08 -08:00
25326b9073 0.16 not 1.16 2017-12-30 19:16:44 -08:00
cae2d3b226 Merge pull request #99 from jmerdich/patch-1
Document the required permissions change in 1.16+
2017-12-30 19:15:52 -08:00
e13768aa12 updated ports 2017-12-30 19:14:32 -08:00
78f00b9f17 changed paths to /opt/factorio instead of /tmp/factorio 2017-12-30 19:12:15 -08:00
aedc8a29a4 0.16.11 2017-12-30 17:08:50 -08:00
7168f2927c 0.16.10 2017-12-30 17:05:46 -08:00
7b19c3bfa5 Merge pull request #103 from dtandersen/update-0.16.9
Updated to version 0.16.9
2017-12-30 16:53:06 -08:00
bffa336cb2 Merge branch 'master' into update-0.16.9 2017-12-30 16:52:57 -08:00
06a76e4156 Merge pull request #102 from dtandersen/update-0.16.8
Updated to version 0.16.8
2017-12-30 16:49:56 -08:00
107b902191 Merge branch 'master' into update-0.16.8 2017-12-30 16:49:21 -08:00
9e4888fe8a Merge pull request #105 from dtandersen/update-0.16.11
Updated to version 0.16.11
2017-12-31 00:36:09 +01:00
aa5e51680f Merge branch 'master' into update-0.16.11 2017-12-31 00:35:51 +01:00
590adff3a0 Merge pull request #104 from dtandersen/update-0.16.10
Updated to version 0.16.10
2017-12-30 23:34:29 +01:00
c60794de39 update to 0.16.11 2017-12-30 20:08:29 +00:00
a871fe689d update to 0.16.10 2017-12-30 10:23:29 +00:00
739ed46afe update to 0.16.9 2017-12-29 21:43:33 +00:00
dfa067e2e9 update to 0.16.8 2017-12-29 18:28:32 +00:00
7113c03076 Fix volume permissions for docker-compose
When using named containers in docker compose, it creates them with root and the factorio docker container fails to start because it doesn't have write permissions. Reproduce by using the following docker-compose file:

    version: '3.2'
    services:
      server:
        image: dtandersen/factorio:0.16.7
        volumes:
        - logs:/var/log
        - data:/factorio
        ports:
        - "34197:34197/udp"
        - "27015:27015/tcp"
    volumes:
      logs:
      data:

With this proposed change, the /factorio folder is created *before* it is made a volume. This causes docker to correctly preserve the permissions, the docker-compose file above works now.

This is related to https://github.com/dtandersen/docker_factorio_server/issues/91 and maybe also makes https://github.com/dtandersen/docker_factorio_server/pull/99 obsolete.
2017-12-28 12:37:23 +00:00
2095404c2a Document the required permissions change in 1.16+
Make sure users of 1.16 don't get stopped by weird permissions errors created by #91 because factorio is no longer run as root in the container.
2017-12-21 17:54:38 -07:00
dff6b849f8 Merge pull request #98 from dtandersen/update-0.16.7
Updated to version 0.16.7
2017-12-21 11:49:45 -08:00
5c616483f6 update to 0.16.7 2017-12-21 19:03:29 +00:00
856066ccf1 Merge pull request #96 from dtandersen/update-0.16.6
Updated to version 0.16.6
2017-12-18 20:14:24 +01:00
ce039016e0 update to 0.16.6 2017-12-18 18:48:30 +00:00
6f20f17472 Merge pull request #95 from dtandersen/update-0.16.5
Updated to version 0.16.5
2017-12-17 15:39:05 -08:00
44a28d5c70 update to 0.16.5 2017-12-17 20:03:30 +00:00
f9b2d6bb9f Merge pull request #94 from dtandersen/update-0.16.4
Updated to version 0.16.4
2017-12-16 10:09:56 -08:00
bb06a73144 update to 0.16.4 2017-12-16 11:58:29 +00:00
3eed964b32 Merge pull request #93 from dtandersen/update-0.16.3
Updated to version 0.16.3
2017-12-16 03:42:23 +01:00
0eb64bc190 update to 0.16.3 2017-12-15 15:08:32 +00:00
9834ca2842 don't need to make all of /opt/factorio writeable 2017-12-14 15:16:25 +00:00
6b2307635e give up on scenario entry point 2017-12-14 07:13:45 -08:00
6f4f179276 no need to set user 2017-12-14 07:10:27 -08:00
ebd6da4b97 Merge pull request #92 from dtandersen/update-0.16.2
Updated to version 0.16.2
2017-12-14 06:47:36 -08:00
8ee7c360c5 update to 0.16.2 2017-12-14 12:18:31 +00:00
5f7f1f145c 0.16.1 2017-12-13 13:19:19 -08:00
6b58cb1909 0.16.1 2017-12-13 21:17:41 +00:00
d6d039d4a6 0.15.40 is stable 2017-12-13 10:59:16 -08:00
02d2c449d3 add 0.16 to readme 2017-12-13 10:53:22 -08:00
8091c3a9f9 0.16.0 2017-12-13 18:43:01 +00:00
cb5bc74e4b run as factorio user 2017-12-13 18:33:51 +00:00
1ce5c5db7e added 0.16 2017-12-13 08:54:30 -08:00
e2e7cc7798 remove chmod +x because file is already executable 2017-12-12 10:14:49 -08:00
487d345480 Merge pull request #89 from luliu/patch-1
Allowing non-root user to run factorio
2017-12-12 10:14:03 -08:00
7a276adb3c Allowing non-root user to run factorio
When starting the container with `docker run -d -u $(id -u factorio):$(id -g factorio) ...`, permission is denied upon trying to create `/opt/factorio/.lock` file.
This permission tweak will allow caller to pass desired user from host to container such that the permissions are retained correctly when games are saved to the mount.

Also, it just feels wrong to run factorio as root, container or not.  :)
2017-12-06 15:46:45 -05:00
7a5f3471d6 Merge pull request #86 from tsuckow/fix-permissions
Fix permissions in #85
2017-11-29 20:28:34 -08:00
eac273e2d6 Fix permissions in #85 2017-11-29 23:05:43 -05:00
768eaac7b2 Update README.md
0.15.37 is still stable
2017-11-29 14:44:06 -08:00
67a0420f06 Merge pull request #80 from schmic/master
Allow to define RCON port as well
2017-11-29 14:39:21 -08:00
b2248d1e8c Merge branch 'master' into master 2017-11-29 14:38:50 -08:00
60a124f22c Merge branch 'master' into master 2017-11-29 14:38:08 -08:00
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
a6f0b66f9b update to 0.15.40 2017-11-29 21:48:31 +00:00
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
e30e313a55 Merge branch 'master' into update-0.15.39 2017-11-27 14:09:28 -08:00
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
16c0f35c97 update to 0.15.39 2017-11-27 19:53:35 +00:00
623cd6ac87 update to 0.15.38 2017-11-24 12:23:33 +00:00
ca3a66ca2f Allow to define RCON port as well 2017-11-12 13:49:58 +01:00
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
893124cf43 update to 0.15.37 2017-10-17 14:26:02 +00:00
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
1194fde627 update to 0.15.36 2017-10-10 15:26:00 +00:00
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
11d8626ccd update to 0.15.35 2017-09-28 13:35:50 +00:00
d1d5e405cb Update README.md 2017-08-23 12:11:54 -07:00
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
046a632860 update to 0.15.34 2017-08-23 12:57:11 +00:00
d80ae622fd Update README.md 2017-08-09 10:52:10 -07:00
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
1e5f88ffd9 update to 0.15.33 2017-08-09 16:12:14 +00:00
672101f0f7 0.15.31 is still stable 2017-08-02 09:34:10 -07:00
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
7e40c62ff6 update to 0.15.32 2017-08-02 11:57:11 +00:00
37fbaa38cf 0.15.31 is stable 2017-07-26 16:37:13 -07:00
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
4528be2297 update to 0.15.31 2017-07-25 17:07:12 +00:00
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
78289a5930 update to 0.15.30 2017-07-14 16:27:19 +00:00
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
70e61be5b6 update to 0.15.29 2017-07-13 19:42:12 +00:00
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
add31ebe53 update to 0.15.28 2017-07-06 16:42:10 +00:00
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
126669ca7a update to 0.15.27 2017-07-03 17:17:11 +00:00
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
a61f05709e update to 0.15.26 2017-06-30 19:42:11 +00:00
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
95c45b7a39 update to 0.15.25 2017-06-29 17:22:13 +00:00
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
d85de90142 update to 0.15.24 2017-06-29 10:27:12 +00:00
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
e9c698cbc8 update to 0.15.23 2017-06-22 16:47:12 +00:00
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
110a598ca8 update to 0.15.22 2017-06-21 16:37:12 +00:00
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
96eff95f47 update to 0.15.21 2017-06-15 10:27:11 +00:00
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
d195fdcdfc update to 0.15.20 2017-06-14 16:07:12 +00:00
d9a5fac17c Merge pull request #43 from Entroper/map-settings
Add map-settings.json config file
2017-06-08 08:36:51 -07:00
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
eb0a7410eb update to 0.15.19 2017-06-08 11:52:11 +00:00
01aeb3b1aa Add map-settings.json to README 2017-06-06 14:22:31 -04:00
91f28e34a2 add map-settings.json config file 2017-06-06 13:20:10 -04:00
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
2d99b36f7e update to 0.15.18 2017-06-02 08:47:04 +00:00
5e71044728 updated to alpine 3.6 2017-06-01 18:31:53 +00:00
52dd896f3c 0.15.17 2017-06-01 11:25:14 -07:00
3a5ce81d2e Merge pull request #38 from Mettwurscht/patch-2
Update to 0.15.17
2017-06-01 11:24:24 -07:00
ad707ee2ad Update to 0.15.17 2017-06-01 15:39:01 +02:00
61fd28bb36 0.15.16 2017-05-27 12:12:43 -07:00
892a684f98 Merge pull request #36 from Mettwurscht/patch-1
Update to 0.15.16
2017-05-27 12:11:06 -07:00
a0cedba383 Update to 0.15.16 2017-05-27 20:07:37 +02:00
893c1b6214 Merge pull request #35 from Dianoga/0.15.15
Update to 0.15.15
2017-05-26 13:20:22 -07:00
0d79b49393 Update README.md 2017-05-26 15:09:27 -05:00
9d3f88ed6b Update to 0.15.15 2017-05-26 15:08:42 -05:00
a0338cc7b3 0.15.14 2017-05-26 10:50:27 -07:00
ed1fe2ba82 Merge pull request #34 from psykzz/patch-2
Update to 0.15.14
2017-05-26 10:47:40 -07:00
46769a042d Update to 0.15.14 2017-05-26 17:39:24 +01:00
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
59b35f3ac0 Updated to v0.15.13-experimental 2017-05-23 18:45:33 +00:00
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
2b1115c19a Merge pull request #26 from dtandersen/server-id
server-id / banlist / docker-compose
2017-05-18 08:55:49 -07:00
b6276d7b51 Updated to v0.15.12-experimental 2017-05-18 15:45:34 +00:00
82a15c8f34 removed shell scripts debugging server 2017-05-17 17:15:05 +00:00
0fbcfbf857 added docker-compose.yml 2017-05-17 17:14:01 +00:00
dc89065e68 save the server id 2017-05-17 17:12:33 +00:00
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
26584556a3 Merge pull request #23 from tsugliani/patch-5
Update to 0.15.11
2017-05-16 12:14:57 -04:00
3a70062289 Merge branch 'master' into update-v0.15.11-experimental 2017-05-16 11:12:16 -04:00
c3fe70f783 Updated to v0.15.11-experimental 2017-05-16 15:10:55 +00:00
7a5732bbcd Update to 0.15.11 2017-05-16 15:56:00 +02:00
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
7e78a4236f Merge branch 'master' into update-v0.15.10-experimental 2017-05-10 13:52:48 -04:00
0c5ff73adb Updated to v0.15.10-experimental 2017-05-10 13:52:13 -04:00
9ad1889aeb 0.15.9 2017-05-06 23:59:30 -07:00
2a23a3fe91 0.15.9 2017-05-05 14:54:07 -07:00
cfcbb035a7 Merge pull request #20 from warmwaffles/master
Bump to version 0.15.9
2017-05-05 14:53:06 -07:00
10f8b0acb6 Bump to version 0.15.9 2017-05-05 16:13:09 -05:00
c7309c1e5c 0.15.8 2017-05-05 11:05:51 -07:00
c845acc09f 0.15 is still 0.15.6 2017-05-05 09:26:22 -07:00
8bfe8b0261 0.15.7 2017-05-05 06:58:19 -07:00
2c7cfc6c65 Merge pull request #18 from tsugliani/patch-3
Update to 0.15.7
2017-05-05 06:57:37 -07:00
1250578039 Update to 0.15.7 2017-05-05 15:54:30 +02:00
97165cfdde 0.15.6 2017-05-02 08:22:17 -07:00
c6f144aff4 Merge pull request #13 from tsugliani/patch-2
Update to 0.15.6
2017-05-02 08:21:52 -07:00
481246c449 Update to 0.15.6 2017-05-02 16:38:07 +02:00
97cdaa825a Merge branch 'master' of github.com:dtandersen/docker_factorio_server 2017-04-30 08:37:53 -07:00
b36c299358 Merge pull request #11 from tsugliani/patch-1
Update to 0.15.5
2017-04-30 08:37:38 -07:00
4e09965476 0.15.5 2017-04-30 08:37:28 -07:00
5340267672 Update to 0.15.5 2017-04-30 13:44:44 +02:00
061d0c6c37 Merge pull request #10 from pshendry/master
Update to 0.15.4
2017-04-29 14:46:33 -07:00
84af48c346 Update to 0.15.4 2017-04-29 14:19:36 -07:00
2ca5f1368c Merge pull request #7 from XanderXAJ/0.15.3
Update 0.15.x branch to 0.15.3
2017-04-27 13:28:42 -07:00
bc0ef1b51e Update 0.15.x branch to 0.15.3 2017-04-27 20:44:14 +01:00
b2fbd707f8 location of server-whitelist.json 2017-04-27 08:32:07 -07:00
a88071d1aa minor text changes 2017-04-26 13:09:29 -07:00
a1f590270b added whitelisting and contributors section to readme 2017-04-26 13:07:40 -07:00
b0b5775365 Merge pull request #6 from gnomus/patch-1
Add possibility to use a whitelist
2017-04-26 12:59:35 -07:00
c988684348 added fancy badge 2017-04-26 12:38:31 -07:00
75e98e0543 Update docker-entrypoint.sh 2017-04-26 21:37:54 +02:00
0bc55d51a8 minor text changes 2017-04-26 12:31:08 -07:00
c50665c37f doc update 2017-04-26 12:29:43 -07:00
81c9d50e7a Add possibility to use a whitelist 2017-04-26 13:29:47 +02:00
c3631942e8 a tidbit about the console 2017-04-25 15:26:32 -07:00
8e072e8c24 0.15.2 2017-04-25 14:53:37 -07:00
c260815680 0.15.1 2017-04-24 20:32:36 +00:00
fd4680704f save some space by uninstalling curl 2017-04-24 20:19:30 +00:00
b46eefee58 documented PORT 2017-04-24 12:45:04 -07:00
76a76765bb document -dev tag 2017-04-24 11:31:04 -07:00
d6331587b4 updated PORT docs 2017-04-24 11:29:42 -07:00
dfbd6baff6 documented PORT env variable 2017-04-24 11:24:19 -07:00
12 changed files with 384 additions and 36 deletions

View File

@ -1,25 +1,28 @@
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.0 \
SHA1=e7681725203afeb0645371c695989129076e51bc
RCON_PORT=27015 \
VERSION=0.15.40 \
SHA1=f79a975f6b8c0ee87e2fa60f7d1f7133f332c3ec
RUN mkdir /opt && \
apk --no-cache add curl tini pwgen && \
apk add --update --no-cache tini pwgen && \
apk add --update --no-cache --virtual .build-deps curl && \
curl -sSL https://www.factorio.com/get-download/$VERSION/headless/linux64 \
-o /tmp/factorio_headless_x64_$VERSION.tar.xz && \
echo "$SHA1 /tmp/factorio_headless_x64_$VERSION.tar.xz" | sha1sum -c && \
tar xf /tmp/factorio_headless_x64_$VERSION.tar.xz --directory /opt && \
chmod -R ugo=rwx /opt/factorio && \
rm /tmp/factorio_headless_x64_$VERSION.tar.xz && \
apk del curl && \
ln -s /factorio/saves /opt/factorio/saves && \
ln -s /factorio/mods /opt/factorio/mods
ln -s /factorio/mods /opt/factorio/mods && \
apk del .build-deps
VOLUME /factorio
EXPOSE $PORT/udp 27015/tcp
EXPOSE $PORT/udp $RCON_PORT/tcp
COPY ./docker-entrypoint.sh /

View File

@ -1 +0,0 @@
sudo docker build --no-cache -t factorio .

View File

@ -1 +0,0 @@
sudo rm -rf /tmp/factorio

8
0.15/docker-compose.yml Normal file
View File

@ -0,0 +1,8 @@
version: '2'
services:
factorio:
build: .
ports:
- "34197:34197"
volumes:
- /tmp/factorio:/factorio

View File

@ -21,15 +21,23 @@ 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 \
--port $PORT \
--start-server-load-latest \
--server-settings $CONFIG/server-settings.json \
--rcon-port 27015 \
--rcon-password "$(cat $CONFIG/rconpw)"
--server-whitelist $CONFIG/server-whitelist.json \
--server-banlist $CONFIG/server-banlist.json \
--rcon-port $RCON_PORT \
--rcon-password "$(cat $CONFIG/rconpw)" \
--server-id /factorio/config/server-id.json

View File

@ -1,5 +0,0 @@
sudo docker run --rm -it \
-v /tmp/factorio:/factorio \
--name factorio \
factorio "$@"
find /tmp/factorio -type f

46
0.16/Dockerfile Normal file
View File

@ -0,0 +1,46 @@
FROM frolvlad/alpine-glibc:alpine-3.7
MAINTAINER https://github.com/dtandersen/docker_factorio_server
ARG USER=factorio
ARG GROUP=factorio
ARG PUID=845
ARG PGID=845
ENV PORT=34197 \
RCON_PORT=27015 \
VERSION=0.16.48 \
SHA1=9b8880d05e35babd7fa654402062cae47d79969d \
SAVES=/factorio/saves \
CONFIG=/factorio/config \
MODS=/factorio/mods \
SCENARIOS=/factorio/scenarios \
SCRIPTOUTPUT=/factorio/script-output
RUN mkdir -p /opt /factorio && \
apk add --update --no-cache pwgen && \
apk add --update --no-cache --virtual .build-deps curl && \
curl -sSL https://www.factorio.com/get-download/$VERSION/headless/linux64 \
-o /tmp/factorio_headless_x64_$VERSION.tar.xz && \
echo "$SHA1 /tmp/factorio_headless_x64_$VERSION.tar.xz" | sha1sum -c && \
tar xf /tmp/factorio_headless_x64_$VERSION.tar.xz --directory /opt && \
chmod ugo=rwx /opt/factorio && \
rm /tmp/factorio_headless_x64_$VERSION.tar.xz && \
ln -s $SAVES /opt/factorio/saves && \
ln -s $MODS /opt/factorio/mods && \
ln -s $SCENARIOS /opt/factorio/scenarios && \
ln -s $SCRIPTOUTPUT /opt/factorio/script-output && \
apk del .build-deps && \
addgroup -g $PGID -S $GROUP && \
adduser -u $PUID -G $GROUP -s /bin/sh -SDH $USER && \
chown -R $USER:$GROUP /opt/factorio /factorio
VOLUME /factorio
EXPOSE $PORT/udp $RCON_PORT/tcp
COPY files/ /
USER $USER
ENTRYPOINT ["/docker-entrypoint.sh"]

9
0.16/docker-compose.yml Normal file
View File

@ -0,0 +1,9 @@
version: '2'
services:
factorio:
build: .
ports:
- "34197:34197/udp"
- "27015:27015/tcp"
volumes:
- /opt/factorio:/factorio

48
0.16/files/docker-entrypoint.sh Executable file
View File

@ -0,0 +1,48 @@
#!/bin/sh -x
set -e
id
mkdir -p $SAVES
mkdir -p $CONFIG
mkdir -p $MODS
mkdir -p $SCENARIOS
mkdir -p $SCRIPTOUTPUT
if [ ! -f $CONFIG/rconpw ]; then
echo $(pwgen 15 1) > $CONFIG/rconpw
fi
if [ ! -f $CONFIG/server-settings.json ]; then
cp /opt/factorio/data/server-settings.example.json $CONFIG/server-settings.json
fi
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 \*.tmp.zip -mindepth 1 -print | grep -q .; then
rm -f $SAVES/*.tmp.zip
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-settings $CONFIG/map-settings.json
fi
exec /opt/factorio/bin/x64/factorio \
--port $PORT \
--start-server-load-latest \
--server-settings $CONFIG/server-settings.json \
--server-whitelist $CONFIG/server-whitelist.json \
--server-banlist $CONFIG/server-banlist.json \
--rcon-port $RCON_PORT \
--rcon-password "$(cat $CONFIG/rconpw)" \
--server-id /factorio/config/server-id.json \
$@

44
0.16/files/scenario.sh Executable file
View File

@ -0,0 +1,44 @@
#!/bin/sh -x
if [ -z "$1" ]
then
echo "No argument supplied"
fi
SCENARIO=$1
set -e
id
mkdir -p $SAVES
mkdir -p $CONFIG
mkdir -p $MODS
mkdir -p $SCENARIOS
#chown -R factorio /factorio
if [ ! -f $CONFIG/rconpw ]; then
echo $(pwgen 15 1) > $CONFIG/rconpw
fi
if [ ! -f $CONFIG/server-settings.json ]; then
cp /opt/factorio/data/server-settings.example.json $CONFIG/server-settings.json
fi
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
exec /opt/factorio/bin/x64/factorio \
--port $PORT \
--start-server-load-scenario $SCENARIO \
--server-settings $CONFIG/server-settings.json \
--server-whitelist $CONFIG/server-whitelist.json \
--server-banlist $CONFIG/server-banlist.json \
--rcon-port $RCON_PORT \
--rcon-password "$(cat $CONFIG/rconpw)" \
--server-id /factorio/config/server-id.json

30
0.16/files/scenario2map.sh Executable file
View File

@ -0,0 +1,30 @@
#!/bin/sh -x
if [ -z "$1" ]
then
echo "No argument supplied"
fi
SCENARIO=$1
set -e
id
mkdir -p $SAVES
mkdir -p $CONFIG
mkdir -p $MODS
mkdir -p $SCENARIOS
if [ ! -f $CONFIG/server-settings.json ]; then
cp /opt/factorio/data/server-settings.example.json $CONFIG/server-settings.json
fi
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
exec /opt/factorio/bin/x64/factorio \
--scenario2map $SCENARIO

197
README.md
View File

@ -1,15 +1,18 @@
# Factorio [![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/)
# 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.0`, `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.16.48`, `0.16`, `stable`, `latest` [(0.16/Dockerfile)](https://github.com/dtandersen/docker_factorio_server/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.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 philosophy*
*Tag descriptions*
* `latest` - highest version: may be experimental.
* `stable` - highest version declared stable.
* `0.x` - highest version in a branch: may be experimental.
* `0.x.y` - a specific version.
* `0.x-dev` - whatever is in master for that version.
# What is Factorio?
@ -26,13 +29,17 @@ NOTE: This is only the server. The game is available at [factorio.com](https://w
## Quick Start
Run the server to create the necessary folder structure and configuration files. For this example data is stored in `/tmp/factorio`.
Run the server to create the necessary folder structure and configuration files. For this example data is stored in `/opt/factorio`.
```
docker run -d -p 34197:34197/udp -p 27015:27015/tcp \
-v /tmp/factorio:/factorio \
sudo mkdir -p /opt/factorio
sudo chown 845:845 /opt/factorio
sudo docker run -d \
-p 34197:34197/udp \
-p 27015:27015/tcp \
-v /opt/factorio:/factorio \
--name factorio \
--restart=always \
--restart=always \
dtandersen/factorio
```
@ -40,10 +47,12 @@ For those new to Docker, here is an explanation of the options:
* `-d` - Run as a daemon ("detached").
* `-p` - Expose ports.
* `-v` - Mount `/tmp/factorio` on the local file system to `/factorio` in the container.
* `-v` - Mount `/opt/factorio` on the local file system to `/factorio` in the container.
* `--restart` - Restart the server if it crashes and at system start
* `--name` - Name the container "factorio" (otherwise it has a funny random name).
The `chown` command is needed because in 0.16+, we no longer run the game server as root for security reasons, but rather as a 'factorio' user with user id 845. The host must therefore allow these files to be written by that user.
Check the logs to see what happened:
```
@ -56,7 +65,7 @@ Stop the server:
docker stop factorio
```
Now there's a `server-settings.json` file in the folder `/tmp/factorio/config`. Modify this to your liking and restart the server:
Now there's a `server-settings.json` file in the folder `/opt/factorio/config`. Modify this to your liking and restart the server:
```
docker start factorio
@ -65,9 +74,34 @@ docker start factorio
Try to connect to the server. Check the logs if it isn't working.
## Console
To issue console commands to the server, start the server in interactive mode with `-it`. Open the console with `docker attach` and then type commands.
docker run -d -it \
--name factorio \
dtandersen/factorio
docker attach factorio
## Upgrading
Before upgrading backup the save. It's easy to make a save in the client.
Ensure `-v` was used to run the server so the save is outside of the Docker container. The `docker rm` command completely destroys the container, which includes the save if it isn't stored in an data volume.
Delete the container and refresh the image:
docker stop factorio
docker rm factorio
docker pull dtandersen/factorio
Now run the server as before. In about a minute the new version of Factorio should be up and running, complete with saves and config!
## 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 `/opt/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.
@ -79,15 +113,56 @@ To generate a new map stop the server, delete all of the saves and restart the s
Copy mods into the mods folder and restart the server.
## Scenarios
If you want to launch a scenario from a clean start (not from a saved map) you'll need to start the docker image from an alternate entrypoint. To do this, use the example entrypoint file stored in the /factorio/entrypoints directory in the volume, and launch the image with the following syntax. Note that this is the normal syntax with the addition of the --entrypoint setting AND the additional argument at the end, which is the name of the Scenario in the Scenarios folder.
```
docker run -d \
-p 34197:34197/udp \
-p 27015:27015/tcp \
-v /opt/factorio:/factorio \
--name factorio \
--restart=always \
--entrypoint "/scenario.sh" \
dtandersen/factorio \
MyScenarioName
```
## Converting Scenarios to Regular Maps
If you would like to export your scenario to a saved map, you can use the example entrypoint similar to the Scenario usag above. Factorio will run once, converting the Scenario to a saved Map in your saves directory. A restart of the docker image using the standard options will then load that map, just as if the scenario were just started by the Scenarios example noted above.
```
docker run -d \
-p 34197:34197/udp \
-p 27015:27015/tcp \
-v /opt/factorio:/factorio \
--name factorio \
--restart=always \
--entrypoint "/scenario2map.sh" \
dtandersen/factorio
MyScenarioName
```
## RCON
Set the RCON password in the `rconpw` file. A random password is generated if `rconpw` doesn't exist.
To change the password stop the server, modify `rconpw`, and restart the server.
To change the password, stop the server, modify `rconpw`, and restart the server.
To "disable" RCON don't expose port 27015, i.e. start the server with `-p 34197:34197/udp` instead of `-P`. RCON still runs, but nobody is able to connect to it.
To "disable" RCON don't expose port 27015, i.e. start the server without `-p 27015:27015/tcp`. RCON is still running, but nobody can to connect to it.
## Whitelisting (0.15.3+)
Create file `config/server-whitelist.json` and add the whitelisted users.
[
"you",
"friend"
]
# Container Details
The philosophy is to [keep it simple](http://wiki.c2.com/?KeepItSimple).
@ -105,19 +180,96 @@ To keep things simple, the container uses a single volume mounted at `/factorio`
|-- config
| |-- map-gen-settings.json
| |-- rconpw
| `-- server-settings.json
| |-- server-settings.json
| `-- server-whitelist.json
|-- mods
| `-- fancymod.zip
`-- saves
`-- _autosave1.zip
## Docker Compose
[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.16/docker-compose.yml) file. To get it from this repository:
```
git clone https://github.com/dtandersen/docker_factorio_server.git
cd docker_factorio_server/0.16
```
Or make your own:
```
version: '2'
services:
factorio:
image: dtandersen/factorio
ports:
- "34197:34197/udp"
- "27015:27015/tcp"
volumes:
- /opt/factorio:/factorio
```
Now cd to the directory with docker-compose.yml and run:
```
sudo mkdir -p /opt/factorio
sudo chown 845:845 /opt/factorio
sudo docker-compose up -d
```
## Ports
* `34197/udp` - Factorio clients (required).
* `34197/udp` - Game server (required).
* `27015/tcp` - RCON (optional).
## Environment Variables
* `PORT` (0.15+) - Start the server on an alterate port, .e.g. `docker run -e "PORT=34198"`.
* `RCON_PORT` (0.16+) - Start the RCON on an alterate port, .e.g. `docker run -e "RCON_PORT=34198"`.
## LAN Games
Ensure the `lan` setting in server-settings.json is `true`.
```
"visibility":
{
"public": false,
"lan": true
},
```
Start the container with the `--network=host` option so clients can automatically find LAN games. Refer to the Quick Start to create the `/opt/factorio` directory.
```
sudo docker run -d \
--network=host \
-p 34197:34197/udp \
-p 27015:27015/tcp \
-v /opt/factorio:/factorio \
--name factorio \
--restart=always \
dtandersen/factorio
```
VirtualBox users must enable Bridged networking in order for the host to be assigned an internal network IP. Enable Bridged networking in Vagrant with:
```
config.vm.network "public_network"
config.vm.network "forwarded_port", guest: 34197, host: 34197
```
## Vagrant
Vagrant is a good way for those without a Linux machine to try Docker. Check out the [Factorio Vagrant Box](https://github.com/dtandersen/factorio-lan-vagrant).
## Troubleshooting
**My server is listed in the server browser, but nobody can connect**
@ -128,10 +280,17 @@ By default, Docker routes traffic through a proxy. The proxy changes the source
To fix the incorrect port, start the Docker service with the `--userland-proxy=false` switch. Docker will route traffic with iptables rules instead of a proxy. Add the switch to the `DOCKER_OPTS` environment variable or `ExecStart` in the Docker systemd service definition. The specifics vary by operating system.
**When I run a server on a port besides 34197 nobody can connect from the server browser**
# Credits
Use the `PORT` environment variable to start the server on the a different port, .e.g. `docker run -e "PORT=34198"`. This changes the source port on the packets used for port detection. `-p 34198:34197` works fine for private servers, but the server browser detects the wrong port.
Ideas borrowed from:
* [Zopanix](https://github.com/zopanix/docker_factorio_server)
* [Rfvgyhn](https://github.com/Rfvgyhn/docker-factorio)
# Contributors
* [dtandersen](https://github.com/dtandersen/docker_factorio_server) - Maintainer
* [Fank](https://github.com/Fankserver/docker-factorio-watchdog) - Keeper of the Factorio watchdog that keeps the version up-to-date.
* [Zopanix](https://github.com/zopanix/docker_factorio_server) - Originator
* [Rfvgyhn](https://github.com/Rfvgyhn/docker-factorio) - Randomly generate RCON password
* [gnomus](https://github.com/gnomus/docker_factorio_server) - White listing
* [bplein](https://github.com/bplein/docker_factorio_server) - Scenario support
* [jaredledvina](https://github.com/jaredledvina/docker_factorio_server) - Version update