Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Update Windows images to RS5 #550

Merged
merged 28 commits into from
Nov 28, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
0b73618
Fix minor issues in Windows installer script
damonbarry Nov 14, 2018
8de7524
Upgrade windows images to RS5
damonbarry Nov 15, 2018
513e091
Update iotedge tool to use UDS by default on Windows
damonbarry Nov 19, 2018
2dabf83
Install Moby runtime if ContainerOs is Windows.
arsing Nov 20, 2018
e3526ef
Use Get/Set-Acl because the `Directory::GetAccessControl` API does no…
veyalla Nov 17, 2018
056a52b
Fixed typo.
arsing Nov 21, 2018
167638b
Fixed name of Docker service
arsing Nov 21, 2018
9a4f66c
Set-GatewayAddress is still needed for ContainerOs=Linux
arsing Nov 21, 2018
491d3db
Review comment.
arsing Nov 21, 2018
d6f3acc
Automatically restart service if it crashes.
arsing Nov 21, 2018
a6d0c2e
Delete IOTEDGE_HOST env var when uninstalling.
arsing Nov 21, 2018
c2edcf1
Merge branch 'master' into rs5-images
arsing Nov 21, 2018
575cc29
Merge branch 'master' into rs5-images
damonbarry Nov 26, 2018
d1df725
Merge branch 'master' into rs5-images
damonbarry Nov 26, 2018
e2f637b
Separate archives for Moby runtime and CLI.
arsing Nov 26, 2018
fce123d
Merge branch 'master' into rs5-images
arsing Nov 26, 2018
f1682a3
Edit registry to set machine-level environment variables.
arsing Nov 27, 2018
1bcbea1
Set Moby data-root to new location so that it doesn't interfere with …
arsing Nov 27, 2018
9c368bd
Try harder to delete Moby data root.
arsing Nov 27, 2018
0a3feae
Merge branch 'master' into rs5-images
arsing Nov 27, 2018
f56e089
IoT Core needs UNC path.
arsing Nov 27, 2018
8ea8a8b
Merge branch 'master' into rs5-images
arsing Nov 27, 2018
c5fca21
Deleting Moby data root takes time, so notify the user that it's happ…
arsing Nov 27, 2018
58bab25
Remove Builtin Users permissions
ancaantochi Nov 27, 2018
6f8386f
Address review comments
ancaantochi Nov 28, 2018
a3ac1ce
Address review comments
ancaantochi Nov 28, 2018
99a4b25
Merge branch 'master' into rs5-images
myagley Nov 28, 2018
5cc87b0
Merge branch 'master' into rs5-images
arsing Nov 28, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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