Merge pull request docker-archive#433 from docker/public-azure

Updated template and version for public marketplace VHD

Author: nathanleclaire

Makefile

@@ -7,7 +7,7 @@ CHANNEL_DDC := alpha
 CHANNEL_CLOUD := alpha
 DOCKER_EXPERIMENTAL := 1
 VHD_SKU := docker4azure
-VHD_VERSION := 1.12.15
+VHD_VERSION := 1.12.18
 export
 
 release: moby/alpine/cloud/aws/ami_id.out moby/alpine/cloud/azure/vhd_blob_url.out dockerimages

azure/templates/editions.template.json

@@ -178,7 +178,7 @@
     "storageLocation": "[resourceGroup().location]",
     "dockerForIAASVersion": "azure-v1.12.1-beta5",
     "imagePublisher": "docker",
-    "imageOffer": "docker4azure-preview",
+    "imageOffer": "docker4azure",
     "imageSku": "docker4azure",
     "imageVersion": "1.12.11",
     "imageReference": {