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-- | docs/tutorials/README.md | 4 | ||||
| -rw-r--r-- | docs/tutorials/podman-derivative-api.md | 4 | ||||
| -rw-r--r-- | go.mod | 2 | ||||
| -rw-r--r-- | go.sum | 2 | ||||
| -rw-r--r-- | test/system/005-info.bats | 2 | ||||
| -rw-r--r-- | vendor/gopkg.in/yaml.v2/decode.go | 13 | ||||
| -rw-r--r-- | vendor/gopkg.in/yaml.v2/resolve.go | 2 | ||||
| -rw-r--r-- | vendor/modules.txt | 2 | ||||
| -rw-r--r-- | version/version.go | 2 |
13 files changed, 58 insertions, 8 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/docs/tutorials/README.md b/docs/tutorials/README.md index 2cf9613b6..bcd1b01d9 100644 --- a/docs/tutorials/README.md +++ b/docs/tutorials/README.md @@ -19,3 +19,7 @@ Special setup for running the Podman remote client on a Mac and connecting to Po **[Remote Client](remote_client.md)** A brief how-to on using the Podman remote-client. + +**[How to use libpod for custom/derivative projects](podman-derivative-api.md)** + +How the libpod API can be used within your own project. diff --git a/docs/tutorials/podman-derivative-api.md b/docs/tutorials/podman-derivative-api.md index 0342bb740..065b0c4a9 100644 --- a/docs/tutorials/podman-derivative-api.md +++ b/docs/tutorials/podman-derivative-api.md @@ -1,3 +1,5 @@ + + # How to use libpod for custom/derivative projects libpod today is a Golang library and a CLI. The choice of interface you make has advantages and disadvantages. @@ -41,4 +43,4 @@ Making the choice A good question to ask first is: Do you want users to be able to use `podman` to manipulate the containers created by your project? If so, that makes it more likely that you want to run `podman` as a subprocess. If you want a separate image store and a fundamentally different experience; if what you're doing with containers is quite different from those created by the `podman` CLI, -that may drive you towards vendoring.
\ No newline at end of file +that may drive you towards vendoring. @@ -104,7 +104,7 @@ require ( google.golang.org/genproto v0.0.0-20190620144150-6af8c5fc6601 // indirect google.golang.org/grpc v1.21.1 // indirect gopkg.in/inf.v0 v0.9.1 // indirect - gopkg.in/yaml.v2 v2.2.2 + gopkg.in/yaml.v2 v2.2.3 k8s.io/api v0.0.0-20190813020757-36bff7324fb7 k8s.io/apimachinery v0.0.0-20190809020650-423f5d784010 k8s.io/client-go v0.0.0-20190620085101-78d2af792bab @@ -758,6 +758,8 @@ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bl gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.3 h1:fvjTMHxHEw/mxHbtzPi3JCcKXQRAnQTBRo6YCJSVHKI= +gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gotest.tools v0.0.0-20190624233834-05ebafbffc79/go.mod h1:R//lfYlUuTOTfblYI3lGoAAAebUdzjvbmQsuB7Ykd90= gotest.tools v2.1.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= diff --git a/test/system/005-info.bats b/test/system/005-info.bats index 7fccc75af..5df6033fc 100644 --- a/test/system/005-info.bats +++ b/test/system/005-info.bats @@ -33,7 +33,7 @@ RunRoot: run_podman info --format=json expr_nvr="[a-z0-9-]\\\+-[a-z0-9.]\\\+-[a-z0-9]\\\+\." - expr_path="/[a-z0-9\\\-\\\/.]\\\+\\\$" + expr_path="/[a-z0-9\\\/.-]\\\+\\\$" tests=" host.BuildahVersion | [0-9.] diff --git a/vendor/gopkg.in/yaml.v2/decode.go b/vendor/gopkg.in/yaml.v2/decode.go index e4e56e28e..91679b5b4 100644 --- a/vendor/gopkg.in/yaml.v2/decode.go +++ b/vendor/gopkg.in/yaml.v2/decode.go @@ -229,6 +229,10 @@ type decoder struct { mapType reflect.Type terrors []string strict bool + + decodeCount int + aliasCount int + aliasDepth int } var ( @@ -315,6 +319,13 @@ func (d *decoder) prepare(n *node, out reflect.Value) (newout reflect.Value, unm } func (d *decoder) unmarshal(n *node, out reflect.Value) (good bool) { + d.decodeCount++ + if d.aliasDepth > 0 { + d.aliasCount++ + } + if d.aliasCount > 100 && d.decodeCount > 1000 && float64(d.aliasCount)/float64(d.decodeCount) > 0.99 { + failf("document contains excessive aliasing") + } switch n.kind { case documentNode: return d.document(n, out) @@ -353,7 +364,9 @@ func (d *decoder) alias(n *node, out reflect.Value) (good bool) { failf("anchor '%s' value contains itself", n.value) } d.aliases[n] = true + d.aliasDepth++ good = d.unmarshal(n.alias, out) + d.aliasDepth-- delete(d.aliases, n) return good } diff --git a/vendor/gopkg.in/yaml.v2/resolve.go b/vendor/gopkg.in/yaml.v2/resolve.go index 6c151db6f..4120e0c91 100644 --- a/vendor/gopkg.in/yaml.v2/resolve.go +++ b/vendor/gopkg.in/yaml.v2/resolve.go @@ -81,7 +81,7 @@ func resolvableTag(tag string) bool { return false } -var yamlStyleFloat = regexp.MustCompile(`^[-+]?[0-9]*\.?[0-9]+([eE][-+][0-9]+)?$`) +var yamlStyleFloat = regexp.MustCompile(`^[-+]?(\.[0-9]+|[0-9]+(\.[0-9]*)?)([eE][-+]?[0-9]+)?$`) func resolve(tag string, in string) (rtag string, out interface{}) { if !resolvableTag(tag) { diff --git a/vendor/modules.txt b/vendor/modules.txt index dc113b619..1d92a249d 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -549,7 +549,7 @@ gopkg.in/fsnotify.v1 gopkg.in/inf.v0 # gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 gopkg.in/tomb.v1 -# gopkg.in/yaml.v2 v2.2.2 +# gopkg.in/yaml.v2 v2.2.3 gopkg.in/yaml.v2 # k8s.io/api v0.0.0-20190813020757-36bff7324fb7 k8s.io/api/core/v1 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 |