iotedgedev 3.3.4__zip

s/docker/tool/windows/Dockerfile.base

@@ -0,0 +1,63 @@
+FROM microsoft/windowsservercore:1709 AS base
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+ARG PYTHON2_VERSION
+ARG PYTHON3_VERSION
+ENV NODEJS_VERSION 8.11.1
+ENV DOTNETCORESDK_VERSION 2.1.402
+ENV DOCKER_VERSION 17.09.0
+ENV GIT_VERSION 2.18.0
+ENV DESTINATION_FOLDER C:\\tools
+WORKDIR /tmp
+RUN $python_url = ('https://www.python.org/ftp/python/{0}/python-{0}.amd64.msi' -f $env:PYTHON2_VERSION); \
+    Write-Host ('Downloading {0}...' -f $python_url); \
+    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+    (New-Object System.Net.WebClient).DownloadFile($python_url, '/tmp/python2-installer.msi'); \
+    $install_folder = Join-Path -Path $env:DESTINATION_FOLDER -ChildPath 'python2'; \
+    Write-Host ('Installing into {0}...' -f $install_folder); \
+    Start-Process python2-installer.msi -Wait -ArgumentList @('/quiet', 'InstallAllUsers=1', 'TargetDir={0}' -f $install_folder, 'PrependPath=1', 'Shortcuts=0', 'Include_doc=0','Include_pip=1', 'Include_test=0');    
+RUN $python_url = ('https://www.python.org/ftp/python/{0}/python-{0}-amd64.exe' -f $env:PYTHON3_VERSION); \
+    Write-Host ('Downloading {0}...' -f $python_url); \
+    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+    (New-Object System.Net.WebClient).DownloadFile($python_url, '/tmp/python3-installer.exe'); \
+    $install_folder = Join-Path -Path $env:DESTINATION_FOLDER -ChildPath 'python3'; \
+    Write-Host ('Installing into {0}...' -f $install_folder); \
+    Start-Process python3-installer.exe -Wait -ArgumentList @('/quiet', 'InstallAllUsers=1', 'TargetDir={0}' -f $install_folder, 'PrependPath=1', 'Shortcuts=0', 'Include_doc=0','Include_pip=1', 'Include_test=0');     
+RUN $node_url = ('https://nodejs.org/dist/v{0}/node-v{0}-x64.msi' -f $env:NODEJS_VERSION); \
+    Write-Host ('Downloading {0}...' -f $node_url); \
+    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+    (New-Object System.Net.WebClient).DownloadFile($node_url, '/tmp/nodejs-installer.msi'); \
+    $install_folder = Join-Path -Path $env:DESTINATION_FOLDER -ChildPath 'node'; \
+    Write-Host ('Installing into {0}...' -f $install_folder); \
+    Start-Process nodejs-installer.msi -Wait -ArgumentList @('/quiet', '/q', 'InstallDir={0}' -f $install_folder); 
+RUN $dotnetcoresdk_url = ('https://dotnetcli.blob.core.windows.net/dotnet/Sdk/{0}/dotnet-sdk-{0}-win-x64.zip' -f $env:DOTNETCORESDK_VERSION); \
+    Write-Host ('Downloading {0}...' -f $dotnetcoresdk_url); \
+    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+    (New-Object System.Net.WebClient).DownloadFile($dotnetcoresdk_url, '/tmp/dotnetcoresdk.zip'); \
+    $unpack_folder = Join-Path -Path $env:DESTINATION_FOLDER -ChildPath 'dotnetcoresdk'; \
+    Write-Host ('Unpacking into {0}...' -f $unpack_folder); \
+    Expand-Archive dotnetcoresdk.zip -DestinationPath $unpack_folder; 
+RUN $docker_url = ('https://download.docker.com/win/static/stable/x86_64/docker-{0}-ce.zip'  -f $env:DOCKER_VERSION);\
+    (New-Object System.Net.WebClient).DownloadFile($docker_url, '/tmp/docker.zip'); \
+    $install_folder = Join-Path -Path $env:DESTINATION_FOLDER -ChildPath ''; \
+    Expand-Archive -Path .\docker.zip -DestinationPath $install_folder; \
+    Remove-Item ('{0}\docker\dockerd.exe' -f $env:DESTINATION_FOLDER)
+RUN $git_url = ('https://github.com/git-for-windows/git/releases/download/v{0}.windows.1/MinGit-{0}-64-bit.zip' -f $env:GIT_VERSION); \
+    Write-Host ('Downloading {0}...' -f $git_url); \
+    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+    (New-Object System.Net.WebClient).DownloadFile($git_url, '/tmp/git.zip'); \
+    $unpack_folder = Join-Path -Path $env:DESTINATION_FOLDER -ChildPath 'git'; \
+    Write-Host ('Unpacking into {0}...' -f $unpack_folder); \
+    Expand-Archive .\git.zip -DestinationPath $unpack_folder;
+    
+FROM microsoft/nanoserver:1709
+RUN mkdir c:\\tools 
+COPY --from=base ["tools/", "/tools"]
+USER ContainerAdministrator
+RUN setx /M PATH "%PATH%;C:\tools\dotnetcoresdk;C:\tools\node\;C:\tools\python3;C:\tools\python3\Scripts;c:\tools\docker\;"
+USER ContainerUser
+RUN python -m pip install --upgrade pip
+RUN pip install azure-cli cookiecutter docker-compose
+RUN npm i -g iothub-explorer yo generator-azure-iot-edge-module
+RUN az extension add --name azure-iot
+WORKDIR /home/iotedge
+COPY install-dev.bat /scripts/install-dev.bat

