Feature: Don't duplicate docker build and include package version in tag (#35)

.ci/publish.yml

@@ -3,33 +3,34 @@ trigger:
 
 pr: none
 
+
 stages:
   - stage: Build_Docker
     jobs:
       - job: Build_Docker
+        displayName: Build and publish to hub.docker.com
         pool:
           vmImage: "Ubuntu-16.04"
+        variables:
+          build_counter: $[counter('versioncounter', 1)]
         steps:
+          - script: |
+              version=$(npm run -s get-version)
+              echo "Current package version is $version"
+              echo "Current build number is $(build_counter)"
+
+              echo "##vso[build.updatebuildnumber]$version.$(build_counter)"
+              echo "##vso[task.setvariable variable=NpmVersion]$version"
+            displayName: Resolve package version
           - task: Docker@2
             displayName: "Build azuredevx/git-rest-api"
             inputs:
               containerRegistry: "git-rest-api docker"
               repository: "azuredevx/git-rest-api"
               tags: |
-                $(Build.BuildId)
+                $(Build.BuildNumber)
+                $(NpmVersion)-latest
                 latest
-  - stage: Publish_Docker
-    dependsOn: Build_Docker
-    jobs:
-      - job: Publish_Docker
-        pool:
-          vmImage: "Ubuntu-16.04"
-        steps:
-          - task: Docker@2
-            displayName: "Push azuredevx/git-rest-api"
-            inputs:
-              containerRegistry: "git-rest-api docker"
-              repository: "azuredevx/git-rest-api"
 
   - stage: build_sdks
     displayName: Build SDKs

package.json

@@ -4,6 +4,7 @@
   "description": "This project welcomes contributions and suggestions.  Most contributions require you to agree to a\r Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us\r the rights to use your contribution. For details, visit https://cla.microsoft.com.",
   "main": "bin/main.js",
   "scripts": {
+    "get-version": "echo $npm_package_version",
     "build": "tsc -p config/tsconfig.build.json",
     "build:watch": "npm run -s build -- --watch",
     "start": "npm run build && node ./bin/main.js",