| 
							
							
								 David Andersen | 3cc553c786 | 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 | 0b3a7bd84c | 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 | a28d8315aa | updated imagelayers.io badge url | 2016-04-26 15:05:59 -07:00 |  | 
			
				
					| 
							
							
								 David Andersen | 14d1af4d9e | updated dockerfile links | 2016-04-26 15:01:32 -07:00 |  | 
			
				
					| 
							
							
								 David Andersen | b8c0e42baa | Merge branch '0.12.31_update' into dt_develop # Conflicts:
#	Dockerfile
#	README.md | 2016-04-26 14:44:56 -07:00 |  | 
			
				
					| 
							
							
								 David Andersen | 148c01eab0 | updated to 0.12.31 | 2016-04-26 14:26:18 -07:00 |  | 
			
				
					| 
							
							
								 zopanix | 99c79f7e64 | Revert "Set version to 0.12.29" This reverts commit 7e0718a332. | 2016-04-26 13:51:29 +02:00 |  | 
			
				
					| 
							
							
								 zopanix | 11f92f34d8 | Set version to 0.12.29 | 2016-04-26 13:48:32 +02:00 |  | 
			
				
					| 
							
							
								 zopanix | 186af111d9 | Set Version to 0.12.30 | 2016-04-24 14:14:19 +02:00 |  | 
			
				
					| 
							
							
								 zopanix | b6f14800ab | Set Version to 0.12.29 | 2016-04-24 14:13:51 +02:00 |  | 
			
				
					| 
							
							
								 zopanix | 4a5504cdb6 | Set Version to 0.12.28 | 2016-04-24 14:13:35 +02:00 |  | 
			
				
					| 
							
							
								 zopanix | 0e8cb6c26c | Set Version to 0.12.27 | 2016-04-24 14:13:14 +02:00 |  | 
			
				
					| 
							
							
								 zopanix | b950fe99c6 | Set Version to 0.12.25 | 2016-04-24 14:12:44 +02:00 |  | 
			
				
					| 
							
							
								 zopanix | 6ed85052ff | Set Version to 0.12.25 | 2016-04-24 14:12:17 +02:00 |  | 
			
				
					| 
							
							
								 zopanix | 30425c8d66 | Set Version to 0.12.24 | 2016-04-24 14:11:45 +02:00 |  | 
			
				
					| 
							
							
								 zopanix | 522a3a2e93 | Trying to fix with alpine | 2016-04-24 14:06:44 +02:00 |  | 
			
				
					| 
							
							
								 zopanix | e37cdcc508 | Fixing some things | 2016-04-24 13:42:15 +02:00 |  | 
			
				
					| 
							
							
								 zopanix | 7babfe47ff | Fixed typo | 2016-04-24 13:36:37 +02:00 |  | 
			
				
					| 
							
							
								 zopanix | bfd2c5f600 | Set version back to 0.12.30 | 2016-04-24 12:56:23 +02:00 |  | 
			
				
					| 
							
							
								 zopanix | 3fc2e97f7e | Set version to 0.12.29 | 2016-04-24 12:55:53 +02:00 |  | 
			
				
					| 
							
							
								 zopanix | d141764f44 | Remove sha1sum | 2016-04-24 12:54:12 +02:00 |  | 
			
				
					| 
							
							
								 zopanix | 4a816ad5f9 | Added feature alpine with ssl verification and sha1 verification of the image | 2016-04-24 12:45:15 +02:00 |  | 
			
				
					| 
							
							
								 David Andersen | d1aa470d25 | Merge branch 'alpine' | 2016-04-14 23:04:50 -07:00 |  | 
			
				
					| 
							
							
								 David Andersen | 70e936c7e3 | how to see logs | 2016-04-14 22:54:17 -07:00 |  | 
			
				
					| 
							
							
								 David Andersen | f17e773885 | formatted the word dockerfile as code | 2016-04-14 22:50:29 -07:00 |  | 
			
				
					| 
							
							
								 David Andersen | c8af86eaef | reformat docs | 2016-04-14 22:48:52 -07:00 |  | 
			
				
					| 
							
							
								 David Andersen | dcac7d0c46 | added versions to top | 2016-04-14 22:45:25 -07:00 |  | 
			
				
					| 
							
							
								 David Andersen | b6d1748deb | added fancy bagde | 2016-04-14 22:41:33 -07:00 |  | 
			
				
					| 
							
							
								 David Andersen | e1e8ff07e6 | added description of factorio | 2016-04-14 22:37:25 -07:00 |  | 
			
				
					| 
							
							
								 zopanix | 601ee80a47 | Merge pull request #4 from dtandersen/autopausetypo2 Fixed spelling of FACTORIO | 2016-04-15 07:37:17 +02:00 |  | 
			
				
					| 
							
							
								 David Andersen | fd4ed925b2 | point to dtandersen repo | 2016-04-14 22:23:36 -07:00 |  | 
			
				
					| 
							
							
								 David Andersen | 2d1f625219 | Merge branch 'readme' | 2016-04-14 22:14:12 -07:00 |  | 
			
				
					| 
							
							
								 David Andersen | 7d5e58d4a0 | re-enabled SSL security | 2016-04-14 22:06:32 -07:00 |  | 
			
				
					| 
							
							
								 David Andersen | c535246dac | added CA root; removed domain cert | 2016-04-14 22:05:59 -07:00 |  | 
			
				
					| 
							
							
								 David Andersen | 16959ea374 | factorio ssl cert | 2016-04-14 17:55:35 -07:00 |  | 
			
				
					| 
							
							
								 David Andersen | 8f6446f088 | try using alpine images | 2016-04-14 17:55:24 -07:00 |  | 
			
				
					| 
							
							
								 David Andersen | 65a32b3cbf | Corrected a typo. Merge branch 'autopausetypo2'
