summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #6470 from mheon/fix_stats_nonetOpenShift Merge Robot2020-06-04
|\ | | | | Properly follow linked namespace container for stats
| * Properly follow linked namespace container for statsMatthew Heon2020-06-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Podman containers can specify that they get their network namespace from another container. This is automatic in pods, but any container can do it. The problem is that these containers are not guaranteed to have a network namespace of their own; it is perfectly valid to join the network namespace of a --net=host container, and both containers will end up in the host namespace. The code for obtaining network stats did not account for this, and could cause segfaults as a result. Fortunately, the fix is simple - the function we use to get said stats already performs appropriate checks, so we just need to recursively call it. Fixes #5652 Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | Merge pull request #6486 from baude/v2infoaddsocketOpenShift Merge Robot2020-06-04
|\ \ | | | | | | add socket information to podman info
| * | add socket information to podman infoBrent Baude2020-06-03
| | | | | | | | | | | | | | | | | | | | | this is step 1 to self-discovery of remote ssh connections. we add a remotesocket struct to info to detect what the socket path might be. Co-authored-by: Jhon Honce <jhonce@redhat.com> Signed-off-by: Brent Baude <bbaude@redhat.com>
* | | Merge pull request #6404 from ↵OpenShift Merge Robot2020-06-04
|\ \ \ | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/containers/conmon-2.0.17incompatible Bump github.com/containers/conmon from 2.0.16+incompatible to 2.0.17+incompatible
| * | | Bump github.com/containers/conmonDaniel J Walsh2020-06-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/containers/conmon](https://github.com/containers/conmon) from 2.0.16+incompatible to 2.0.17+incompatible. - [Release notes](https://github.com/containers/conmon/releases) - [Changelog](https://github.com/containers/conmon/blob/master/changelog.txt) - [Commits](https://github.com/containers/conmon/compare/v2.0.16...v2.0.17) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #6484 from rhatdan/namespaceOpenShift Merge Robot2020-06-04
|\ \ \ \ | | | | | | | | | | Namespace fields were set with bogus values
| * | | | Namespace fields were set with bogus valuesDaniel J Walsh2020-06-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Namespace fields were being set with their option names unless overriden by the user. This was causing issues with podman-remote on userns. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | Merge pull request #6476 from eriksjolund/add_some_CVE_entries_to_changelog.txtOpenShift Merge Robot2020-06-04
|\ \ \ \ \ | | | | | | | | | | | | Add a few CVE entries to changelog.txt
| * | | | | Add a few CVE entries to changelog.txtErik Sjölund2020-06-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the following CVE entries CVE-2020-1726 CVE-2020-10696 CVE-2019-18466 to changelog.txt Signed-off-by: Erik Sjölund <erik.sjolund@gmail.com>
* | | | | | Merge pull request #6482 from mheon/split_inspectOpenShift Merge Robot2020-06-04
|\ \ \ \ \ \ | | | | | | | | | | | | | | Ensure that image/container inspect are specialized
| * | | | | | Ensure that image/container inspect are specializedMatthew Heon2020-06-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We are currently able to inspect images with `podman container inspect` and containers with `podman image inspect` and neither of those seem correct. This ensures that the appropriate flags, and only the appropriate flags, are available for each specialized exec, and they can only inspect the specific type they were intended to. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | | | | Merge pull request #6487 from rhatdan/VENDOROpenShift Merge Robot2020-06-04
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Vendor in container/storage v1.20.2
| * | | | | | | Vendor in container/storage v1.20.2Daniel J Walsh2020-06-03
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also modify gate Dockerfile to take advantage of skipping mounting of the storage directory. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | | | Merge pull request #6478 from rhatdan/abisupportOpenShift Merge Robot2020-06-03
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove use of ABISupport buildtag
| * | | | | | | Remove use of ABISupport buildtagDaniel J Walsh2020-06-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to default to building podman. If you specify no build tags you will not build podman, not podman-remote. Just using remote flag to indicate podman-remote and !remote for podman. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | | | | Merge pull request #6483 from mheon/cleanup_on_stopOpenShift Merge Robot2020-06-03
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | When stopping containers locally, ensure cleanup runs
| * | | | | | | When stopping containers locally, ensure cleanup runsMatthew Heon2020-06-03
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cleanup process was already running and ensuring that mounts and networking configuration was cleaned up on container stop, but this was async from the actual `podman stop` command which breaks some expectations - the container is still mounted at the end of `podman stop` and will be cleaned up soon, but not immediately. Fortunately, it's a trivial change to resolve this. Fixes #5747 Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | | | | Merge pull request #6461 from chuanchang/add_contaner_cases_for_apiv2OpenShift Merge Robot2020-06-03
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | test.apiv2: add test cases for committing an image from a container
| * | | | | | test.apiv2: add test cases for committing an image from a containerAlex Jia2020-06-03
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Testing query parameters: container, repo, tag, comment, author, changes and pause. Signed-off-by: Alex Jia <chuanchang.jia@gmail.com>
* | | | | | Merge pull request #6465 from rhatdan/remoteOpenShift Merge Robot2020-06-03
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Add more Remote tests
| * | | | | Add more Remote testsDaniel J Walsh2020-06-03
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | Merge pull request #6469 from jwhonce/wip/authOpenShift Merge Robot2020-06-03
|\ \ \ \ \ | | | | | | | | | | | | V2 Add support for ssh authentication methods
| * | | | | V2 Add support for ssh authentication methodsJhon Honce2020-06-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * podman --remote ssh://<user>:<password>@<host>:<port><path> * podman --remote ssh://<user>:<password>@<host>:<port><path> \ --identity <path> --passphrase <phrase> * ssh-add <key> podman --remote ssh://<user>@<host><path> * Fix `podman help` to run even if podman missing components * Prompt for passphrase on stdin IFF key is protected and passphrase not given via any other configuration * cobra flags do not support optional value flags therefore refactored --remote to be a boolean and --url will now contain the URI to Podman service Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | | | | Merge pull request #6473 from mheon/fix_inspect_segfaultOpenShift Merge Robot2020-06-03
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix a segfault in `podman inspect -l` w/ no containers
| * | | | | Fix a segfault in `podman inspect -l` w/ no containersMatthew Heon2020-06-02
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We also need to rework container/image inspect to be separate, but that can happen in another PR. Fixes #6472 Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | | Merge pull request #6477 from rhatdan/specOpenShift Merge Robot2020-06-03
|\ \ \ \ \ | |_|_|/ / |/| | | | RHEL8 and Centos8 don't have oci-runtime yet
| * | | | RHEL8 and Centos8 don't have oci-runtime yetDaniel J Walsh2020-06-03
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | For the time being we need to just require runc this should fix rdoproject.org/github-check Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #6474 from QiWang19/remote-cidfile-testOpenShift Merge Robot2020-06-03
|\ \ \ \ | |/ / / |/| | | Turn on remote rm_test
| * | | Turn on remote rm_test --cidfileQi Wang2020-06-02
|/ / / | | | | | | | | | | | | | | | Turn on remote rm_test --cidfile Signed-off-by: Qi Wang <qiwan@redhat.com>
* | | Merge pull request #6471 from mheon/troubleshooting_77OpenShift Merge Robot2020-06-03
|\ \ \ | | | | | | | | Remove reference to "upcoming" RHEL 7.7
| * | | Remove reference to "upcoming" RHEL 7.7Matthew Heon2020-06-02
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | 7.7 has been released for a while now, so change troubleshooting reference to indicate that. Fixes #6349 Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | Merge pull request #6468 from mheon/remote_detached_execOpenShift Merge Robot2020-06-03
|\ \ \ | | | | | | | | Enable detached exec for remote
| * | | Bump Conmon in COPR specMatthew Heon2020-06-02
| | | | | | | | | | | | | | | | | | | | | | | | We need 2.0.17 for detached remote exec. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | | Enable detached exec for remoteMatthew Heon2020-06-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The biggest obstacle here was cleanup - we needed a way to remove detached exec sessions after they exited, but there's no way to tell if an exec session will be attached or detached when it's created, and that's when we must add the exit command that would do the removal. The solution was adding a delay to the exit command (5 minutes), which gives sufficient time for attached exec sessions to retrieve the exit code of the session after it exits, but still guarantees that they will be removed, even for detached sessions. This requires Conmon 2.0.17, which has the new `--exit-delay` flag. As part of the exit command rework, we can drop the hack we were using to clean up exec sessions (remove them as part of inspect). This is a lot cleaner, and I'm a lot happier about it. Otherwise, this is just plumbing - we need a bindings call for detached exec, and that needed to be added to the tunnel mode backend for entities. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | Merge pull request #6467 from baude/v2windowsenvOpenShift Merge Robot2020-06-02
|\ \ \ \ | |_|/ / |/| | | make env handling os dependent
| * | | make env handling os dependentBrent Baude2020-06-02
| | | | | | | | | | | | | | | | | | | | | | | | environment variables are handled differently on windows vs linux. here we split them to be handled but no actually processing of windows environment variables was done. it can be added for future. hoowever, now we dont get errors on windows about processing them. Signed-off-by: Brent Baude <bbaude@redhat.com>
* | | | Merge pull request #6435 from QiWang19/uidOpenShift Merge Robot2020-06-02
|\ \ \ \ | | | | | | | | | | check --user range for rootless containers
| * | | | check --user range for rootless containersQi Wang2020-06-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check --user range if it's a uid for rootless containers. Returns error if it is out of the range. From https://github.com/containers/libpod/issues/6431#issuecomment-636124686 Signed-off-by: Qi Wang <qiwan@redhat.com>
* | | | | Merge pull request #6460 from vrothberg/no-truncOpenShift Merge Robot2020-06-02
|\ \ \ \ \ | |_|_|/ / |/| | | | images --no-trunc: fix ID formatting
| * | | | images --no-trunc: fix ID formattingValentin Rothberg2020-06-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the redundant `sha256:` prefix from the image IDs. Fixes: #6459 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | | Merge pull request #6457 from rhatdan/psgoOpenShift Merge Robot2020-06-02
|\ \ \ \ \ | |_|_|/ / |/| | | | Update vendor containers/psgo
| * | | | Update vendor containers/psgoDaniel J Walsh2020-06-02
| |/ / / | | | | | | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #6445 from ↵OpenShift Merge Robot2020-06-02
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/onsi/ginkgo-1.12.3 Bump github.com/onsi/ginkgo from 1.12.2 to 1.12.3
| * | | | Bump github.com/onsi/ginkgo from 1.12.2 to 1.12.3dependabot-preview[bot]2020-06-02
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/onsi/ginkgo](https://github.com/onsi/ginkgo) from 1.12.2 to 1.12.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.12.2...v1.12.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #6463 from ↵OpenShift Merge Robot2020-06-02
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/coreos/go-systemd/v22-22.1.0 Bump github.com/coreos/go-systemd/v22 from 22.0.0 to 22.1.0
| * | | | Bump github.com/coreos/go-systemd/v22 from 22.0.0 to 22.1.0dependabot-preview[bot]2020-06-02
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/coreos/go-systemd/v22](https://github.com/coreos/go-systemd) from 22.0.0 to 22.1.0. - [Release notes](https://github.com/coreos/go-systemd/releases) - [Commits](https://github.com/coreos/go-systemd/compare/v22.0.0...v22.1.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #6462 from ↵OpenShift Merge Robot2020-06-02
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | containers/dependabot/go_modules/github.com/opencontainers/runc-1.0.0-rc90 Bump github.com/opencontainers/runc from 1.0.0-rc9 to 1.0.0-rc90
| * | | Bump github.com/opencontainers/runc from 1.0.0-rc9 to 1.0.0-rc90dependabot-preview[bot]2020-06-02
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/opencontainers/runc](https://github.com/opencontainers/runc) from 1.0.0-rc9 to 1.0.0-rc90. - [Release notes](https://github.com/opencontainers/runc/releases) - [Commits](https://github.com/opencontainers/runc/compare/v1.0.0-rc9...v1.0.0-rc90) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #6455 from rhatdan/detatchkeysOpenShift Merge Robot2020-06-02
|\ \ \ | | | | | | | | Add information on detach-keys
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-06 21:26:54 +0000