Merge branch '1.4.2'

Author: zodern

docs/docs.md

@@ -445,7 +445,7 @@ And then add a docker setup hook to login to your private registry on the server
 
 ### Image Port
 
-You can set `meteor.docker.port` to the port to expose from the container. This does not affect the port the app is accessed on, only the port the app runs on inside the docker container.
+You can set `meteor.docker.imagePort` to the port to expose from the container. This does not affect the port the app is accessed on, only the port the app runs on inside the docker container.
 
 ## Reverse Proxy
 
@@ -1193,6 +1193,10 @@ Runs the nodemiral task list, and returns a promise. If any of the tasks fail, i
 
 Returns a promise. Shows the logs to the user, prefixing the host to each line.
 
+#### **commandHistory**
+
+Array of objects. Each object is in the format of `{name: 'plugin.commandName'}`, and shows what commands have already been run and in what order.
+
 #### **runSSHCommand(server, command)**
 server is an object from `servers` in the config
 

src/__tests__/plugin-api.unit.js

@@ -46,6 +46,9 @@ describe('PluginAPI', () => {
     it('should have "program"', () => {
       expect(api).has.property('program');
     });
+    it('should have "commandHistory"', () => {
+      expect(api).has.property('commandHistory');
+    });
   });
   describe('utils', () => {
     it('should have resolvePath', () => {
@@ -244,6 +247,11 @@ describe('PluginAPI', () => {
           console.log(e);
         });
     });
+
+    it('should update commandHistory', () => {
+      api.runCommand('test.logs');
+      expect(api.commandHistory).to.deep.equal([{name: 'test.logs'}]);
+    });
   });
 
   describe('getSessions', () => {

src/plugin-api.js

@@ -30,6 +30,7 @@ export default class PluginAPI {
     this.settingsPath = program.settings;
     this.verbose = program.verbose;
     this.program = program;
+    this.commandHistory = [];
 
     this.validationErrors = [];
 
@@ -257,17 +258,21 @@ export default class PluginAPI {
     }
   };
   _commandErrorHandler(e) {
+    log('_commandErrorHandler');
     process.exitCode = 1;
 
     // Only show error when not from nodemiral
     // since nodemiral would have already shown the error
     if (!(e.nodemiralHistory instanceof Array)) {
+      log('_commandErrorHandler: nodemiral error');
       console.error(e.stack || e);
     }
 
     if (e.solution) {
       console.log(chalk.yellow(e.solution));
     }
+
+    process.exit(1);
   }
   runCommand = async function(name) {
     if (!name) {
@@ -277,14 +282,16 @@ export default class PluginAPI {
     if (!(name in commands)) {
       throw new Error(`Unknown command name: ${name}`);
     }
+
+    this.commandHistory.push({ name });
+
     await this._runPreHooks(name);
     let potentialPromise;
     try {
       log('Running command', name);
       potentialPromise = commands[name].handler(this, nodemiral);
     } catch (e) {
       this._commandErrorHandler(e);
-      process.exit(1);
     }
 
     if (potentialPromise && typeof potentialPromise.then === 'function') {

src/plugins/default/command-handlers.js

@@ -33,14 +33,8 @@ export function setup(api) {
   });
 
   log('exec => mup setup');
-  const config = api.getConfig();
 
-  return api.runCommand('docker.setup')
-    .then(() => {
-      if (config.proxy) {
-        return api.runCommand('proxy.setup');
-      }
-    });
+  return api.runCommand('docker.setup');
 }
 
 export function start() {

src/plugins/meteor/assets/meteor-deploy-check.sh

@@ -5,8 +5,10 @@ APP_PATH=/opt/$APPNAME
 IMAGE=mup-<%= appName.toLowerCase() %>
 START_SCRIPT=$APP_PATH/config/start.sh
 DEPLOY_CHECK_WAIT_TIME=<%= deployCheckWaitTime %>
-CONTAINER_IP=$(docker inspect $APPNAME --format "{{.NetworkSettings.IPAddress}}")
-DEPLOY_CHECK_URL=$CONTAINER_IP<%= `:${deployCheckPort}` %>
+
+# Check if using host network.
+$(docker inspect $APPNAME --format "{{(index .NetworkSettings.Networks)}}" | grep -q '\[host')
+HOST_NETWORK=$?
 
 cd $APP_PATH
 
@@ -52,7 +54,11 @@ while [[ true ]]; do
 
   # If the container restarted, the ip address would have changed
   # Get the current ip address right before it is used
-  CONTAINER_IP=$(docker inspect $APPNAME --format "{{.NetworkSettings.IPAddress}}")
+  if [[ $HOST_NETWORK == 0 ]]; then
+    CONTAINER_IP="localhost"
+  else
+    CONTAINER_IP=$(docker inspect $APPNAME --format "{{.NetworkSettings.IPAddress}}")
+  fi
 
   if [[ -z $CONTAINER_IP ]]; then
     echo "Container has no IP Address, likely from it restarting."

src/plugins/meteor/assets/templates/start.sh

@@ -53,8 +53,11 @@ sudo docker network disconnect bridge -f $APPNAME-nginx-proxy
 if [ $LOCAL_IMAGE == "false" ]; then
   set +e
   sudo docker pull <%= docker.image %>
-  set -e
   echo "Pulled <%= docker.image %>"
+  set -e
+
+else
+  set -e
 fi
 
 sudo docker run \
@@ -94,7 +97,6 @@ sudo cat <<EOT > /opt/$APPNAME/config/nginx-default.conf
 client_max_body_size $CLIENTSIZE;
 EOT
 
-
     # We don't need to fail the deployment because of a docker hub downtime
     set +e
     sudo docker pull jrcs/letsencrypt-nginx-proxy-companion:$LETS_ENCRYPT_VERSION

src/plugins/meteor/utils.js

@@ -1,15 +1,14 @@
 export function checkAppStarted(list, api) {
   const script = api.resolvePath(__dirname, 'assets/meteor-deploy-check.sh');
-  const { app, proxy } = api.getConfig();
-  const exposedPort = app.deployCheckPort || app.env.PORT || 80;
-  const publishedPort = 80;
+  const { app } = api.getConfig();
+  const publishedPort = app.docker.imagePort || 80;
 
   list.executeScript('Verifying Deployment', {
     script,
     vars: {
       deployCheckWaitTime: app.deployCheckWaitTime || 60,
       appName: app.name,
-      deployCheckPort: proxy ? publishedPort : exposedPort
+      deployCheckPort: publishedPort
     }
   });
 

src/plugins/proxy/index.js

@@ -34,6 +34,14 @@ export const hooks = {
     if (api.getConfig().proxy) {
       api.runCommand('proxy.status');
     }
+  },
+  'post.meteor.setup'(api) {
+    // Only run hook on "mup setup"
+    const dockerSetup = api.commandHistory.find(({ name }) => name === 'default.setup');
+
+    if (api.getConfig().proxy && dockerSetup) {
+      return api.runCommand('proxy.setup');
+    }
   }
 };