summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* vendor containers/common@mainValentin Rothberg2021-07-02
| | | | | | | Pull in fixes for local image lookups. Fixes: #10835 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* Merge pull request #10804 from matejvasek/fix-cp-sub-cmdOpenShift Merge Robot2021-07-01
|\ | | | | Implement --archive flag for podman cp
| * Implement --archive flag for podman cpMatej Vasek2021-07-01
| | | | | | | | Signed-off-by: Matej Vasek <mvasek@redhat.com>
* | Merge pull request #10837 from giuseppe/ignore-ESRCHOpenShift Merge Robot2021-07-01
|\ \ | |/ |/| podman: ignore ESRCH from kill
| * podman: ignore ESRCH from killGiuseppe Scrivano2021-07-01
|/ | | | | | | | Closes: https://github.com/containers/podman/issues/10826 [NO TESTS NEEDED] Fixes a race condition Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* Merge pull request #10816 from rhatdan/networkOpenShift Merge Robot2021-06-30
|\ | | | | Handle advanced --network options in podman play kube
| * Handle advanced --network options in podman play kubeDaniel J Walsh2021-06-30
|/ | | | | | | | Since Podman create/run can support this, so should play. Fixes: https://github.com/containers/podman/issues/10807 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* Merge pull request #10827 from cevich/master_to_mainOpenShift Merge Robot2021-06-30
|\ | | | | Cirrus: Fixes due to master->main rename
| * Cirrus: Fixes due to master->main renameChris Evich2021-06-30
|/ | | | Signed-off-by: Chris Evich <cevich@redhat.com>
* Merge pull request #10823 from vrothberg/vendor-commonOpenShift Merge Robot2021-06-30
|\ | | | | vendor containers/common@7482cf851dcc
| * vendor containers/common@7482cf851dccValentin Rothberg2021-06-30
| | | | | | | | | | | | | | Make sure that image events are written *after* execution. Fixes: #10812 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | Merge pull request #10749 from TomSweeneyRedHat/dev/tsweeney/cni2.2.1_docOpenShift Merge Robot2021-06-30
|\ \ | | | | | | Add CNI rootless networking troubleshooting for v2.2.1
| * | Add CNI rootless networking troubleshooting for v2.2.1TomSweeneyRedHat2021-06-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | A CNI container image is required for rootless networking in V2.2.1 (RHEL 8.3.1) and through v3.0.1. Add a note in the troubleshooting guide with a pointer to the documenation for that. Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
* | | Merge pull request #10789 from flouthoc/system-reset-prune-externalOpenShift Merge Robot2021-06-30
|\ \ \ | |_|/ |/| | reset: remove external containers on podman system reset
| * | reset: remove external containers on podman system resetflouthoc2021-06-30
| | | | | | | | | | | | | | | | | | [NO TESTS NEEDED] Signed-off-by: flouthoc <flouthoc.git@gmail.com>
* | | Merge pull request #10761 from ↵OpenShift Merge Robot2021-06-30
|\ \ \ | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/containers/storage-1.32.4 Bump github.com/containers/storage from 1.32.3 to 1.32.4
| * | | Bump github.com/containers/storage from 1.32.3 to 1.32.5Daniel J Walsh2021-06-29
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/containers/storage](https://github.com/containers/storage) from 1.32.3 to 1.32.5. - [Release notes](https://github.com/containers/storage/releases) - [Changelog](https://github.com/containers/storage/blob/main/docs/containers-storage-changes.md) - [Commits](https://github.com/containers/storage/compare/v1.32.3...v1.32.5) --- updated-dependencies: - dependency-name: github.com/containers/storage dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #10821 from jwhonce/wip/connectionOpenShift Merge Robot2021-06-30
|\ \ \ | | | | | | | | Enhance system connection add URL input
| * | | Enhance system connection add URL inputJhon Honce2021-06-29
|/ / / | | | | | | | | | | | | | | | * Add support for the tcp and unix schemes in connection URLs. Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | Merge pull request #10819 from ashley-cui/connlsOpenShift Merge Robot2021-06-29
|\ \ \ | |/ / |/| | [NO TESTS NEEDED] Make system connection ls deterministic
| * | Make system connection ls deterministicAshley Cui2021-06-29
| | | | | | | | | | | | | | | | | | Sort system connection ls by name, making the output deterministic. Previously, we were just iterating through a map, which caused CI flakes. Signed-off-by: Ashley Cui <acui@redhat.com>
* | | Merge pull request #10811 from ↵OpenShift Merge Robot2021-06-29
|\ \ \ | |/ / |/| | | | | | | | containers/dependabot/go_modules/github.com/containers/ocicrypt-1.1.2 Bump github.com/containers/ocicrypt from 1.1.1 to 1.1.2
| * | Bump github.com/containers/ocicrypt from 1.1.1 to 1.1.2dependabot[bot]2021-06-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/containers/ocicrypt](https://github.com/containers/ocicrypt) from 1.1.1 to 1.1.2. - [Release notes](https://github.com/containers/ocicrypt/releases) - [Commits](https://github.com/containers/ocicrypt/compare/v1.1.1...v1.1.2) --- updated-dependencies: - dependency-name: github.com/containers/ocicrypt dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
* | | Merge pull request #10803 from lsm5/remove-cni-conflistOpenShift Merge Robot2021-06-29
|\ \ \ | |/ / |/| | Makefile: remove install.cni
| * | Makefile: remove install.cniLokesh Mandvekar2021-06-28
| |/ | | | | | | | | | | | | We no longer need to install /etc/cni/net.d/87-podman-bridge.conflist so install.cni isn't needed either. Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
* | Merge pull request #10786 from tobwen/tobwen-ETCDIROpenShift Merge Robot2021-06-28
|\ \ | |/ |/| [NO TEST NEEDED] prefix `ETCDIR` with `${PREFIX}/`
| * prefix `ETCDIR` with `${PREFIX}/`tobwen2021-06-26
|/ | | | | | `ETCDIR` isn't prefixed and led to dangling files in `DESTDIR/etc` Signed-off-by: Tobias Wendorff <1864057+tobwen@users.noreply.github.com>
* Merge pull request #10736 from trusch/feature-use-secret-configOpenShift Merge Robot2021-06-25
|\ | | | | read secret config from config file if no user data.
| * make DriverOpts name consistent.Tino Rusch2021-06-25
| | | | | | | | Signed-off-by: Tino Rusch <tino.rusch@gmail.com>
| * read secret config from config file if no user data.Tino Rusch2021-06-24
| | | | | | | | | | | | | | | | | | | | | | | | feat: read secret config from config file if the user hasn't entered explicit config values feat: allow to specify `--driver-opts opt1=val1,opt2=val2` in the secret create command to allow overriding the default values fix: show driver options in `podman secret inspect` Signed-off-by: Tino Rusch <tino.rusch@gmail.com>
* | Merge pull request #10774 from vrothberg/registriesOpenShift Merge Robot2021-06-25
|\ \ | | | | | | remove `pkg/registries`
| * | remove `pkg/registries`Valentin Rothberg2021-06-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pull the trigger on the `pkg/registries` package which acted as a proxy for `c/image/pkg/sysregistriesv2`. Callers should be using the packages from c/image directly, if needed at all. Also make use of libimage's SystemContext() method which returns a copy of a system context, further reducing the risk of unintentionally altering global data. [NO TESTS NEEDED] Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | Merge pull request #10416 from tych0/activation-drop-FDNAMESOpenShift Merge Robot2021-06-25
|\ \ \ | | | | | | | | pkg/systemd: don't require LISTEN_FDNAMES for socket activation
| * | | pkg/systemd: don't require LISTEN_FDNAMES for socket activationTycho Andersen2021-06-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LISTEN_FDNAMES is optional, the docs for sd_listen_fds() says: This information is read from the $LISTEN_FDNAMES variable, which **may** contain a colon-separated list of names. emphasis mine (indeed, the cited coreos code also suggests it is optional). This actually results in bug, since the default /contrib/systemd/system/podman.socket file doesn't set a FileDescriptorName=. podman when run with this systemd configuration *always* starts in unix socket mode since SocketActivated() will return false because the name is missing. The bug is a race with a very small window: between when podman does the unlink() and when it re-binds the socket later in the code, requests made during this time will fail since nothing is listening. There's another small race when the service stops and systemd realizes it and starts listening again. However, small this window we managed to hit it :). Let's fix this by ignoring LISTEN_FDNAMES. Since the code in cmd/podman/system/service_abi.go:restService() ignores this value anyway when setting up the socket activated stuff, there's no real loss here. Signed-off-by: Tycho Andersen <tycho@tycho.pizza>
* | | | Merge pull request #10768 from xabinapal/issue-10767OpenShift Merge Robot2021-06-25
|\ \ \ \ | |_|/ / |/| | | [NO TESTS NEEDED] Swap private and shared mount relabel options
| * | | fix: swapped volume relabel option valuesXabier Napal2021-06-24
| | | | | | | | | | | | | | | | Signed-off-by: Xabier Napal <xabiernapal@pm.me>
* | | | Merge pull request #10771 from infiniteregrets/cliOpenShift Merge Robot2021-06-24
|\ \ \ \ | |_|/ / |/| | | [NO TESTS NEEDED] Suggestions for typos/ incorrect commands for Podman CLI
| * | | [NO TESTS NEEDED] suggestions for incorrect cmdsMehul Arora2021-06-24
| | |/ | |/| | | | | | | Signed-off-by: Mehul Arora <aroram18@mcmaster.ca>
* | | Merge pull request #10760 from vrothberg/save-docsOpenShift Merge Robot2021-06-24
|\ \ \ | | | | | | | | [CI:DOCS] podman save: clarify formats and transports
| * | | [CI:DOCS] podman save: clarify formats and transportsValentin Rothberg2021-06-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Mention all supports --format values and put them into the context of supported transports. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | Merge pull request #10773 from vrothberg/mtrmacOpenShift Merge Robot2021-06-24
|\ \ \ \ | | | | | | | | | | [CI:DOCS] add @mtrmac to OWNERS
| * | | | add @mtrmac to OWNERSValentin Rothberg2021-06-24
| | |/ / | |/| | | | | | | | | | | | | | | | | | With great power comes great `/lgtm`. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | Merge pull request #10772 from vrothberg/fix-cpOpenShift Merge Robot2021-06-24
|\ \ \ \ | |/ / / |/| | | cp: do not allow dir->file copying
| * | | cp: do not allow dir->file copyingValentin Rothberg2021-06-24
|/ / / | | | | | | | | | | | | | | | | | | | | | Fix a bug in `podman-cp` to forbid copying directories to files. Previously, the directory was copied to the parent directory of the file which is wrong. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | Merge pull request #10583 from rhatdan/logOpenShift Merge Robot2021-06-24
|\ \ \ | | | | | | | | Support log_tag defaults from containers.conf
| * | | Support log_tag defaults from containers.confDaniel J Walsh2021-06-23
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: https://github.com/containers/podman/issues/10204 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #10766 from Procyhon/13062021_manpageOpenShift Merge Robot2021-06-24
|\ \ \ \ | |_|/ / |/| | | [CI:DOCS] Follow-up to PR 10676
| * | | [CI:DOCS] Follow-up to PR 10676Alexander Richter2021-06-23
| | | | | | | | | | | | | | | | | | | | | | | | See [PR 10676](https://github.com/containers/podman/pull/10676). Signed-off-by: Alexander Richter <67486332+Procyhon@users.noreply.github.com>
* | | | Merge pull request #10765 from umohnani8/mtabOpenShift Merge Robot2021-06-23
|\ \ \ \ | |_|_|/ |/| | | Create /etc/mtab with the correct ownership
| * | | [NO TESTS NEEDED] Create /etc/mtab with the correct ownershipUrvashi Mohnani2021-06-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create the /etc and /etc/mtab directories with the correct ownership based on what the UID and GID is for the container. This was causing issue when starting the infra container with userns as the /etc directory wasn't being created with the correct ownership. Signed-off-by: Urvashi Mohnani <umohnani@redhat.com>
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-12-24 19:02:28 +0000