This repository has been archived by the owner on Oct 13, 2023. It is now read-only.
forked from moby/moby
-
Notifications
You must be signed in to change notification settings - Fork 424
[19.03 backport] bump hcsshim to fix docker build failing on Windows 1903 #429
Merged
thaJeztah
merged 7 commits into
docker-archive:19.03
from
thaJeztah:19.03_backport_windows_1903_fixes
Jan 23, 2020
Merged
[19.03 backport] bump hcsshim to fix docker build failing on Windows 1903 #429
thaJeztah
merged 7 commits into
docker-archive:19.03
from
thaJeztah:19.03_backport_windows_1903_fixes
Jan 23, 2020
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
full diff: github.com/containerd/cgroups containerd/cgroups@4994991...c4b9ac5 changes included: - containerd/cgroups#81 Add network stats - addresses containerd/cgroups#80 Add network metrics - containerd/cgroups#85 Fix cgroup hugetlb size prefix for kB - addresses kubernetes/kubernetes#77169 Permission denied on hugetlb due to wrong filename - relates to opencontainers/runc#2065 Fix cgroup hugetlb size prefix for kB - containerd/cgroups#88 cgroups: fix MoveTo function fail problem - containerd/cgroups#92 fixed an issue with invalid soft memory limits - containerd/cgroups#93 avoid adding io_serviced and io_service_bytes duplicately - fixes containerd/containerd#3412 collected metric container_blkio_io_serviced_recursive_total: was collected before with the same name and label values Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit 0af1099) Signed-off-by: Sebastiaan van Stijn <[email protected]>
full diff: containerd/cgroups@c4b9ac5...5fbad35 - containerd/cgroups#82 Add go module support - containerd/cgroups#96 Move metrics proto package to stats/v1 - containerd/cgroups#97 Allow overriding the default /proc folder in blkioController - containerd/cgroups#98 Allows ignoring memory modules - containerd/cgroups#99 Add Go 1.13 to Travis - containerd/cgroups#100 stats/v1: export per-cgroup stats Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit 27552ce) Signed-off-by: Sebastiaan van Stijn <[email protected]>
follow-up to 27552ce, where this was left as a review comment, but the PR was already merged. Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit 9a7e96b) Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Kir Kolyshkin <[email protected]> Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit 7c40c0a) Signed-off-by: Sebastiaan van Stijn <[email protected]>
Adds osversion.Build() utility Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit a5341aa) Signed-off-by: Sebastiaan van Stijn <[email protected]>
Fixed failures in TestRunAttachFailedNoLeak caused by case mismatch Signed-off-by: vikrambirsingh <[email protected]> (cherry picked from commit c530c9c) Signed-off-by: Sebastiaan van Stijn <[email protected]>
Among other things, this is required to pull in microsoft/hcsshim#718 Also fixes microsoft/hcsshim#737 which was caught by checks while attempting to bump up hcsshim version. Signed-off-by: Vikram bir Singh <[email protected]> (cherry picked from commit a7b6c3f) Signed-off-by: Sebastiaan van Stijn <[email protected]>
Is there an ETA on 19.03.6? |
thaJeztah
referenced
this pull request
in thaJeztah/cli
Jan 7, 2020
full diff: https://2226e083fc390003ae5aa8325c3c92789afa0e7a...b3f49c06ffaeef24d09c6c08ec8ec8425a0303e2 includes: - microsoft/hcsshim#718 wclayer: Work around Windows bug when expanding sandbox size - fixes microsoft/hcsshim#708 Windows Host Compute Service bug breaks docker (and other) sandboxes bigger than 20G on Windows 1903 - fixes microsoft/hcsshim#624The hcsshim on Windows 10 1903 always fails to build Docker image - fixes/addresses docker/for-win#3884 An error occurred while attempting to build Docker image (especially this comment and the next comments after: docker/for-win#3884 (comment)) - fixes/addresses docker/for-win#4100 Windows 1903 fails when storage-opt used - fixes moby/moby#36831 hcsshim::PrepareLayer failed in Win32: The parameter is incorrect (moby/moby#36831 (comment)) - fixes Stannieman/audacity-with-asio-builder#5 Docker won't build container - fixes MicrosoftDocs/visualstudio-docs#3523 Error when running build with storage-opts set - fixes moby/moby#39524 Docker build windows 19.03 --storage-opt size>20G Note that this is a temporary workaround for a bug in the platform, and will be reverted once that is addressed: - microsoft/hcsshim#721 Revert 718 when Windows 19H1 has expand sandbox fix Signed-off-by: Sebastiaan van Stijn <[email protected]>
Any update on releasing this? Quite a major blocker for Windows users. |
cpuguy83
approved these changes
Jan 23, 2020
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM at least from the Linux side (since cgroups package was updated).
This was referenced Feb 1, 2020
Closed
Do we have any idea when microsoft will publish an update for Windows Server 2019 users? We are still stuck on 19.03.5. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
includes:
hcsshim bump includes:
Note that this is a temporary workaround for a bug in the platform, and will be reverted once that is addressed:
Minor conflicts in 27552ce: