From 73c4429ec8a575a3ba7bdb829649c6dd305d40d1 Mon Sep 17 00:00:00 2001 From: Arunoda Susiripala Date: Fri, 25 Sep 2015 16:15:38 +0530 Subject: [PATCH 1/3] Updated nodemiral --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 25c89df..72fed62 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "async": "^0.9.0", "cjson": "0.3.x", "colors": "0.6.x", - "nodemiral": "^1.0.1", + "nodemiral": "^1.1.1", "rimraf": "2.x.x", "underscore": "1.7.0", "uuid": "1.4.x", From e5c45821fcd3e69eb588a13c92a3785eaa1b1a47 Mon Sep 17 00:00:00 2001 From: Arunoda Susiripala Date: Fri, 25 Sep 2015 16:15:50 +0530 Subject: [PATCH 2/3] 1.5.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 72fed62..9adaa2a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mupx", - "version": "1.5.2", + "version": "1.5.3", "description": "Production Quality Meteor Deployments", "dependencies": { "async": "^0.9.0", From 1e24ed285af090b85473bbf35d6977fbe179ad22 Mon Sep 17 00:00:00 2001 From: Anthony Hinsinger Date: Thu, 12 Nov 2015 11:45:37 +0100 Subject: [PATCH 3/3] Added docker network to setup and deploy --- scripts/linux/install-docker.sh | 9 +++++++++ scripts/linux/install-mongodb.sh | 3 ++- templates/linux/start.sh | 5 +++-- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/scripts/linux/install-docker.sh b/scripts/linux/install-docker.sh index 9f66a0f..e15c3f7 100644 --- a/scripts/linux/install-docker.sh +++ b/scripts/linux/install-docker.sh @@ -20,3 +20,12 @@ if [ ! "$haveDocker" ]; then # Install docker wget -qO- https://get.docker.com/ | sudo sh fi + +set +e +haveDockerNet=$(sudo docker network ls | grep "mupnet") +set -e + +if [ ! "$haveDockerNet" ]; then + # Create a docker network + sudo docker network create --driver=bridge mupnet +fi diff --git a/scripts/linux/install-mongodb.sh b/scripts/linux/install-mongodb.sh index a7ca03f..4f7cb09 100644 --- a/scripts/linux/install-mongodb.sh +++ b/scripts/linux/install-mongodb.sh @@ -16,5 +16,6 @@ sudo docker run \ --publish=127.0.0.1:27017:27017 \ --volume=/var/lib/mongodb:/data/db \ --volume=/opt/mongodb/mongodb.conf:/mongodb.conf \ + --net=mupnet \ --name=mongodb \ - mongo mongod -f /mongodb.conf \ No newline at end of file + mongo mongod -f /mongodb.conf diff --git a/templates/linux/start.sh b/templates/linux/start.sh index 2645942..fd869b0 100644 --- a/templates/linux/start.sh +++ b/templates/linux/start.sh @@ -25,9 +25,9 @@ if [ "$USE_LOCAL_MONGO" == "1" ]; then --publish=$PORT:80 \ --volume=$BUNDLE_PATH:/bundle \ --env-file=$ENV_FILE \ - --link=mongodb:mongodb \ --hostname="$HOSTNAME-$APPNAME" \ --env=MONGO_URL=mongodb://mongodb:27017/$APPNAME \ + --net=mupnet \ --name=$APPNAME \ meteorhacks/meteord:base else @@ -38,6 +38,7 @@ else --volume=$BUNDLE_PATH:/bundle \ --hostname="$HOSTNAME-$APPNAME" \ --env-file=$ENV_FILE \ + --net=mupnet \ --name=$APPNAME \ meteorhacks/meteord:base fi @@ -56,4 +57,4 @@ fi --publish=<%= sslConfig.port %>:443 \ --name=$APPNAME-frontend \ meteorhacks/mup-frontend-server /start.sh -<% } %> \ No newline at end of file +<% } %>