Skip to content
This repository has been archived by the owner on Oct 13, 2023. It is now read-only.

[19.03 backport] bump hcsshim to fix docker build failing on Windows 1903 #429

Merged
merged 7 commits into from
Jan 23, 2020
Merged

[19.03 backport] bump hcsshim to fix docker build failing on Windows 1903 #429

merged 7 commits into from
Jan 23, 2020

Conversation

thaJeztah
Copy link
Member

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:

# taken from https://github.com/moby/moby/pull/39713 bump containerd and dependencies to v1.3.0
git cherry-pick -s -S -x 0af1099a81861dd0269adad53bdfb387b5c78f39

# https://github.com/moby/moby/pull/40154 bump containerd/cgroups 5fbad35c2a7e855762d3c60f2e474ffcad0d470a
git cherry-pick -s -S -x 27552ceb15bca544820229e574427d4c1d6ef585

# https://github.com/moby/moby/pull/40167 Rename "v1" to "statsV1"
git cherry-pick -s -S -x 9a7e96b5b7e97e034ce7bb0f1e7788d1bd881c7f

# taken from https://github.com/moby/moby/pull/39668 Replace gometalinter with golangci-lint
git cherry-pick -s -S -x 7c40c0a9227089a7e3ee7c23c2bc0685ed133391

# taken from https://github.com/moby/moby/pull/39100 Use Microsoft/hcsshim constants and deprecate pkg/system.GetOsVersion(
git cherry-pick -s -S -x a5341aaf32d2ea1d7f527fa8f3bd08f4706e4872

# https://github.com/moby/moby/pull/40250 Bump hcsshim to b3f49c06ffaeef24d09c6c08ec8ec8425a0303e2
git cherry-pick -s -S -x c530c9cbb0da177337a90a6651305daa9eb0c42b \
    a7b6c3f0bf5d10c6227a29bac7dd46b9a7a779bc

Minor conflicts in 27552ce:

diff --cc libcontainerd/types/types_linux.go
index 0a2daf5777,8cc41052b3..0000000000
--- a/libcontainerd/types/types_linux.go
+++ b/libcontainerd/types/types_linux.go
@@@ -3,8 -3,8 +3,13 @@@ package types // import "github.com/doc
  import (
        "time"

++<<<<<<< HEAD
 +      "github.com/containerd/cgroups"
 +      "github.com/opencontainers/runtime-spec/specs-go"
++=======
+       v1 "github.com/containerd/cgroups/stats/v1"
+       specs "github.com/opencontainers/runtime-spec/specs-go"
++>>>>>>> 27552ceb15... bump containerd/cgroups 5fbad35c2a7e855762d3c60f2e474ffcad0d470a
  )

  // Summary is not used on linux
diff --cc vendor.conf
index dd18920ab2,0be5d884ca..0000000000
--- a/vendor.conf
+++ b/vendor.conf
@@@ -117,10 -117,10 +117,17 @@@ github.com/googleapis/gax-g
  google.golang.org/genproto                          694d95ba50e67b2e363f3483057db5d4910c18f9

  # containerd
++<<<<<<< HEAD
 +github.com/containerd/containerd                    7c1e88399ec0b0b077121d9d5ad97e647b11c870
 +github.com/containerd/fifo                          a9fb20d87448d386e6d50b1f2e1fa70dcf0de43c
 +github.com/containerd/continuity                    aaeac12a7ffcd198ae25440a9dff125c2e2703a7
 +github.com/containerd/cgroups                       c4b9ac5c7601384c965b9646fc515884e091ebb9
++=======
+ github.com/containerd/containerd                    36cf5b690dcc00ff0f34ff7799209050c3d0c59a # v1.3.0
+ github.com/containerd/fifo                          bda0ff6ed73c67bfb5e62bc9c697f146b7fd7f13
+ github.com/containerd/continuity                    f2a389ac0a02ce21c09edd7344677a601970f41c
+ github.com/containerd/cgroups                       5fbad35c2a7e855762d3c60f2e474ffcad0d470a
++>>>>>>> 27552ceb15... bump containerd/cgroups 5fbad35c2a7e855762d3c60f2e474ffcad0d470a
  github.com/containerd/console                       0650fd9eeb50bab4fc99dceb9f2e14cf58f36e7f
  github.com/containerd/go-runc                       e029b79d8cda8374981c64eba71f28ec38e5526f
  github.com/containerd/typeurl                       2a93cfde8c20b23de8eb84a5adbc234ddf7a9e8d

thaJeztah and others added 7 commits December 3, 2019 15:58
@thaJeztah
bump containerd/cgroups c4b9ac5c7601384c965b9646fc515884e091ebb9
fe00613 
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]>
@thaJeztah
bump containerd/cgroups 5fbad35c2a7e855762d3c60f2e474ffcad0d470a
9ab162a 
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]>
@thaJeztah
Rename "v1" to "statsV1"
4d190af 
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]>
@thaJeztah
integration-cli: remove unnescessary conversions (unconvert)
3fca587 
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]>
@thaJeztah
bump Microsoft/hcsshim 2226e083fc390003ae5aa8325c3c92789afa0e7a
1f18c73 
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]>
@thaJeztah
TestRunAttachFailedNoLeak: Compare lowercase
5302429 
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]>
@thaJeztah
Bump hcsshim to b3f49c06ffaeef24d09c6c08ec8ec8425a
e2f226b 
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]>
@thaJeztah thaJeztah added this to the 19.03.6 milestone Dec 3, 2019
@ebalders
Copy link

Is there an ETA on 19.03.6?

@PatrickLang PatrickLang mentioned this pull request Dec 19, 2019
Closed
thaJeztah referenced this pull request in thaJeztah/cli Jan 7, 2020
@thaJeztah
vendor: bump hcsshim b3f49c06ffaeef24d09c6c08ec8ec8425a0303e2
dff269b 
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]>
@ViRb3
Copy link

ViRb3 commented Jan 8, 2020

Any update on releasing this? Quite a major blocker for Windows users.

cpuguy83
cpuguy83 approved these changes Jan 23, 2020
View reviewed changes
Copy link

@cpuguy83 cpuguy83 left a 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).

@thaJeztah thaJeztah merged commit 6949793 into docker-archive:19.03 Jan 23, 2020
@thaJeztah thaJeztah deleted the 19.03_backport_windows_1903_fixes branch January 23, 2020 19:48
This was referenced Feb 1, 2020
Closed
Closed
@jazpearson
Copy link

Do we have any idea when microsoft will publish an update for Windows Server 2019 users? We are still stuck on 19.03.5.

@TBBle TBBle mentioned this pull request Apr 21, 2020
Closed
@TBBle TBBle mentioned this pull request May 10, 2020
Closed
@TBBle TBBle mentioned this pull request Sep 27, 2020
Closed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@cpuguy83 cpuguy83 cpuguy83 approved these changes

Assignees
No one assigned
Labels
impact/changelog
Projects
None yet
Milestone
19.03.6
Development

Successfully merging this pull request may close these issues.
5 participants
@thaJeztah @ebalders @ViRb3 @jazpearson @cpuguy83