Skip to content

[release/1.3 backport] windows process shim installer#3792

Merged
crosbymichael merged 1 commit intocontainerd:release/1.3from
ameyag:windows-shim-backport
Oct 31, 2019
Merged

[release/1.3 backport] windows process shim installer#3792
crosbymichael merged 1 commit intocontainerd:release/1.3from
ameyag:windows-shim-backport

Conversation

@ameyag
Copy link
Copy Markdown
Contributor

@ameyag ameyag commented Oct 31, 2019

Signed-off-by: Ameya Gawde ameya.gawde@docker.com
(cherry picked from commit d21f0f1)
clean cherry-pick.

Signed-off-by: Ameya Gawde <ameya.gawde@docker.com>
(cherry picked from commit d21f0f1)
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci bot commented Oct 31, 2019

Build succeeded.

@codecov-io
Copy link
Copy Markdown

Codecov Report

Merging #3792 into release/1.3 will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##           release/1.3    #3792   +/-   ##
============================================
  Coverage        45.59%   45.59%           
============================================
  Files              116      116           
  Lines            11465    11465           
============================================
  Hits              5227     5227           
  Misses            5338     5338           
  Partials           900      900
Flag Coverage Δ
#linux 45.59% <ø> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d6f0c29...067be94. Read the comment docs.

Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@crosbymichael
Copy link
Copy Markdown
Member

LGTM

@crosbymichael crosbymichael merged commit 0aeaac0 into containerd:release/1.3 Oct 31, 2019
@ameyag ameyag deleted the windows-shim-backport branch November 1, 2019 00:06
@thaJeztah
Copy link
Copy Markdown
Member

backport of #3790

dmcgowan pushed a commit to thaJeztah/containerd that referenced this pull request Nov 19, 2019
* Update the runc vendor to v1.0.0-rc9 which includes an additional mitigation for [CVE-2019-16884](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-16884).
    - More details on the runc CVE in [opencontainers/runc#2128](opencontainers/runc#2128), and the additional mitigations in [opencontainers/runc#2130](opencontainers/runc#2130).
* Add local-fs.target to service file to fix corrupt image after unexpected host reboot. Reported in [containerd#3671](containerd#3671), and fixed by [containerd#3745](containerd#3745).
* Fix large output of processes with TTY getting occasionally truncated. Reported in [containerd#3738](containerd#3738) and fixed by [containerd#3754](containerd#3754).
* Fix direct unpack when running in user namespace. Reported in [containerd#3762](containerd#3762), and fixed by [containerd#3779](containerd#3779).
* Update Golang runtime to 1.12.13, which includes security fixes to the `crypto/dsa` package made in Go 1.12.11 ([CVE-2019-17596](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-17596)), and fixes to the go command, `runtime`, `syscall` and `net` packages (Go 1.12.12).
* Add Windows process shim installer [containerd#3792](containerd#3792)

* CRI fixes:
    - Fix shim delete error code to avoid unnecessary retries in the CRI plugin. Discovered in [containerd/cri#1309](containerd/cri#1309), and fixed by [containerd#3733](containerd#3733) and [containerd#3740](containerd#3740).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants