Skip to content

Commit

Permalink
Update Windows images to RS5 (#550)
Browse files Browse the repository at this point in the history
Update the Dockerfiles to point to the RS5 nanoserver base image.

This change also makes some minor tweaks to the Windows installer script in preparation for turning on UDS/RS5:
- If an archive folder is passed rather than a ZIP file, create the iotedge directory first before trying to copy to it. Not sure why this wasn't failing before, maybe the build job that uses this feature is pre-creating the folder.
- When creating the parent directory for the UNIX domain socket files, pipe to null so that the `Get-SecurityDaemon` function _only_ returns the intended boolean value.
- During uninstall, if the event log component directory doesn't exist (e.g., because it was already deleted), ensure `Remove-SecurityDaemonResources` still returns `$true` so that the user sees a satisfying completion message ("Successfully uninstalled IoT Edge.") at the end.
- Print some more errors when the -Verbose switch is specified.
- During uninstall, remove the `IOTEDGE_HOST` system environment variable.
- Use PowerShell's `Get-Acl` and `Set-Acl` instead of .NET Core's `[System.IO.Directory]::GetAccessControl` and `[System.IO.Directory]::SetAccessControl` (which Windows IoT Core doesn't have).
- Set up the service to automatically restart when it fails.
  • Loading branch information
damonbarry authored Nov 28, 2018
1 parent d4dcb62 commit f72a238
Show file tree
Hide file tree
Showing 12 changed files with 604 additions and 419 deletions.
2 changes: 1 addition & 1 deletion edge-agent/docker/windows/amd64/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_tag=2.1.2-runtime-nanoserver-1803
ARG base_tag=2.1.6-runtime-nanoserver-1809
FROM microsoft/dotnet:${base_tag}

USER ContainerAdministrator
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"name": "nano",
"version": "1.0",
"image": "microsoft/nanoserver:1803",
"image": "microsoft/nanoserver:1809",
"validator": {
"$type": "RunCommandValidator",
"command": "docker",
Expand Down
2 changes: 1 addition & 1 deletion edge-hub/docker/windows/amd64/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_tag=2.1.2-runtime-nanoserver-1803
ARG base_tag=2.1.6-runtime-nanoserver-1809
FROM microsoft/dotnet:${base_tag}

ARG EXE_DIR=.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_tag=2.1.2-runtime-nanoserver-1803
ARG base_tag=2.1.6-runtime-nanoserver-1809
FROM microsoft/dotnet:${base_tag}

ARG EXE_DIR=.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_tag=2.1.2-runtime-nanoserver-1803
ARG base_tag=2.1.6-runtime-nanoserver-1809
FROM microsoft/dotnet:${base_tag}

ARG EXE_DIR=.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_tag=2.1.0-runtime-nanoserver-1803
ARG base_tag=2.1.6-runtime-nanoserver-1809
FROM microsoft/dotnet:${base_tag}

ARG EXE_DIR=.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_tag=2.1.2-runtime-nanoserver-1803
ARG base_tag=2.1.6-runtime-nanoserver-1809
FROM microsoft/dotnet:${base_tag}

ARG EXE_DIR=.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_tag=2.1.2-runtime-nanoserver-1803
ARG base_tag=2.1.6-runtime-nanoserver-1809
FROM microsoft/dotnet:${base_tag}

ARG EXE_DIR=.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# escape=`

FROM mcr.microsoft.com/azure-functions/dotnet:2.0-nanoserver-1803
FROM mcr.microsoft.com/azure-functions/dotnet:2.0-nanoserver-1809

COPY . /approot
2 changes: 1 addition & 1 deletion edge-modules/load-gen/docker/windows/amd64/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_tag=2.1.2-runtime-nanoserver-1803
ARG base_tag=2.1.6-runtime-nanoserver-1809
FROM microsoft/dotnet:${base_tag}

ARG EXE_DIR=.
Expand Down
2 changes: 1 addition & 1 deletion edgelet/iotedge/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ use iotedge::*;
#[cfg(unix)]
const MGMT_URI: &str = "unix:///var/run/iotedge/mgmt.sock";
#[cfg(windows)]
const MGMT_URI: &str = "http://localhost:15580";
const MGMT_URI: &str = "unix:///C:/ProgramData/iotedge/mgmt/sock";

fn main() {
if let Err(ref error) = run() {
Expand Down
Loading

0 comments on commit f72a238

Please sign in to comment.