# Conflicts:
#	Dockerfile | 2016-04-14 16:08:37 -07:00 |  | 
			
				
					| 
							
							
								 David Andersen | 7ca5892e5e | corrected a typo | 2016-04-14 16:04:06 -07:00 |  | 
			
				
					| 
							
							
								 David Andersen | 327fd1c925 | Moved factorio link to the top | 2016-04-14 16:02:34 -07:00 |  | 
			
				
					| 
							
							
								 David Andersen | 323718b631 | combined ENVs to reduce layer count | 2016-04-14 15:20:14 -07:00 |  | 
			
				
					| 
							
							
								 David Andersen | 8049134ed5 | verify SHA1 checksum | 2016-04-14 15:03:35 -07:00 |  | 
			
				
					| 
							
							
								 David Andersen | 0a35d754ec | fixed spelling of FACTORIO | 2016-04-14 14:36:34 -07:00 |  | 
			
				
					| 
							
							
								 zopanix | cf60f77d53 | Merge pull request #2 from guyspronck/master Updated version to 0.12.30 | 2016-04-07 10:23:16 +02:00 |  | 
			
				
					| 
							
							
								 Guy Spronck | 65315ccfa8 | Updated Version number in README | 2016-04-06 12:17:42 +02:00 |  | 
			
				
					| 
							
							
								 Guy Spronck | e7ac99c855 | Updated version in Dockerfile | 2016-04-06 12:16:26 +02:00 |  | 
			
				
					| 
							
							
								 Christophe Vandekerchove | 7798e07daf | Added some env variables to make it more clear | 2016-03-28 09:14:53 +02:00 |  | 
			
				
					| 
							
							
								 Christophe Vandekerchove | 993ca2631c | Add a todo | 2016-03-27 20:52:16 +02:00 |  | 
			
				
					| 
							
							
								 Christophe Vandekerchove | a0551876fa | Removed todo as it is done | 2016-03-27 19:25:16 +02:00 |  | 
			
				
					| 
							
							
								 Christophe Vandekerchove | 74a32021de | Fixed typo in variable | 2016-03-27 19:17:39 +02:00 |  | 
			
				
					| 
							
							
								 Christophe Vandekerchove | 545297c443 | Fixed typo | 2016-03-27 19:15:05 +02:00 |  |