#187 tag docker image also with version from package.json if on maste…

…r branch. push "latest" and "[version]" to docker hub...

.travis.yml

@@ -28,5 +28,5 @@ script:
 after_success:
  - if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
    docker login --username="$DOCKER_USERNAME" --password="$DOCKER_PASSWORD";
-   docker push xeronimus/poinz;
+   docker push --all-tags xeronimus/poinz;
    fi

build/dockerImage.js

@@ -14,6 +14,7 @@ const fs = Promise.promisifyAll(require('fs-extra'));
 const {exec} = require('child_process');
 const {spawn} = require('cross-spawn');
 const del = require('del');
+const pkg = require('../package.json');
 
 const execPromised = Promise.promisify(exec);
 
@@ -96,7 +97,11 @@ function startBuildingDockerImage(gitInfo) {
   console.log(`building docker container for ${gitInfo.hash} on ${gitInfo.branch}`);
 
   const userAndProject = 'xeronimus/poinz';
-  const cmdArgs = `build -t ${userAndProject}:latest -t ${HEROKU_DEPLOYMENT_TAG} .`;
+  const tags = [`${userAndProject}:latest`, HEROKU_DEPLOYMENT_TAG];
+  if (gitInfo.branch === 'master') {
+    tags.push(`${userAndProject}:${pkg.version}`);
+  }
+  const cmdArgs = `build ${tags.map(tg => '-t ' + tg).join(' ')} .`;
 
   return spawnAndPrint('docker', cmdArgs.split(' '), {cwd: path.resolve(__dirname, '..')});
 }