From b4cec03f650f140c8a25cdea385099dd5bcd01ee Mon Sep 17 00:00:00 2001 From: David Fowler Date: Fri, 31 Mar 2017 10:19:27 -0700 Subject: [PATCH] Update libuv package (#1577) - The latest libuv package has a new linux RID that should let us remove the work around with setting the RID in the docker file and systemd service --- build/dependencies.props | 2 +- .../SystemdActivation/Dockerfile | 4 ---- .../SystemdActivation/activate-kestrel.service | 3 +-- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 93b34f5c4e..ac2690b701 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -5,7 +5,7 @@ 0.1.0-* 4.3.0 2.0.0-* - 1.9.1 + 1.10.0-* 9.0.1 4.7.1 1.6.1 diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/SystemdActivation/Dockerfile b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/SystemdActivation/Dockerfile index 5b071165d4..ac2b561610 100644 --- a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/SystemdActivation/Dockerfile +++ b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/SystemdActivation/Dockerfile @@ -3,10 +3,6 @@ FROM microsoft/dotnet-nightly:2.0-runtime-deps # The "container" environment variable is read by systemd. ENV container=docker -# We're copying assets from an ubuntu machine over the container make the RID -# match -ENV DOTNET_RUNTIME_ID=ubuntu.14.04-x64 - # This is required by systemd and won't work without "dotnet run --privileged". VOLUME ["/sys/fs/cgroup"] diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/SystemdActivation/activate-kestrel.service b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/SystemdActivation/activate-kestrel.service index e21d5db863..54cff82383 100644 --- a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/SystemdActivation/activate-kestrel.service +++ b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/SystemdActivation/activate-kestrel.service @@ -4,5 +4,4 @@ Requires=activate-kestrel.socket [Service] ExecStart=/usr/bin/dotnet SampleApp.dll WorkingDirectory=/publish -NonBlocking=true -Environment="DOTNET_RUNTIME_ID=ubuntu.14.04-x64" \ No newline at end of file +NonBlocking=true \ No newline at end of file