diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | RELEASE_NOTES.md | 6 | ||||
| -rw-r--r-- | changelog.txt | 23 | ||||
| -rw-r--r-- | contrib/spec/podman.spec.in | 2 | ||||
| -rw-r--r-- | pkg/spec/spec.go | 3 | ||||
| -rw-r--r-- | test/system/055-rm.bats | 2 | ||||
| -rw-r--r-- | test/system/065-cp.bats | 2 | ||||
| -rw-r--r-- | version/version.go | 2 |
8 files changed, 35 insertions, 7 deletions
@@ -3,7 +3,7 @@ export GOPROXY=https://proxy.golang.org GO ?= go DESTDIR ?= -EPOCH_TEST_COMMIT ?= d7eba026876e4a6a362464dcf08fe6757ebedd1a +EPOCH_TEST_COMMIT ?= 960f07b0f79e6d6f94842fd4892e775c319f0a39 HEAD ?= HEAD CHANGELOG_BASE ?= HEAD~ CHANGELOG_TARGET ?= HEAD diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index a8e7ec58f..bff9a5f14 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,5 +1,11 @@ # Release Notes +## 1.6.1 +### Bugfixes +- Fixed a bug where rootless Podman on systems using CGroups V2 would not function with the `cgroupfs` CGroups manager +- Fixed a bug where rootless Podman could not correctly identify the DBus session address, causing containers to fail to start ([#4162](https://github.com/containers/libpod/issues/4162)) +- Fixed a bug where rootless Podman with `slirp4netns` networking would fail to start containers due to mount leaks + ## 1.6.0 ### Features - The `podman network create`, `podman network rm`, `podman network inspect`, and `podman network ls` commands have been added to manage CNI networks used by Podman diff --git a/changelog.txt b/changelog.txt index 7d6522c4d..8508d0d1c 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,26 @@ +- Changelog for v1.6.1 (2019-10-02) + * Update release notes for v1.6.1 + * Bump gitvalidation epoch + * Bump to v1.6.1-dev + * rootless: allow cgroupfs manager on cgroups v2 + * system tests: reenable skipped tests + +- Changelog for v1.6.1-rc1 (2019-10-02) + * rootless: set DBUS_SESSION_BUS_ADDRESS if it is not set + * install.md: add libbtrfs-dev for Debian build + * Bump github.com/onsi/gomega from 1.5.0 to 1.7.0 + * Cirrus: Show names/versions of critical packages + * network: add workaround for slirp4netns --enable-sandbox issue + * rootless: do not attempt a CNI refresh + * Bump github.com/containernetworking/plugins from 0.8.1 to 0.8.2 + * network: hide EPERM warning when rootless + * networking: fix segfault when slirp4netns is missing + * Bump gitvalidation epoch + * Bump to v1.6.1-dev + * Move derivitive doc so it won't be treated as a manpage + * catatonit: clone and build + * bump catatonit to v0.1.4 + - Changelog for v1.6.0 (2019-09-30) * info: add cgroups2 * Finalize release notes for 1.6.0 final diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in index dc734a6b4..bd2cff3f6 100644 --- a/contrib/spec/podman.spec.in +++ b/contrib/spec/podman.spec.in @@ -39,7 +39,7 @@ %global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) Name: podman -Version: 1.6.1 +Version: 1.6.2 Release: #COMMITDATE#.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 diff --git a/pkg/spec/spec.go b/pkg/spec/spec.go index 38f9c7306..c7aa003e8 100644 --- a/pkg/spec/spec.go +++ b/pkg/spec/spec.go @@ -387,6 +387,9 @@ func (config *CreateConfig) createConfigToOCISpec(runtime *libpod.Runtime, userM if err != nil { return nil, err } + if !addedResources { + configSpec.Linux.Resources = &spec.LinuxResources{} + } if addedResources && !cgroup2 { return nil, errors.New("invalid configuration, cannot set resources with rootless containers not using cgroups v2 unified mode") } diff --git a/test/system/055-rm.bats b/test/system/055-rm.bats index c13c8c52e..8ef8a119e 100644 --- a/test/system/055-rm.bats +++ b/test/system/055-rm.bats @@ -32,8 +32,6 @@ load helpers # # See https://github.com/containers/libpod/issues/3795 @test "podman rm -f" { - skip_if_remote "podman-remote does not handle exit codes" - rand=$(random_string 30) ( sleep 3; run_podman rm -f $rand ) & run_podman 137 run --name $rand $IMAGE sleep 30 diff --git a/test/system/065-cp.bats b/test/system/065-cp.bats index 38660a13c..0701055f9 100644 --- a/test/system/065-cp.bats +++ b/test/system/065-cp.bats @@ -38,7 +38,6 @@ load helpers # into host-only space. Try to podman-cp that symlink. It should fail. @test "podman cp - will not recognize symlink pointing into host space" { skip_if_remote "podman-remote does not yet handle cp" - skip "BROKEN: PLEASE ENABLE ONCE #3829 GETS FIXED" srcdir=$PODMAN_TMPDIR/cp-test-in dstdir=$PODMAN_TMPDIR/cp-test-out @@ -69,7 +68,6 @@ load helpers # this invalid double symlink. It must fail. @test "podman cp - will not expand globs in host space (#3829)" { skip_if_remote "podman-remote does not yet handle cp" - skip "BROKEN: PLEASE ENABLE ONCE #3829 GETS FIXED" srcdir=$PODMAN_TMPDIR/cp-test-in dstdir=$PODMAN_TMPDIR/cp-test-out diff --git a/version/version.go b/version/version.go index 9fcd5faa7..2c4d69b78 100644 --- a/version/version.go +++ b/version/version.go @@ -4,7 +4,7 @@ package version // NOTE: remember to bump the version at the top // of the top-level README.md file when this is // bumped. -const Version = "1.6.1-dev" +const Version = "1.6.2-dev" // RemoteAPIVersion is the version for the remote // client API. It is used to determine compatibility |