diff options
| author | baude <bbaude@redhat.com> | 2018-09-05 18:30:30 -0500 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-09-06 15:19:25 +0000 |
| commit | bbbbfa582b923746d752e336edcf21135c340fcf (patch) | |
| tree | 14372fc9a73d3da71902d49e249048164d25d516 /libpod | |
| parent | 2e6243b18539175b5ff029a924c4d83834f83d2b (diff) | |
| download | podman-bbbbfa582b923746d752e336edcf21135c340fcf.tar.gz podman-bbbbfa582b923746d752e336edcf21135c340fcf.tar.bz2 podman-bbbbfa582b923746d752e336edcf21135c340fcf.zip | |
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 <bbaude@redhat.com>
Closes: #1414
Approved by: mheon
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/container_internal_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
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) |