s/docker/tool/windows/install-dev.bat

@@ -0,0 +1,4 @@
+cd /home/iotedge/tool
+pip install -r requirements_dev.txt
+pip install -e .
+cd /home/iotedge

s/docker/tool/windows/run.ps1

@@ -0,0 +1,30 @@
+param (
+    [string]$interface = 'vEthernet (nat)'
+ )
+
+$ErrorActionPreference = "Stop"
+ 
+#
+# NOTE
+# Make sure option "Expose daemon on tcp://localhost:2375 without TLS" is checked in Docker
+# and also make sure that 
+# "hosts": [ "tcp://0.0.0.0:2375" ]
+# is added to your 
+# C:\ProgramData\Docker\config\daemon.json
+# file
+
+#  Make sure firewall allows comminication via TCP 2375
+if ((Get-NetFirewallRule -DisplayName "Docker Proxy" -ErrorAction Ignore) -eq $null)
+{
+    New-NetFirewallRule -DisplayName "Docker Proxy" -LocalPort 2375 -Action Allow -Protocol TCP
+}
+
+# Find IP Address used by Docker NAT
+$docker_gateway = (Get-NetIPAddress -InterfaceAlias $interface -AddressFamily IPv4 | Select-Object IPAddress).IPAddress
+$docker_host ="tcp://{0}:2375" -f $docker_gateway
+
+# Get IoTEdgeDev source folder
+$source_folder = Get-Location | Split-Path | Split-Path 
+
+# Run Docker Container
+docker run -it -e DOCKER_HOST=${docker_host} -v ${source_folder}:c:/home/iotedge/tool microsoft/iotedgedev:latest-windows

s/docs/Azure-Setup.md

