change to mcr images

microsoft · Jun 22, 2018 · 24a35f2 · 24a35f2
1 parent 62cf0f2
commit 24a35f2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 16 deletions.
diff --git a/assets/solution/deployment.template.json b/assets/solution/deployment.template.json
@@ -15,7 +15,7 @@
           "edgeAgent": {
             "type": "docker",
             "settings": {
-              "image": "edgeshared.azurecr.io/microsoft/azureiotedge-agent:13885920-linux-amd64",
+              "image": "mcr.microsoft.com/azureiotedge-agent:1.0",
               "createOptions": ""
             }
           },
@@ -24,7 +24,7 @@
             "status": "running",
             "restartPolicy": "always",
             "settings": {
-              "image": "edgeshared.azurecr.io/microsoft/azureiotedge-hub:13885920-linux-amd64",
+              "image": "mcr.microsoft.com/azureiotedge-hub:1.0",
               "createOptions": "{\"HostConfig\":{\"PortBindings\":{\"8883/tcp\":[{\"HostPort\":\"8883\"}],\"443/tcp\":[{\"HostPort\":\"443\"}]}}}"
             }
           }
@@ -36,7 +36,7 @@
             "status": "running",
             "restartPolicy": "always",
             "settings": {
-              "image": "edgeshared.azurecr.io/microsoft/azureiotedge-simulated-temperature-sensor:13885920-linux-amd64",
+              "image": "mcr.microsoft.com/azureiotedge-simulated-temperature-sensor:1.0",
               "createOptions": ""
             }
           },

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "azure-iot-edge",
   "displayName": "Azure IoT Edge",
   "description": "Develop, deploy, debug, and manage your IoT Edge solution",
-  "version": "0.5.0-private4",
+  "version": "0.5.0-privatemcr",
   "publisher": "vsciot-vscode",
   "aiKey": "95b20d64-f54f-4de3-8ad5-165a75a6c6fe",
   "icon": "logo.png",

diff --git a/src/edge/edgeManager.ts b/src/edge/edgeManager.ts
@@ -46,18 +46,7 @@ export class EdgeManager {
 
         await this.addModule(targetModulePath, moduleName, repositoryName, template, outputChannel);
 
-        // TODO: remove after bug bash
-        const registries = {
-            EdgeShared: {
-                username: "EdgeShared",
-                password: "$CONTAINER_REGISTRY_PASSWORD_edgeshared",
-                address: "edgeshared.azurecr.io",
-            },
-        };
-        await fse.ensureFile(envFilePath);
-        await fse.appendFile(envFilePath, "CONTAINER_REGISTRY_PASSWORD_edgeshared=\n", { encoding: "utf8" });
-
-        const result = await this.updateRegistrySettings(registryAddress, registries, envFilePath);
+        const result = await this.updateRegistrySettings(registryAddress, {}, envFilePath);
         const mapObj: Map<string, string> = new Map<string, string>();
         mapObj.set(Constants.moduleNamePlaceholder, moduleName);
         mapObj.set(Constants.moduleImagePlaceholder, imageName);