libnetwork icon indicating copy to clipboard operation
libnetwork copied to clipboard

Use hcsshim osversion package for version checks, instead of docker/docker/pkg/system

Open thaJeztah opened this issue 6 years ago • 8 comments

~This depends on https://github.com/docker/libnetwork/pull/2361, which brings in an up-to-date version of hcsshim.~

This replaces the use of docker/docker/pkg/system, in favour of the same code from Microsoft/hcsshim.

With this package, hard-coded build numbers are replaced with constants that are now defined in hcsshim.

Note that build 16236 is not defined in the package, and may be referring to RS2 (which was a client-only release).

Checks for that version were added in commits;

a9db5c53867a33c47c13a4eac7c1a28cc3c35054 (#1900), and 6681c0243cc03669a677efe4dde70976b1bf0746 (#2070)

In a9db5c53867a33c47c13a4eac7c1a28cc3c35054, it is described that the intent was to allow these options only in Windows RS3 so I changed the comparisons to match RS3 (and up) or disable the option on anything older than RS3.

thaJeztah avatar Apr 08 '19 11:04 thaJeztah

ping @pradipd @mavenugo @ddebroy (https://github.com/docker/libnetwork/pull/2070#discussion_r166714271) PTAL

thaJeztah avatar Apr 08 '19 11:04 thaJeztah

force-pushed to trigger CI

thaJeztah avatar Apr 12 '19 23:04 thaJeztah

updated to use < osversion.RS5 { as discussed above

thaJeztah avatar Apr 25 '19 00:04 thaJeztah

Failure is a flaky test; FAIL: TestNetworkDBIslands; I'll re-push to trigger ci

thaJeztah avatar Apr 25 '19 17:04 thaJeztah

rebased to get rid of the commits from https://github.com/docker/libnetwork/pull/2361

@pradipd @ddebroy @euanh ptal

thaJeztah avatar Jun 25 '19 11:06 thaJeztah

LGTM

pradipd avatar Jun 25 '19 20:06 pradipd

we might have to hold off merging this one, pending the discussion on https://github.com/microsoft/hcsshim/pull/581#discussion_r279087411

thaJeztah avatar Jun 25 '19 23:06 thaJeztah

Looks like https://github.com/microsoft/hcsshim/pull/581#issuecomment-543270055 was resolved, so I rebased this; this should be ready to go now

ping @selansen @arkodg PTAL

thaJeztah avatar Nov 25 '19 18:11 thaJeztah

Obsoleted by https://github.com/moby/moby/pull/43254

corhere avatar Jan 19 '24 23:01 corhere