opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-02 00:30:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

vendor containerd/cgroups

Browse Source 
We need to vendor in the latest containerd/cgroups for a fix related to
slice delegation and systemd <= 239. The opencontainer/runtime-spec is
brought along for the ride.

Signed-off-by: baude <bbaude@redhat.com>

Closes: #1414
Approved by: mheon
This commit is contained in:
baude
2018-09-05 18:30:30 -05:00
committed by Atomic Bot
parent 2e6243b185
commit bbbbfa582b
32 changed files with 1137 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libpod/container_internal_test.go
View File

@ -60,7 +60,7 @@ func TestPostDeleteHooks(t *testing.T) {
t.Fatal(err)
}
stateRegexp := `{"ociVersion":"1\.0\.0","id":"123abc","status":"stopped","bundle":"` + strings.TrimSuffix(os.TempDir(), "/") + `/libpod_test_[0-9]*","annotations":{"a":"b"}}`
stateRegexp := `{"ociVersion":"1\.0\.1-dev","id":"123abc","status":"stopped","bundle":"` + strings.TrimSuffix(os.TempDir(), "/") + `/libpod_test_[0-9]*","annotations":{"a":"b"}}`
for _, path := range []string{statePath, copyPath} {
t.Run(path, func(t *testing.T) {
content, err := ioutil.ReadFile(path)