From bbbbfa582b923746d752e336edcf21135c340fcf Mon Sep 17 00:00:00 2001 From: baude Date: Wed, 5 Sep 2018 18:30:30 -0500 Subject: vendor containerd/cgroups 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 Closes: #1414 Approved by: mheon --- libpod/container_internal_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libpod') diff --git a/libpod/container_internal_test.go b/libpod/container_internal_test.go index 600d24201..124f1d20e 100644 --- a/libpod/container_internal_test.go +++ b/libpod/container_internal_test.go @@ -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) -- cgit v1.2.3-54-g00ecf