From 7bc937606d9a477bdba3a81a2b40384d742623e4 Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Fri, 24 Apr 2015 01:57:54 -0400 Subject: [PATCH 1/3] finalize deployment --- docker/default-packages.sh | 0 docker/launch-devel.sh | 0 docker/launch-production.sh | 2 +- docker/prepare.sh | 0 4 files changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 docker/default-packages.sh mode change 100644 => 100755 docker/launch-devel.sh mode change 100644 => 100755 docker/launch-production.sh mode change 100644 => 100755 docker/prepare.sh diff --git a/docker/default-packages.sh b/docker/default-packages.sh old mode 100644 new mode 100755 diff --git a/docker/launch-devel.sh b/docker/launch-devel.sh old mode 100644 new mode 100755 diff --git a/docker/launch-production.sh b/docker/launch-production.sh old mode 100644 new mode 100755 index b64b228..3a74d33 --- a/docker/launch-production.sh +++ b/docker/launch-production.sh @@ -18,4 +18,4 @@ fi echo Run this script from the project root folder! -docker run -it --rm -e "PORT=8080" --volumes-from=data-docker-home -v ${PWD}:/working -w /working -p 80:8080 adamarthurryan/mean grunt serve:dist +docker run -it --rm -e "PORT=8080" --volumes-from=data-docker-home -v ${PWD}:/working -w /working -p 8081:8080 adamarthurryan/mean grunt serve:dist diff --git a/docker/prepare.sh b/docker/prepare.sh old mode 100644 new mode 100755 From 573b6b32e2bc6c195d4e90dbe1f1aef6bcae7958 Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Tue, 26 May 2015 11:29:41 -0400 Subject: [PATCH 2/3] fix path to wdiff binary --- server/components/wdiff/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/components/wdiff/index.js b/server/components/wdiff/index.js index fa7532f..1bb5ae6 100644 --- a/server/components/wdiff/index.js +++ b/server/components/wdiff/index.js @@ -43,7 +43,7 @@ module.exports = function(a, b, asMarkdown, callback) { if (err) return callback(err); - var cmd = "wdiff " + filea.path + " " +fileb.path; + var cmd = "./bin/wdiff " + filea.path + " " +fileb.path; exec(cmd, function(err, stdout) { if (err && err.code!=1 && err.code!=0) { From f81f54a610ca9f168822d44a4bf11ffb748fbc8e Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Fri, 29 May 2015 13:44:16 -0400 Subject: [PATCH 3/3] production docker container will now restart on failure indefinitely --- docker/launch-production.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/launch-production.sh b/docker/launch-production.sh index 3a74d33..1e0fa70 100755 --- a/docker/launch-production.sh +++ b/docker/launch-production.sh @@ -18,4 +18,4 @@ fi echo Run this script from the project root folder! -docker run -it --rm -e "PORT=8080" --volumes-from=data-docker-home -v ${PWD}:/working -w /working -p 8081:8080 adamarthurryan/mean grunt serve:dist +docker run --restart=always -it -e "PORT=8080" --volumes-from=data-docker-home -v ${PWD}:/working -w /working -p 8081:8080 adamarthurryan/mean grunt serve:dist