summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Add test for restore --publishAdrian Reber2021-06-04
| | | | Signed-off-by: Adrian Reber <areber@redhat.com>
* Allow changing of port forward rules on restoreAdrian Reber2021-06-04
| | | | | | | | | | | | | | | | | | | | Restored containers, until now, had the same port mappings as the original started container. This commit adds the parameter '--publish' to 'podman container restore' with the same semantic as during create/run. With this change it is possible to create a copy from a container with a '--publish' rule and replace the original '--publish' setting with a new one. # podman run -p 2345:8080 container # podman container checkpoint -l --export=dump.tar # podman container restore -p 5432:8080 --import=dump.tar The restored container will now listen on localhost:5432 instead of localhost:2345 as the original created container. Signed-off-by: Adrian Reber <areber@redhat.com>
* Merge pull request #10553 from mheon/bump_master_320OpenShift Merge Robot2021-06-03
|\ | | | | [CI:DOCS] Update main branch to reflect 3.2.0 release
| * Update main branch to reflect 3.2.0 releaseMatthew Heon2021-06-03
|/ | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
* Merge pull request #10533 from rhatdan/docsOpenShift Merge Robot2021-06-03
|\ | | | | [CI:DOCS] Fix spacing in buildthedocs
| * Fix spacing in buildthedocsDaniel J Walsh2021-06-02
| | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #10545 from ↵OpenShift Merge Robot2021-06-03
|\ \ | | | | | | | | | | | | containers/dependabot/go_modules/go.etcd.io/bbolt-1.3.6 Bump go.etcd.io/bbolt from 1.3.5 to 1.3.6
| * | Bump go.etcd.io/bbolt from 1.3.5 to 1.3.6dependabot[bot]2021-06-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [go.etcd.io/bbolt](https://github.com/etcd-io/bbolt) from 1.3.5 to 1.3.6. - [Release notes](https://github.com/etcd-io/bbolt/releases) - [Commits](https://github.com/etcd-io/bbolt/compare/v1.3.5...v1.3.6) --- updated-dependencies: - dependency-name: go.etcd.io/bbolt dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
* | | Merge pull request #10543 from ↵OpenShift Merge Robot2021-06-03
|\ \ \ | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/opencontainers/selinux-1.8.2 Bump github.com/opencontainers/selinux from 1.8.1 to 1.8.2
| * | | Bump github.com/opencontainers/selinux from 1.8.1 to 1.8.2dependabot[bot]2021-06-03
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/opencontainers/selinux](https://github.com/opencontainers/selinux) from 1.8.1 to 1.8.2. - [Release notes](https://github.com/opencontainers/selinux/releases) - [Commits](https://github.com/opencontainers/selinux/compare/v1.8.1...v1.8.2) --- updated-dependencies: - dependency-name: github.com/opencontainers/selinux dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
* | | Merge pull request #10541 from Luap99/fix-10158OpenShift Merge Robot2021-06-03
|\ \ \ | | | | | | | | add ipv6 nameservers only when the container has ipv6 enabled
| * | | add ipv6 nameservers only when the container has ipv6 enabledPaul Holzinger2021-06-03
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The containers /etc/resolv.conf allways preserved the ipv6 nameserves from the host even when the container did not supported ipv6. Check if the cni result contains an ipv6 address or slirp4netns has ipv6 support enabled and only add the ipv6 nameservers when this is the case. The test needs to have an ipv6 nameserver in the hosts /etc/hosts but we should never mess with this file on the host. Therefore the test is skipped when no ipv6 is detected. Fixes #10158 Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* | | Merge pull request #10544 from ↵OpenShift Merge Robot2021-06-03
|\ \ \ | |_|/ |/| | | | | | | | containers/dependabot/go_modules/github.com/docker/docker-20.10.7incompatible Bump github.com/docker/docker from 20.10.6+incompatible to 20.10.7+incompatible
| * | Bump github.com/docker/dockerdependabot[bot]2021-06-03
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/docker/docker](https://github.com/docker/docker) from 20.10.6+incompatible to 20.10.7+incompatible. - [Release notes](https://github.com/docker/docker/releases) - [Changelog](https://github.com/moby/moby/blob/master/CHANGELOG.md) - [Commits](https://github.com/docker/docker/compare/v20.10.6...v20.10.7) --- updated-dependencies: - dependency-name: github.com/docker/docker dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
* | Merge pull request #10540 from ↵OpenShift Merge Robot2021-06-03
|\ \ | |/ |/| | | | | containers/dependabot/go_modules/github.com/onsi/ginkgo-1.16.4 Bump github.com/onsi/ginkgo from 1.16.3 to 1.16.4
| * Bump github.com/onsi/ginkgo from 1.16.3 to 1.16.4dependabot[bot]2021-06-03
|/ | | | | | | | | | | | | | | Bumps [github.com/onsi/ginkgo](https://github.com/onsi/ginkgo) from 1.16.3 to 1.16.4. - [Release notes](https://github.com/onsi/ginkgo/releases) - [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md) - [Commits](https://github.com/onsi/ginkgo/compare/v1.16.3...v1.16.4) --- updated-dependencies: - dependency-name: github.com/onsi/ginkgo dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
* Merge pull request #10514 from vrothberg/fix-10507OpenShift Merge Robot2021-06-02
|\ | | | | events: support disjunctive filters
| * events: support disjunctive filtersValentin Rothberg2021-06-02
| | | | | | | | | | | | | | | | | | While different filters are applied in conjunction, the same filter (but with different values) should be applied in disjunction. This allows, for instance, to query the events of two containers. Fixes: #10507 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | Merge pull request #10523 from rhatdan/docsOpenShift Merge Robot2021-06-02
|\ \ | | | | | | [CI:DOCS] Use secrets and machine rst file properly
| * | Use secrets and machine rst file properlyDaniel J Walsh2021-06-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes secrets and machine handling match the handling of other subcommands of Podman. Possible fixes: https://github.com/containers/podman/issues/10513 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #10527 from edsantiago/batsOpenShift Merge Robot2021-06-01
|\ \ \ | | | | | | | | System tests: add :Z to volume mounts
| * | | System tests: add :Z to volume mountsEd Santiago2021-06-01
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | selinux-policy-34.9-1.fc34 breaks a behavior we've relied on since (at least) January 2020: - Revert "Add permission open to files_read_inherited_tmp_files() interface" That's probably the correct thing to do, but it breaks our existing tests. Solution: add ':Z' where needed. Tested on Ed's laptop, which has the offending selinux-policy as of 2021-05-31. Tests pass root and rootless. (I mention this because tests will obviously pass in CI, which has a much older selinux-policy). Also: add a 'podman rmi' for cleanup in one test, to avoid noise in test logs. Fixes: #10522 Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | Merge pull request #10517 from cdoern/masterOpenShift Merge Robot2021-06-01
|\ \ \ | | | | | | | | API one-shot query implementation/handling
| * | | added tests in python rest apicdoern2021-06-01
| | | | | | | | | | | | | | | | Signed-off-by: cdoern <cbdoer23@g.holycross.edu>
* | | | Merge pull request #10486 from vrothberg/tag-digest-supportOpenShift Merge Robot2021-06-01
|\ \ \ \ | | | | | | | | | | support tag@digest notation
| * | | | support tag@digest notationValentin Rothberg2021-05-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Vendor in the latest HEAd of containers/common to implicitly support the tag@digest notation for images. To remain compatible with Docker, the tag will be stripped off the image reference and is entirely ignored. Fixes: #6721 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | | Merge pull request #10519 from matejvasek/use-req-ctxOpenShift Merge Robot2021-06-01
|\ \ \ \ \ | | | | | | | | | | | | Use request context instead of background
| * | | | | Use request context instead of backgroundMatej Vasek2021-06-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents goroutine leak: If background context were used then push operation would continue even if client aborted request by closing connection. [NO TESTS NEEDED] Signed-off-by: Matej Vasek <mvasek@redhat.com>
* | | | | | Merge pull request #10524 from rugk/patch-1OpenShift Merge Robot2021-06-01
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | [CI:DOCS] Fix link error
| * | | | | Fix link errorrugk2021-06-01
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: rugk <rugk+git@posteo.de>
* | | | | Merge pull request #10488 from baude/machinehostnetworkOpenShift Merge Robot2021-06-01
|\ \ \ \ \ | | | | | | | | | | | | Enable port forwarding on host
| * | | | | Enable port forwarding on hostBrent Baude2021-06-01
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using the gvproxy application on the host, we can now port forward from the machine vm on the host. It requires that 'gvproxy' be installed in an executable location. gvproxy can be found in the containers/gvisor-tap-vsock github repo. [NO TESTS NEEDED] Signed-off-by: Brent Baude <bbaude@redhat.com>
* | | | | Merge pull request #10508 from matejvasek/fix-from-imgOpenShift Merge Robot2021-06-01
|\ \ \ \ \ | | | | | | | | | | | | Better error handing for images/create compat api
| * | | | | Better error handing for images/create compat apiMatej Vasek2021-05-31
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If server cannot resolve short name due to enforcing policy send non-2xx status code. [NO TESTS NEEDED] Signed-off-by: Matej Vasek <mvasek@redhat.com>
* | | | | Merge pull request #10510 from matejvasek/improve-creat-from-imgOpenShift Merge Robot2021-06-01
|\ \ \ \ \ | | | | | | | | | | | | Use request context instead of background context
| * | | | | Use request context instead of background contextMatej Vasek2021-06-01
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a goroutine leak. Previously if request was cancelled the image pulling goroutine kept running regardless. [NO TESTS NEEDED] Signed-off-by: Matej Vasek <mvasek@redhat.com>
* | | | | Merge pull request #10516 from vrothberg/fix-10512OpenShift Merge Robot2021-06-01
|\ \ \ \ \ | | | | | | | | | | | | [CI:DOCS] rm containers-mounts.conf.5.md
| * | | | | [CI:DOCS] rm containers-mounts.conf.5.mdValentin Rothberg2021-06-01
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code for mounts.conf including the man page lives in containers/common, so remove it from Podman to prevent divergence among the two repositories. Fixes: #10512 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | | Merge pull request #10518 from zhangguanzhang/api-networks-listOpenShift Merge Robot2021-06-01
|\ \ \ \ \ | |/ / / / |/| | | | [NO TESTS NEEDED] Fixes API list networks returns "null" instead of empty array when used with no networks
| * | | | [NO TESTS NEEDED] API list networks should return [] when used with no networkszhangguanzhang2021-06-01
|/ / / / | | | | | | | | | | | | Signed-off-by: zhangguanzhang <zhangguanzhang@qq.com>
* | | | Merge pull request #10504 from ↵OpenShift Merge Robot2021-06-01
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | containers/dependabot/go_modules/github.com/onsi/ginkgo-1.16.3 Bump github.com/onsi/ginkgo from 1.16.2 to 1.16.3
| * | | Bump github.com/onsi/ginkgo from 1.16.2 to 1.16.3dependabot[bot]2021-05-31
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/onsi/ginkgo](https://github.com/onsi/ginkgo) from 1.16.2 to 1.16.3. - [Release notes](https://github.com/onsi/ginkgo/releases) - [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md) - [Commits](https://github.com/onsi/ginkgo/compare/v1.16.2...v1.16.3) Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | Merge pull request #10450 from ↵OpenShift Merge Robot2021-05-31
|\ \ \ | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/uber/jaeger-client-go-2.29.1incompatible Bump github.com/uber/jaeger-client-go from 2.28.0+incompatible to 2.29.1+incompatible
| * | | Bump github.com/uber/jaeger-client-godependabot[bot]2021-05-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/uber/jaeger-client-go](https://github.com/uber/jaeger-client-go) from 2.28.0+incompatible to 2.29.1+incompatible. - [Release notes](https://github.com/uber/jaeger-client-go/releases) - [Changelog](https://github.com/jaegertracing/jaeger-client-go/blob/master/CHANGELOG.md) - [Commits](https://github.com/uber/jaeger-client-go/compare/v2.28.0...v2.29.1) Signed-off-by: dependabot[bot] <support@github.com>
* | | | Merge pull request #10506 from vrothberg/fix-10493OpenShift Merge Robot2021-05-31
|\ \ \ \ | |/ / / |/| | | generate systemd: make mounts portable
| * | | generate systemd: make mounts portableValentin Rothberg2021-05-31
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 748826fc88fc fixed a bug where slow mounting of the runroot was causing issues when the units are started at boot. The fix was to add the container's runroot to the required mounts; the graph root has been added as well. Hard-coding the run- and graphroot to the required mounts, however, breaks the portability of units generated with --now. Those units are intended to be running on any machine as, theoreticaly, any user. Make the mounts portable by using the `%t` macro for the run root. Since the graphroot's location varies across root and ordinary users, drop it from the list of required mounts. The graphroot was not causing issues. Fixes: #10493 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | Merge pull request #10502 from rugk/patch-1OpenShift Merge Robot2021-05-31
|\ \ \ | |/ / |/| | [CI:DOCS] fix: add missing space
| * | add missing spacerugk2021-05-31
|/ / | | | | | | | | | | Fixes a small typo in the man page. :slightly_smiling_face: Signed-off-by: rugk <rugk+git@posteo.de>
* | Merge pull request #10481 from flouthoc/fix-sigsegv-rootlessOpenShift Merge Robot2021-05-30
|\ \ | | | | | | rootless: fix SIGSEGV, Make `LISTEN_FDNAMES` optional
| * | rootless: fix SIGSEGV ,make LISTEN_FDNAMES optional [Closes #10435].flouthoc2021-05-29
| | | | | | | | | | | | | | | | | | [NO TESTS NEEDED] Signed-off-by: flouthoc <flouthoc.git@gmail.com>