Merge pull request #6 from VirdocsSoftware/docker-build-fix

Fixing package.json tag

Author: ScottKelly

Jenkinsfile

@@ -6,17 +6,19 @@ stage('publish') {
 		env.TAG_NAME = shWithReturn('git describe --exact-match --tags HEAD || :');
 
 		if(isTagBuild()) {
-			env.DOCKER_TAG = dockerTag(env.TAG_NAME.substring(0, env.TAG_NAME.length() - 1));
+			env.TAG_NAME = env.TAG_NAME.substring(0, env.TAG_NAME.length() - 1);
+			env.DOCKER_TAG = dockerTag(env.TAG_NAME);
 			env.NPM_TAG = 'stable';
 		} else {
+			env.TAG_NAME = "";
 			env.DOCKER_TAG = "";
 			env.NPM_TAG = "";
 		}
 
 		if(env.DOCKER_TAG != "") {
 			withCredentials([string(credentialsId: 'npm-token', variable: 'NPM_TOKEN')]) {
 				sh 'sudo -E docker build --build-arg NPM_TOKEN=$NPM_TOKEN -t ${DOCKER_TAG} .';
-				sh 'sudo -E docker run -e "NPM_TOKEN=$NPM_TOKEN" ${DOCKER_TAG} bash -c "npm --no-git-tag-version version ${DOCKER_TAG} && npm publish --tag ${NPM_TAG}"';
+				sh 'sudo -E docker run -e "NPM_TOKEN=$NPM_TOKEN" ${DOCKER_TAG} bash -c "npm --no-git-tag-version version ${TAG_NAME} && npm publish --tag ${NPM_TAG}"';
 				sh "sudo -E docker push ${DOCKER_TAG}";
 			}
 		}