diff options
author | TomSweeneyRedHat <tsweeney@redhat.com> | 2019-11-13 10:30:08 -0500 |
---|---|---|
committer | TomSweeneyRedHat <tsweeney@redhat.com> | 2019-11-13 10:57:19 -0500 |
commit | 6003033adae775f1d725b05231a246a4462ae669 (patch) | |
tree | c570c523df92c3c0fb4b704c5c45b0de6603b7d6 /vendor/github.com/Microsoft/hcsshim/osversion | |
parent | de32b89eff0928abdef9d85a420b65d8865e737e (diff) | |
download | podman-6003033adae775f1d725b05231a246a4462ae669.tar.gz podman-6003033adae775f1d725b05231a246a4462ae669.tar.bz2 podman-6003033adae775f1d725b05231a246a4462ae669.zip |
Bump to Buildah v1.11.5
Bump to Buildah v1.11.5. Most notably changes to the
podman build `--pull` functionality. `--pull=true` and `--pull=false` now
work as Docker does, `--pull-never` added to supply the functionality
of the old `--pull=false`.
Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
Diffstat (limited to 'vendor/github.com/Microsoft/hcsshim/osversion')
-rw-r--r-- | vendor/github.com/Microsoft/hcsshim/osversion/osversion_windows.go (renamed from vendor/github.com/Microsoft/hcsshim/osversion/osversion.go) | 6 | ||||
-rw-r--r-- | vendor/github.com/Microsoft/hcsshim/osversion/windowsbuilds.go | 21 |
2 files changed, 25 insertions, 2 deletions
diff --git a/vendor/github.com/Microsoft/hcsshim/osversion/osversion.go b/vendor/github.com/Microsoft/hcsshim/osversion/osversion_windows.go index 916950c02..477fe7078 100644 --- a/vendor/github.com/Microsoft/hcsshim/osversion/osversion.go +++ b/vendor/github.com/Microsoft/hcsshim/osversion/osversion_windows.go @@ -46,6 +46,12 @@ func Get() OSVersion { return osv } +// Build gets the build-number on Windows +// The calling application must be manifested to get the correct version information. +func Build() uint16 { + return Get().Build +} + func (osv OSVersion) ToString() string { return fmt.Sprintf("%d.%d.%d", osv.MajorVersion, osv.MinorVersion, osv.Build) } diff --git a/vendor/github.com/Microsoft/hcsshim/osversion/windowsbuilds.go b/vendor/github.com/Microsoft/hcsshim/osversion/windowsbuilds.go index 2d9567f6f..3488cc451 100644 --- a/vendor/github.com/Microsoft/hcsshim/osversion/windowsbuilds.go +++ b/vendor/github.com/Microsoft/hcsshim/osversion/windowsbuilds.go @@ -1,10 +1,27 @@ package osversion const ( - - // RS2 was a client-only release in case you're asking why it's not in the list. + // RS1 (version 1607, codename "Redstone 1") corresponds to Windows Server + // 2016 (ltsc2016) and Windows 10 (Anniversary Update). RS1 = 14393 + + // RS2 (version 1703, codename "Redstone 2") was a client-only update, and + // corresponds to Windows 10 (Creators Update). + RS2 = 15063 + + // RS3 (version 1709, codename "Redstone 3") corresponds to Windows Server + // 1709 (Semi-Annual Channel (SAC)), and Windows 10 (Fall Creators Update). RS3 = 16299 + + // RS4 (version 1803, codename "Redstone 4") corresponds to Windows Server + // 1803 (Semi-Annual Channel (SAC)), and Windows 10 (April 2018 Update). RS4 = 17134 + + // RS5 (version 1809, codename "Redstone 5") corresponds to Windows Server + // 2019 (ltsc2019), and Windows 10 (October 2018 Update). RS5 = 17763 + + // V19H1 (version 1903) corresponds to Windows Sever 1903 (semi-annual + // channel). + V19H1 = 18362 ) |