Commit Graph

98 Commits

Author SHA1 Message Date
David Andersen
68e8a5f25c Merge branch 'master' of https://github.com/zopanix/docker_factorio_server into dt_0.12.31 2016-04-29 15:48:27 -07:00
zopanix
b658982c93 Merge pull request #6 from dtandersen/0.12.31_update
updated to 0.12.31
2016-04-27 13:18:07 +02:00
David Andersen
1d3fc75d20 updated imagelayers.io badge url 2016-04-26 15:05:59 -07:00
David Andersen
a4a482ee91 updated dockerfile links 2016-04-26 15:01:32 -07:00
David Andersen
eafe7c08be Merge branch '0.12.31_update' into dt_develop
# Conflicts:
#	Dockerfile
#	README.md
2016-04-26 14:44:56 -07:00
David Andersen
9acfe47d16 updated to 0.12.31 2016-04-26 14:26:18 -07:00
zopanix
b47b20e834 Revert "Set version to 0.12.29"
This reverts commit 7e0718a332.
2016-04-26 13:51:29 +02:00
zopanix
7e0718a332 Set version to 0.12.29 2016-04-26 13:48:32 +02:00
zopanix
ae327add0b Set Version to 0.12.30 2016-04-24 14:14:19 +02:00
zopanix
efb5eb7afc Set Version to 0.12.29 2016-04-24 14:13:51 +02:00
zopanix
ec1c4f9455 Set Version to 0.12.28 2016-04-24 14:13:35 +02:00
zopanix
edf8035ae3 Set Version to 0.12.27 2016-04-24 14:13:14 +02:00
zopanix
25b41c9f22 Set Version to 0.12.25 2016-04-24 14:12:44 +02:00
zopanix
228339ec31 Set Version to 0.12.25 2016-04-24 14:12:17 +02:00
zopanix
755c106b7b Set Version to 0.12.24 2016-04-24 14:11:45 +02:00
zopanix
f1f76e9ae0 Trying to fix with alpine 2016-04-24 14:06:44 +02:00
zopanix
26f053451c Fixing some things 2016-04-24 13:42:15 +02:00
zopanix
c439634ef1 Fixed typo 2016-04-24 13:36:37 +02:00
zopanix
cc33c84d86 Set version back to 0.12.30 2016-04-24 12:56:23 +02:00
zopanix
8806ca2160 Set version to 0.12.29 2016-04-24 12:55:53 +02:00
zopanix
83bf5c4a11 Remove sha1sum 2016-04-24 12:54:12 +02:00
zopanix
30859d57b8 Added feature alpine with ssl verification and sha1 verification of the image 2016-04-24 12:45:15 +02:00
David Andersen
3e9f74eaac Merge branch 'alpine' 2016-04-14 23:04:50 -07:00
David Andersen
14bbd68a3b how to see logs 2016-04-14 22:54:17 -07:00
David Andersen
d4052bc790 formatted the word dockerfile as code 2016-04-14 22:50:29 -07:00
David Andersen
2fc2b7656d reformat docs 2016-04-14 22:48:52 -07:00
David Andersen
199f6c7f59 added versions to top 2016-04-14 22:45:25 -07:00
David Andersen
d614babc54 added fancy bagde 2016-04-14 22:41:33 -07:00
David Andersen
257e1751c2 added description of factorio 2016-04-14 22:37:25 -07:00
zopanix
e8e5047490 Merge pull request #4 from dtandersen/autopausetypo2
Fixed spelling of FACTORIO
2016-04-15 07:37:17 +02:00
David Andersen
d089b02941 point to dtandersen repo 2016-04-14 22:23:36 -07:00
David Andersen
6fe77c30da Merge branch 'readme' 2016-04-14 22:14:12 -07:00
David Andersen
a97763a0e1 re-enabled SSL security 2016-04-14 22:06:32 -07:00
David Andersen
602881a0d9 added CA root; removed domain cert 2016-04-14 22:05:59 -07:00
David Andersen
b56ab27e52 factorio ssl cert 2016-04-14 17:55:35 -07:00
David Andersen
5edbcd9055 try using alpine images 2016-04-14 17:55:24 -07:00
David Andersen
059a77574e Corrected a typo.
Merge branch 'autopausetypo2'

# Conflicts:
#	Dockerfile
2016-04-14 16:08:37 -07:00
David Andersen
c1488c61be corrected a typo 2016-04-14 16:04:06 -07:00
David Andersen
fb0d7d955b Moved factorio link to the top 2016-04-14 16:02:34 -07:00
David Andersen
a34b260d15 combined ENVs to reduce layer count 2016-04-14 15:20:14 -07:00
David Andersen
5d5cb71a90 verify SHA1 checksum 2016-04-14 15:03:35 -07:00
David Andersen
ad9c5c37dc fixed spelling of FACTORIO 2016-04-14 14:36:34 -07:00
zopanix
63a9eb14d2 Merge pull request #2 from guyspronck/master
Updated version to 0.12.30
2016-04-07 10:23:16 +02:00
Guy Spronck
76eddb14f8 Updated Version number in README 2016-04-06 12:17:42 +02:00
Guy Spronck
24bd934d98 Updated version in Dockerfile 2016-04-06 12:16:26 +02:00
Christophe Vandekerchove
9c873ac907 Added some env variables to make it more clear 2016-03-28 09:14:53 +02:00
Christophe Vandekerchove
c44a3d1faf Add a todo 2016-03-27 20:52:16 +02:00
Christophe Vandekerchove
926a377146 Removed todo as it is done 2016-03-27 19:25:16 +02:00
Christophe Vandekerchove
52bb117a2b Fixed typo in variable 2016-03-27 19:17:39 +02:00
Christophe Vandekerchove
04c4a6b577 Fixed typo 2016-03-27 19:15:05 +02:00