@@ -0,0 +1,102 @@
+#### Automated Setup
+
+The following will show you how to setup your Azure Resources via the CLI instead of using the Portal.
+
+First, create a solution with the following command:
+
+`iotedgedev new edgesolution1`
+
+Then, `cd` into that solution:
+
+`cd edgesolution`
+
+Then, run the `iotedgedev iothub setup` command to setup your Azure Resources. This command will bring you through a series of prompts to create Azure Resources and retrieve your IoT Hub and Edge Device connection strings and save them to the `.env` file in the root of the project. All subsequent commands will use those environment variables.
+
+Here are all the `iotedgedev iothub setup` command options:
+
+> You can override all of these parameters with environment variables. Please see the .env file in your solution for details.
+
+```
+iotedgedev iothub setup
+    --credentials USERNAME PASSWORD
+    --service-principal USERNAME PASSWORD TENANT
+    --subscription THE_SUBSCRIPTION_ID 
+    --resource-group-location THE_RG_LOCATION
+    --resource-group-name THE_RG_NAME 
+    --iothub-sku THE_IOT_SKU 
+    --iothub-name THE_IOT_NAME 
+    --edge-device-id THE_EDGE_DEVICE_NAME
+    --update-dotenv
+```
+
+You can use the following `az cli` command to create a service principal:
+
+```
+az ad sp create-for-rbac -n "iotedgedev01"
+```
+
+> Note: Running `iotedgedev iothub setup` without any other parameters will save you time from looking up the required parameter values. The command will help you choose the parameters in an interactive way.
+
+Alternatively, you can deploy the IoT Hub **and** Container Registry with this **Deploy to Azure** template:
+
+[![Azure Deployment](https://azuredeploy.net/deploybutton.png)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fazure%2Fiotedgedev%2Fmaster%2Fassets%2Fdeploy%2FARMDeployment%2Fazuredeploy.json)
+
+> Note: If you do not need a Container Registry, or are planning to use a local registry, then you should run the **iotedgedev iothub setup** command instead of running this **Deploy to Azure** template, because the template includes a Container Registry.
+
+#### Manual Setup
+1. [**Create Azure IoT Hub**](https://docs.microsoft.com/en-us/azure/iot-hub/iot-hub-csharp-csharp-getstarted#create-an-iot-hub)
+1. **Create Edge Device** using the Azure Portal
+    - In your IoT Hub, click "IoT Edge", then click "Add IoT Edge Device"
+
+1.  **Container Registry**
+    When you develop for IoT Edge, you need to host your images in a container registry, which the IoT Edge runtime will fetch the modules images from when it starts. 
+
+    > By default, the IoT Edge Dev Tool will use the Local Registry.
+
+    We have tested the following options, but you can host your images on any Docker compatible registry host.
+
+    1. Local Registry
+
+        Set `CONTAINER_REGISTRY_SERVER` to `localhost:5000` and leave `CONTAINER_REGISTRY_USERNAME` and `CONTAINER_REGISTRY_PASSWORD` blank.
+
+        ```
+        CONTAINER_REGISTRY_SERVER="localhost:5000"
+        ```
+
+    1. Azure Container Registry
+
+        You can create an [**Azure Container Registry**](https://docs.microsoft.com/en-us/azure/container-registry/container-registry-get-started-portal) and host your images there.
+            - Make sure you enable Admin Access when you create the Azure Container Registry
+
+        After created, open .env and set the following:
+
+        ```
+        CONTAINER_REGISTRY_SERVER="ACR URI" 
+        CONTAINER_REGISTRY_USERNAME="ACR USERNAME"
+        CONTAINER_REGISTRY_PASSWORD="ACR PASSWORD"
+        ```
+
+        Example:
+        ```
+        CONTAINER_REGISTRY_SERVER="jong.azurecr.io" 
+        CONTAINER_REGISTRY_USERNAME="jong"
+        CONTAINER_REGISTRY_PASSWORD="p@$$w0rd"
+        ```
+
+    1. Docker Hub
+
+        You can also host your images on Docker Hub. Create a Docker Hub account and then open .env and enter the following:
+
+        ```
+        CONTAINER_REGISTRY_SERVER="DOCKER HUB USERNAME" 
+        CONTAINER_REGISTRY_USERNAME="DOCKER HUB USERNAME"
+        CONTAINER_REGISTRY_PASSWORD="DOCKER HUB PASSWORD"
+        ```
+
+        Example:
+
+        ```
+        CONTAINER_REGISTRY_SERVER="jongallant" 
+        CONTAINER_REGISTRY_USERNAME="jongallant"
+        CONTAINER_REGISTRY_PASSWORD="p@$$w0rd"
+        ```