From b79bed41299521e3978d61e435694d81461c214b Mon Sep 17 00:00:00 2001 From: Ricardo Marques Date: Thu, 4 Aug 2016 02:34:55 +0100 Subject: [PATCH 01/33] Add docker-compose file --- .gitignore | 3 +++ docker-compose.yml | 22 ++++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 .gitignore create mode 100644 docker-compose.yml diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..457c8d97 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +saves +mods + diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 00000000..d29dede9 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,22 @@ +version: '2' +services: + game: + build: . + #image: zopanix/factorio:v0.13.13-experimental + volumes: + - ./saves:/opt/factorio/saves + - ./mods:/opt/factorio/mods + ports: + - "34197:34197/udp" + environment: + - FACTORIO_AUTOSAVE_INTERVAL=10 + - FACTORIO_AUTOSAVE_SLOTS=15 + - FACTORIO_ALLOW_COMMANDS=false + - FACTORIO_NO_AUTO_PAUSE=false + networks: + - factorio_net + restart: always + +networks: + factorio_net: + driver: bridge From 67726db1c380a064cec6ecac17fc68236db85a8d Mon Sep 17 00:00:00 2001 From: Ricardo Marques Date: Thu, 4 Aug 2016 02:50:25 +0100 Subject: [PATCH 02/33] Add docker-compose instructions to Readme.md --- README.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/README.md b/README.md index 45d01636..63d73477 100644 --- a/README.md +++ b/README.md @@ -217,6 +217,26 @@ Error Util.cpp:57: Unknown error ``` Check supplied Username and Password for mistakes. +### Docker Compose +You may use docker-compose to easily setup your game server using the following command: + +`docker-compose up -d` + +that will run the container as a service in the background automatically. +You may change the file content according to your preferences. + +Also if you want to setup your game server via docker-compose without having to build the image every time or even to download this repo, just copy the docker-compose.yml file and comment the line: + +`build: .` + +and uncomment the line: + +`#image: zopanix/factorio:v0.13.13-experimental` + +changing the tag to whatever you want to install. + +This way docker will automatically pull the image from the Docker Hub with the version you specified without the need for any build. + #### Waiting for ready This is a beta feature which has nothing to do with factorio... leave it as it is for the moment. I'm working with some collegues on something new which should work very well and please a lot of people. From bf0d7591fcc5f18e7a6dbce59f92036f38e41d94 Mon Sep 17 00:00:00 2001 From: Ricardo Marques Date: Thu, 4 Aug 2016 02:34:55 +0100 Subject: [PATCH 03/33] Add docker-compose file --- .gitignore | 3 +++ docker-compose.yml | 22 ++++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 .gitignore create mode 100644 docker-compose.yml diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..457c8d97 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +saves +mods + diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 00000000..d29dede9 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,22 @@ +version: '2' +services: + game: + build: . + #image: zopanix/factorio:v0.13.13-experimental + volumes: + - ./saves:/opt/factorio/saves + - ./mods:/opt/factorio/mods + ports: + - "34197:34197/udp" + environment: + - FACTORIO_AUTOSAVE_INTERVAL=10 + - FACTORIO_AUTOSAVE_SLOTS=15 + - FACTORIO_ALLOW_COMMANDS=false + - FACTORIO_NO_AUTO_PAUSE=false + networks: + - factorio_net + restart: always + +networks: + factorio_net: + driver: bridge From 8a7ea22786c4827949eb9015d031623b29316283 Mon Sep 17 00:00:00 2001 From: Ricardo Marques Date: Thu, 4 Aug 2016 02:50:25 +0100 Subject: [PATCH 04/33] Add docker-compose instructions to Readme.md --- README.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/README.md b/README.md index 45d01636..63d73477 100644 --- a/README.md +++ b/README.md @@ -217,6 +217,26 @@ Error Util.cpp:57: Unknown error ``` Check supplied Username and Password for mistakes. +### Docker Compose +You may use docker-compose to easily setup your game server using the following command: + +`docker-compose up -d` + +that will run the container as a service in the background automatically. +You may change the file content according to your preferences. + +Also if you want to setup your game server via docker-compose without having to build the image every time or even to download this repo, just copy the docker-compose.yml file and comment the line: + +`build: .` + +and uncomment the line: + +`#image: zopanix/factorio:v0.13.13-experimental` + +changing the tag to whatever you want to install. + +This way docker will automatically pull the image from the Docker Hub with the version you specified without the need for any build. + #### Waiting for ready This is a beta feature which has nothing to do with factorio... leave it as it is for the moment. I'm working with some collegues on something new which should work very well and please a lot of people. From 65821df3b2f643de43a799b95556ce72623911ad Mon Sep 17 00:00:00 2001 From: "Brad P. Crochet" Date: Sat, 20 Aug 2016 09:39:47 -0400 Subject: [PATCH 05/33] Add environment support to specify the saves and mods directories. --- .gitignore | 1 + README.md | 12 +++++++++++- docker-compose.yml | 6 +++--- env.sample | 3 +++ 4 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 env.sample diff --git a/.gitignore b/.gitignore index 457c8d97..2b6f6588 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +.env saves mods diff --git a/README.md b/README.md index 63d73477..bc0ca9aa 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Factorio Server in docker Current Version ----- -0.13.13 +0.13.16 ### What's new ? #### Factorio See [factorio's site](http://www.factorio.com) @@ -237,6 +237,16 @@ changing the tag to whatever you want to install. This way docker will automatically pull the image from the Docker Hub with the version you specified without the need for any build. +The saves directory and the mods directory must be specified either in the environment before running `docker-compose up -d`: + +` +export FACTORIO_SAVES_DIR=./save +export FACTORIO_MODS_DIR=./mods +docker-compose up -d +` + +Or, just copy the env.sample to .env and modify as appropriate. + #### Waiting for ready This is a beta feature which has nothing to do with factorio... leave it as it is for the moment. I'm working with some collegues on something new which should work very well and please a lot of people. diff --git a/docker-compose.yml b/docker-compose.yml index d29dede9..d381f265 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,10 +2,10 @@ version: '2' services: game: build: . - #image: zopanix/factorio:v0.13.13-experimental + #image: zopanix/factorio:v0.13.16-experimental volumes: - - ./saves:/opt/factorio/saves - - ./mods:/opt/factorio/mods + - ${FACTORIO_SAVES_DIR}:/opt/factorio/saves:Z + - ${FACTORIO_MODS_DIR}:/opt/factorio/mods:Z ports: - "34197:34197/udp" environment: diff --git a/env.sample b/env.sample new file mode 100644 index 00000000..aaa674f2 --- /dev/null +++ b/env.sample @@ -0,0 +1,3 @@ +FACTORIO_SAVES_DIR=./save +FACTORIO_MODS_DIR=./mods + From 76f63b1f89b3b4a6feb8c10e30b22475a8406ab4 Mon Sep 17 00:00:00 2001 From: Ricardo Marques Date: Fri, 7 Oct 2016 00:50:06 +0100 Subject: [PATCH 06/33] Remove redundant code Fix image comment to new version of factorio --- docker-compose.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index d29dede9..46fc0aef 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,21 +2,14 @@ version: '2' services: game: build: . - #image: zopanix/factorio:v0.13.13-experimental + #image: zopanix/factorio:v0.13.16-experimental volumes: - ./saves:/opt/factorio/saves - ./mods:/opt/factorio/mods ports: - "34197:34197/udp" environment: - - FACTORIO_AUTOSAVE_INTERVAL=10 - - FACTORIO_AUTOSAVE_SLOTS=15 - - FACTORIO_ALLOW_COMMANDS=false - - FACTORIO_NO_AUTO_PAUSE=false networks: - factorio_net restart: always -networks: - factorio_net: - driver: bridge From 7720dce6cc17195220df44951e64f2de5536cb1c Mon Sep 17 00:00:00 2001 From: bkuhl Date: Mon, 8 Aug 2016 19:36:05 +0000 Subject: [PATCH 07/33] Updated to v0.13.14-experimental --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index f9fc7438..f4dcf410 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,8 +19,8 @@ ENV FACTORIO_AUTOSAVE_INTERVAL=2 \ FACTORIO_ALLOW_COMMANDS=false \ FACTORIO_NO_AUTO_PAUSE=false \ FACTORIO_LATENCY_MS=100 \ - VERSION=0.13.13 \ - FACTORIO_SHA1=96fae815a55f5fe9211c44d8de93bbe8662bd24f \ + VERSION=0.13.14 \ + FACTORIO_SHA1=4c611fa0397691f9697482f7f53b0a7379b6cc27 \ FACTORIO_WAITING=false \ FACTORIO_MODE=normal \ FACTORIO_SERVER_NAME= \ From beeea105e62dc194043e44ef6de052fbb2e78c23 Mon Sep 17 00:00:00 2001 From: bkuhl Date: Mon, 8 Aug 2016 19:36:14 +0000 Subject: [PATCH 08/33] Updated to v0.13.15-experimental --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index f4dcf410..9f4feae2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,8 +19,8 @@ ENV FACTORIO_AUTOSAVE_INTERVAL=2 \ FACTORIO_ALLOW_COMMANDS=false \ FACTORIO_NO_AUTO_PAUSE=false \ FACTORIO_LATENCY_MS=100 \ - VERSION=0.13.14 \ - FACTORIO_SHA1=4c611fa0397691f9697482f7f53b0a7379b6cc27 \ + VERSION=0.13.15 \ + FACTORIO_SHA1=794f278544e3b07e661c07de814ebbb2d99f0be7 \ FACTORIO_WAITING=false \ FACTORIO_MODE=normal \ FACTORIO_SERVER_NAME= \ From 9e67c12cbc6277d5375403464ea6e924336bd773 Mon Sep 17 00:00:00 2001 From: Ben Kuhl Date: Wed, 17 Aug 2016 08:16:10 -0400 Subject: [PATCH 09/33] Updated to v0.13.14-experimental --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9f4feae2..f4dcf410 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,8 +19,8 @@ ENV FACTORIO_AUTOSAVE_INTERVAL=2 \ FACTORIO_ALLOW_COMMANDS=false \ FACTORIO_NO_AUTO_PAUSE=false \ FACTORIO_LATENCY_MS=100 \ - VERSION=0.13.15 \ - FACTORIO_SHA1=794f278544e3b07e661c07de814ebbb2d99f0be7 \ + VERSION=0.13.14 \ + FACTORIO_SHA1=4c611fa0397691f9697482f7f53b0a7379b6cc27 \ FACTORIO_WAITING=false \ FACTORIO_MODE=normal \ FACTORIO_SERVER_NAME= \ From 71ddeb2f3771b68d1e86a6c288028d3eac993180 Mon Sep 17 00:00:00 2001 From: bkuhl Date: Wed, 17 Aug 2016 13:11:13 +0000 Subject: [PATCH 10/33] Updated to v0.13.16-experimental --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index f4dcf410..8f857686 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,8 +19,8 @@ ENV FACTORIO_AUTOSAVE_INTERVAL=2 \ FACTORIO_ALLOW_COMMANDS=false \ FACTORIO_NO_AUTO_PAUSE=false \ FACTORIO_LATENCY_MS=100 \ - VERSION=0.13.14 \ - FACTORIO_SHA1=4c611fa0397691f9697482f7f53b0a7379b6cc27 \ + VERSION=0.13.16 \ + FACTORIO_SHA1=52de126ce47bf24b795db07ff83ed13f8f537c0c \ FACTORIO_WAITING=false \ FACTORIO_MODE=normal \ FACTORIO_SERVER_NAME= \ From 31983689fa51ed23cc510fe40848a47b73ebcd03 Mon Sep 17 00:00:00 2001 From: Ben Kuhl Date: Wed, 17 Aug 2016 09:21:46 -0400 Subject: [PATCH 11/33] Showing docker version --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 89d82d38..4cea0045 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,9 @@ services: docker before_install: + - docker -v # set env vars in the build settings to interact with repositories # see https://docs.travis-ci.com/user/environment-variables/#Defining-Variables-in-Repository-Settings - - docker login -e="$DOCKER_EMAIL" -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" + - docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" script: - docker build -t "zopanix/factorio:${TRAVIS_TAG}" . deploy: From 5c449225c0340c2749f31d7c7b4f8e65ecec5111 Mon Sep 17 00:00:00 2001 From: Ben Kuhl Date: Wed, 17 Aug 2016 09:48:04 -0400 Subject: [PATCH 12/33] Reverted to 0.13.15 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8f857686..9f4feae2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,8 +19,8 @@ ENV FACTORIO_AUTOSAVE_INTERVAL=2 \ FACTORIO_ALLOW_COMMANDS=false \ FACTORIO_NO_AUTO_PAUSE=false \ FACTORIO_LATENCY_MS=100 \ - VERSION=0.13.16 \ - FACTORIO_SHA1=52de126ce47bf24b795db07ff83ed13f8f537c0c \ + VERSION=0.13.15 \ + FACTORIO_SHA1=794f278544e3b07e661c07de814ebbb2d99f0be7 \ FACTORIO_WAITING=false \ FACTORIO_MODE=normal \ FACTORIO_SERVER_NAME= \ From d0e90a94b616cf22d32fc1dd242ea0144151d910 Mon Sep 17 00:00:00 2001 From: bkuhl Date: Wed, 17 Aug 2016 13:48:38 +0000 Subject: [PATCH 13/33] Updated to v0.13.16-experimental --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9f4feae2..8f857686 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,8 +19,8 @@ ENV FACTORIO_AUTOSAVE_INTERVAL=2 \ FACTORIO_ALLOW_COMMANDS=false \ FACTORIO_NO_AUTO_PAUSE=false \ FACTORIO_LATENCY_MS=100 \ - VERSION=0.13.15 \ - FACTORIO_SHA1=794f278544e3b07e661c07de814ebbb2d99f0be7 \ + VERSION=0.13.16 \ + FACTORIO_SHA1=52de126ce47bf24b795db07ff83ed13f8f537c0c \ FACTORIO_WAITING=false \ FACTORIO_MODE=normal \ FACTORIO_SERVER_NAME= \ From 9785d47b0d2f095493bcb5230fb59886c3f64a76 Mon Sep 17 00:00:00 2001 From: Ben Kuhl Date: Tue, 20 Sep 2016 13:31:02 -0400 Subject: [PATCH 14/33] Updated to v0.13.20 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8f857686..e994452c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,8 +19,8 @@ ENV FACTORIO_AUTOSAVE_INTERVAL=2 \ FACTORIO_ALLOW_COMMANDS=false \ FACTORIO_NO_AUTO_PAUSE=false \ FACTORIO_LATENCY_MS=100 \ - VERSION=0.13.16 \ - FACTORIO_SHA1=52de126ce47bf24b795db07ff83ed13f8f537c0c \ + VERSION=0.13.20 \ + FACTORIO_SHA1=59ed0edb3f62f0f41a01fc291959b0a8b44cf631 \ FACTORIO_WAITING=false \ FACTORIO_MODE=normal \ FACTORIO_SERVER_NAME= \ From 06929ba4a78502d757a01457a9dd43b5b81e9206 Mon Sep 17 00:00:00 2001 From: Ben Kuhl Date: Tue, 20 Sep 2016 13:31:27 -0400 Subject: [PATCH 15/33] Updated to v0.14.0-experimental --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index e994452c..6cafbd1e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,8 +19,8 @@ ENV FACTORIO_AUTOSAVE_INTERVAL=2 \ FACTORIO_ALLOW_COMMANDS=false \ FACTORIO_NO_AUTO_PAUSE=false \ FACTORIO_LATENCY_MS=100 \ - VERSION=0.13.20 \ - FACTORIO_SHA1=59ed0edb3f62f0f41a01fc291959b0a8b44cf631 \ + VERSION=0.14.0 \ + FACTORIO_SHA1=d3443d564c99693dd17e52b565171cbe8e207c85 \ FACTORIO_WAITING=false \ FACTORIO_MODE=normal \ FACTORIO_SERVER_NAME= \ From 756879a7e34c2a6fc31026b1242b93b418ee97cb Mon Sep 17 00:00:00 2001 From: Ben Kuhl Date: Tue, 20 Sep 2016 13:31:48 -0400 Subject: [PATCH 16/33] Updated to v0.14.1-experimental --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6cafbd1e..7e336b1c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,8 +19,8 @@ ENV FACTORIO_AUTOSAVE_INTERVAL=2 \ FACTORIO_ALLOW_COMMANDS=false \ FACTORIO_NO_AUTO_PAUSE=false \ FACTORIO_LATENCY_MS=100 \ - VERSION=0.14.0 \ - FACTORIO_SHA1=d3443d564c99693dd17e52b565171cbe8e207c85 \ + VERSION=0.14.1 \ + FACTORIO_SHA1=894705c66ed9b2f514a7f459d6cb78ce9849942d \ FACTORIO_WAITING=false \ FACTORIO_MODE=normal \ FACTORIO_SERVER_NAME= \ From 4dde549795b412664f1f374380bbf08680d68aba Mon Sep 17 00:00:00 2001 From: Ben Kuhl Date: Tue, 20 Sep 2016 13:32:14 -0400 Subject: [PATCH 17/33] Updated to v0.14.2-experimental --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7e336b1c..aa5244cf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,8 +19,8 @@ ENV FACTORIO_AUTOSAVE_INTERVAL=2 \ FACTORIO_ALLOW_COMMANDS=false \ FACTORIO_NO_AUTO_PAUSE=false \ FACTORIO_LATENCY_MS=100 \ - VERSION=0.14.1 \ - FACTORIO_SHA1=894705c66ed9b2f514a7f459d6cb78ce9849942d \ + VERSION=0.14.2 \ + FACTORIO_SHA1=09c6651d84bc241f9dcf7ad14ba6f1caeca302a3 \ FACTORIO_WAITING=false \ FACTORIO_MODE=normal \ FACTORIO_SERVER_NAME= \ From 2422f27cd10b116ef35a0e63c9781dc2b52eb4d3 Mon Sep 17 00:00:00 2001 From: Ben Kuhl Date: Tue, 20 Sep 2016 13:32:38 -0400 Subject: [PATCH 18/33] Updated to v0.14.3-experimental --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index aa5244cf..2853a18a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,8 +19,8 @@ ENV FACTORIO_AUTOSAVE_INTERVAL=2 \ FACTORIO_ALLOW_COMMANDS=false \ FACTORIO_NO_AUTO_PAUSE=false \ FACTORIO_LATENCY_MS=100 \ - VERSION=0.14.2 \ - FACTORIO_SHA1=09c6651d84bc241f9dcf7ad14ba6f1caeca302a3 \ + VERSION=0.14.3 \ + FACTORIO_SHA1=632a39fdf567bde656f88abfd7fa0c194dd87b26 \ FACTORIO_WAITING=false \ FACTORIO_MODE=normal \ FACTORIO_SERVER_NAME= \ From e0559edac12dfc8960b991a11c5ab57180db86bc Mon Sep 17 00:00:00 2001 From: Ben Kuhl Date: Tue, 20 Sep 2016 13:33:01 -0400 Subject: [PATCH 19/33] Updated to v0.14.4-experimental --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2853a18a..6d155343 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,8 +19,8 @@ ENV FACTORIO_AUTOSAVE_INTERVAL=2 \ FACTORIO_ALLOW_COMMANDS=false \ FACTORIO_NO_AUTO_PAUSE=false \ FACTORIO_LATENCY_MS=100 \ - VERSION=0.14.3 \ - FACTORIO_SHA1=632a39fdf567bde656f88abfd7fa0c194dd87b26 \ + VERSION=0.14.4 \ + FACTORIO_SHA1=c76e25a907f26ee6a639d5b015db4d8aa772bc43 \ FACTORIO_WAITING=false \ FACTORIO_MODE=normal \ FACTORIO_SERVER_NAME= \ From 10a030a9a20866de1be31f6cf6705d651b219f4c Mon Sep 17 00:00:00 2001 From: Ben Kuhl Date: Tue, 20 Sep 2016 13:33:32 -0400 Subject: [PATCH 20/33] Updated to v0.14.5-experimental --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6d155343..f37f6c3a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,8 +19,8 @@ ENV FACTORIO_AUTOSAVE_INTERVAL=2 \ FACTORIO_ALLOW_COMMANDS=false \ FACTORIO_NO_AUTO_PAUSE=false \ FACTORIO_LATENCY_MS=100 \ - VERSION=0.14.4 \ - FACTORIO_SHA1=c76e25a907f26ee6a639d5b015db4d8aa772bc43 \ + VERSION=0.14.5 \ + FACTORIO_SHA1=54b240aec5aba5f07e8f6eb22071698dac5c5cbf \ FACTORIO_WAITING=false \ FACTORIO_MODE=normal \ FACTORIO_SERVER_NAME= \ From 17c1c8e72de3429c7a749e69ded48957c9e10a78 Mon Sep 17 00:00:00 2001 From: Ben Kuhl Date: Tue, 20 Sep 2016 13:33:54 -0400 Subject: [PATCH 21/33] Updated to v0.14.6-experimental --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index f37f6c3a..11d575f3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,8 +19,8 @@ ENV FACTORIO_AUTOSAVE_INTERVAL=2 \ FACTORIO_ALLOW_COMMANDS=false \ FACTORIO_NO_AUTO_PAUSE=false \ FACTORIO_LATENCY_MS=100 \ - VERSION=0.14.5 \ - FACTORIO_SHA1=54b240aec5aba5f07e8f6eb22071698dac5c5cbf \ + VERSION=0.14.6 \ + FACTORIO_SHA1=ff2ae87c0d47f5b9518d8fcf771220d2173a2292 \ FACTORIO_WAITING=false \ FACTORIO_MODE=normal \ FACTORIO_SERVER_NAME= \ From 7635d23bcc548a81deddeef03ae1efe29a34c0f6 Mon Sep 17 00:00:00 2001 From: Ben Kuhl Date: Tue, 20 Sep 2016 13:34:23 -0400 Subject: [PATCH 22/33] Updated to v0.14.7-experimental --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 11d575f3..3c84de4d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,8 +19,8 @@ ENV FACTORIO_AUTOSAVE_INTERVAL=2 \ FACTORIO_ALLOW_COMMANDS=false \ FACTORIO_NO_AUTO_PAUSE=false \ FACTORIO_LATENCY_MS=100 \ - VERSION=0.14.6 \ - FACTORIO_SHA1=ff2ae87c0d47f5b9518d8fcf771220d2173a2292 \ + VERSION=0.14.7 \ + FACTORIO_SHA1=5b29c61dd91a036135c201c313933cae60c944d0 \ FACTORIO_WAITING=false \ FACTORIO_MODE=normal \ FACTORIO_SERVER_NAME= \ From a7467c4eff9bb3b03aa051fc78e69e61827f0fed Mon Sep 17 00:00:00 2001 From: Zopanix Date: Tue, 20 Sep 2016 13:41:23 -0400 Subject: [PATCH 23/33] Trying to fix master build of the travis CI This was caused because when building on master, the travis_tag variable is empty, causing the build to fail --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4cea0045..a96ff5ba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,11 @@ before_install: # see https://docs.travis-ci.com/user/environment-variables/#Defining-Variables-in-Repository-Settings - docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" script: - - docker build -t "zopanix/factorio:${TRAVIS_TAG}" . + - | + if [ -z "$TRAVIS_TAG" ]; then + TRAVIS_TAG="latest" + fi + docker build -t "zopanix/factorio:${TRAVIS_TAG}" . deploy: provider: script script: docker tag "zopanix/factorio:${TRAVIS_TAG}" "zopanix/factorio:latest" && docker push "zopanix/factorio:${TRAVIS_TAG}" && docker push "zopanix/factorio:latest" From 2dcd0c3c12b7665bd23a2c7c123969d95c85398a Mon Sep 17 00:00:00 2001 From: Zopanix Date: Tue, 20 Sep 2016 13:50:34 -0400 Subject: [PATCH 24/33] Changed readme --- README.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 45d01636..cff86658 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,10 @@ Factorio Server in docker [![Build Status](https://travis-ci.org/zopanix/docker_factorio_server.svg?branch=master)](https://travis-ci.org/zopanix/docker_factorio_server) -Current Version +Versions ----- -0.13.13 +Please checkout the different [tags](https://hub.docker.com/r/zopanix/factorio/tags/) + ### What's new ? #### Factorio See [factorio's site](http://www.factorio.com) @@ -14,9 +15,6 @@ See [factorio's site](http://www.factorio.com) * New semver for version !!!Tags have changed now!!! * Automated build with travis -Versions ------ -I'm keeping the image up to date. If you need to use an older version, checkout out the different [tags](https://hub.docker.com/r/zopanix/factorio/tags/). How to use ? ----- From 6f863fc1ec44e0ae95706fb5d2c113d7bb725d77 Mon Sep 17 00:00:00 2001 From: Ben Kuhl Date: Tue, 20 Sep 2016 13:58:15 -0400 Subject: [PATCH 25/33] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cff86658..0cc71501 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Factorio ===== Factorio Server in docker -[![Build Status](https://travis-ci.org/zopanix/docker_factorio_server.svg?branch=master)](https://travis-ci.org/zopanix/docker_factorio_server) +[![Build Status](https://travis-ci.org/zopanix/docker_factorio_server.svg?branch=master)](https://travis-ci.org/zopanix/docker_factorio_server) [![Docker Pulls](https://img.shields.io/docker/pulls/zopanix/factorio.svg?maxAge=2592000)](https://hub.docker.com/r/zopanix/factorio/) Versions ----- From b9347a8b70d8cd2628047f099a40d1e8954ef98b Mon Sep 17 00:00:00 2001 From: Ben Kuhl Date: Tue, 20 Sep 2016 13:58:44 -0400 Subject: [PATCH 26/33] Update README.md --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 0cc71501..9ffba510 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,7 @@ -Factorio +Factorio [![Build Status](https://travis-ci.org/zopanix/docker_factorio_server.svg?branch=master)](https://travis-ci.org/zopanix/docker_factorio_server) [![Docker Pulls](https://img.shields.io/docker/pulls/zopanix/factorio.svg?maxAge=2592000)](https://hub.docker.com/r/zopanix/factorio/) ===== Factorio Server in docker -[![Build Status](https://travis-ci.org/zopanix/docker_factorio_server.svg?branch=master)](https://travis-ci.org/zopanix/docker_factorio_server) [![Docker Pulls](https://img.shields.io/docker/pulls/zopanix/factorio.svg?maxAge=2592000)](https://hub.docker.com/r/zopanix/factorio/) - Versions ----- Please checkout the different [tags](https://hub.docker.com/r/zopanix/factorio/tags/) From 1d5021044900121b68e580bf0dabf7c4bef8add9 Mon Sep 17 00:00:00 2001 From: bkuhl Date: Tue, 20 Sep 2016 21:45:28 +0000 Subject: [PATCH 27/33] Updated to v0.14.8-experimental --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3c84de4d..f2350491 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,8 +19,8 @@ ENV FACTORIO_AUTOSAVE_INTERVAL=2 \ FACTORIO_ALLOW_COMMANDS=false \ FACTORIO_NO_AUTO_PAUSE=false \ FACTORIO_LATENCY_MS=100 \ - VERSION=0.14.7 \ - FACTORIO_SHA1=5b29c61dd91a036135c201c313933cae60c944d0 \ + VERSION=0.14.8 \ + FACTORIO_SHA1=db71bd07aeb8b3775c9254597eaf5af858c84b7d \ FACTORIO_WAITING=false \ FACTORIO_MODE=normal \ FACTORIO_SERVER_NAME= \ From e58f7bf9589c3378fbd5f2997b75406944544ebd Mon Sep 17 00:00:00 2001 From: Ricardo Marques Date: Thu, 4 Aug 2016 02:34:55 +0100 Subject: [PATCH 28/33] Add docker-compose file --- .gitignore | 3 +++ docker-compose.yml | 22 ++++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 .gitignore create mode 100644 docker-compose.yml diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..457c8d97 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +saves +mods + diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 00000000..d29dede9 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,22 @@ +version: '2' +services: + game: + build: . + #image: zopanix/factorio:v0.13.13-experimental + volumes: + - ./saves:/opt/factorio/saves + - ./mods:/opt/factorio/mods + ports: + - "34197:34197/udp" + environment: + - FACTORIO_AUTOSAVE_INTERVAL=10 + - FACTORIO_AUTOSAVE_SLOTS=15 + - FACTORIO_ALLOW_COMMANDS=false + - FACTORIO_NO_AUTO_PAUSE=false + networks: + - factorio_net + restart: always + +networks: + factorio_net: + driver: bridge From 764ab1acbadc347f1cd49e4f0d77ca2fe20702c7 Mon Sep 17 00:00:00 2001 From: Ricardo Marques Date: Thu, 4 Aug 2016 02:50:25 +0100 Subject: [PATCH 29/33] Add docker-compose instructions to Readme.md --- README.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/README.md b/README.md index 9ffba510..1a6480a8 100644 --- a/README.md +++ b/README.md @@ -213,6 +213,26 @@ Error Util.cpp:57: Unknown error ``` Check supplied Username and Password for mistakes. +### Docker Compose +You may use docker-compose to easily setup your game server using the following command: + +`docker-compose up -d` + +that will run the container as a service in the background automatically. +You may change the file content according to your preferences. + +Also if you want to setup your game server via docker-compose without having to build the image every time or even to download this repo, just copy the docker-compose.yml file and comment the line: + +`build: .` + +and uncomment the line: + +`#image: zopanix/factorio:v0.13.13-experimental` + +changing the tag to whatever you want to install. + +This way docker will automatically pull the image from the Docker Hub with the version you specified without the need for any build. + #### Waiting for ready This is a beta feature which has nothing to do with factorio... leave it as it is for the moment. I'm working with some collegues on something new which should work very well and please a lot of people. From bd940bb2ed1297d21d88f401004d89a40049d670 Mon Sep 17 00:00:00 2001 From: "Brad P. Crochet" Date: Sat, 20 Aug 2016 09:39:47 -0400 Subject: [PATCH 30/33] Add environment support to specify the saves and mods directories. --- .gitignore | 1 + README.md | 10 ++++++++++ docker-compose.yml | 6 +++--- env.sample | 3 +++ 4 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 env.sample diff --git a/.gitignore b/.gitignore index 457c8d97..2b6f6588 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +.env saves mods diff --git a/README.md b/README.md index 1a6480a8..58da7c07 100644 --- a/README.md +++ b/README.md @@ -233,6 +233,16 @@ changing the tag to whatever you want to install. This way docker will automatically pull the image from the Docker Hub with the version you specified without the need for any build. +The saves directory and the mods directory must be specified either in the environment before running `docker-compose up -d`: + +` +export FACTORIO_SAVES_DIR=./save +export FACTORIO_MODS_DIR=./mods +docker-compose up -d +` + +Or, just copy the env.sample to .env and modify as appropriate. + #### Waiting for ready This is a beta feature which has nothing to do with factorio... leave it as it is for the moment. I'm working with some collegues on something new which should work very well and please a lot of people. diff --git a/docker-compose.yml b/docker-compose.yml index d29dede9..d381f265 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,10 +2,10 @@ version: '2' services: game: build: . - #image: zopanix/factorio:v0.13.13-experimental + #image: zopanix/factorio:v0.13.16-experimental volumes: - - ./saves:/opt/factorio/saves - - ./mods:/opt/factorio/mods + - ${FACTORIO_SAVES_DIR}:/opt/factorio/saves:Z + - ${FACTORIO_MODS_DIR}:/opt/factorio/mods:Z ports: - "34197:34197/udp" environment: diff --git a/env.sample b/env.sample new file mode 100644 index 00000000..aaa674f2 --- /dev/null +++ b/env.sample @@ -0,0 +1,3 @@ +FACTORIO_SAVES_DIR=./save +FACTORIO_MODS_DIR=./mods + From 0c6918455e3d480c2a65b5cf018004ceeabcc6e3 Mon Sep 17 00:00:00 2001 From: Ricardo Marques Date: Fri, 7 Oct 2016 00:50:06 +0100 Subject: [PATCH 31/33] Remove redundant code Fix image comment to new version of factorio --- docker-compose.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index d381f265..4aef0df1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,14 +9,7 @@ services: ports: - "34197:34197/udp" environment: - - FACTORIO_AUTOSAVE_INTERVAL=10 - - FACTORIO_AUTOSAVE_SLOTS=15 - - FACTORIO_ALLOW_COMMANDS=false - - FACTORIO_NO_AUTO_PAUSE=false networks: - factorio_net restart: always -networks: - factorio_net: - driver: bridge From 1bc383519a7791a08b92bc2a3780fa50959030fa Mon Sep 17 00:00:00 2001 From: Ricardo Marques Date: Fri, 7 Oct 2016 01:16:36 +0100 Subject: [PATCH 32/33] Make tag in comment and README version independent --- README.md | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 58da7c07..ecc0e9f6 100644 --- a/README.md +++ b/README.md @@ -227,7 +227,7 @@ Also if you want to setup your game server via docker-compose without having to and uncomment the line: -`#image: zopanix/factorio:v0.13.13-experimental` +`#image: zopanix/factorio:TAG` changing the tag to whatever you want to install. diff --git a/docker-compose.yml b/docker-compose.yml index 4aef0df1..bd0c4693 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: '2' services: game: build: . - #image: zopanix/factorio:v0.13.16-experimental + #image: zopanix/factorio:TAG volumes: - ${FACTORIO_SAVES_DIR}:/opt/factorio/saves:Z - ${FACTORIO_MODS_DIR}:/opt/factorio/mods:Z From 22d2bf6ddde68d0ba1b1de25bbf6804f69dd7f6a Mon Sep 17 00:00:00 2001 From: Ricardo Marques Date: Fri, 7 Oct 2016 01:22:51 +0100 Subject: [PATCH 33/33] Fix leftovers of merge in README --- README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/README.md b/README.md index 0b0d289b..ecc0e9f6 100644 --- a/README.md +++ b/README.md @@ -4,12 +4,8 @@ Factorio Server in docker Versions ----- -<<<<<<< HEAD Please checkout the different [tags](https://hub.docker.com/r/zopanix/factorio/tags/) -======= -0.13.16 ->>>>>>> a44ab07ddb4347e874405f792ff2f90659110e46 ### What's new ? #### Factorio See [factorio's site](http://www.factorio.com)