summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #12887 from esendjer/mainOpenShift Merge Robot2022-01-19
|\ | | | | Add custom defined dependencies to podman generate systemd
| * Handlers for `generate systemd` with custom dependenciesesendjer2022-01-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit includes: * Handlers for generate systemd unit with manually defined dependencies such as: Wants=, After= and Requires= * The new unit and e2e tests for checking generated systemd units for container and pod with custom dependencies * Documented descriptions for custom dependencies options Signed-off-by: Eugene (Evgenii) Shubin <esendjer@gmail.com>
* | Merge pull request #12916 from n1hility/winproxyOpenShift Merge Robot2022-01-19
|\ \ | | | | | | Implement API forwarding for podman machine on Windows
| * | Implement API forwarding for podman machine on WindowsJason T. Greene2022-01-19
| |/ | | | | | | Signed-off-by: Jason T. Greene <jason.greene@redhat.com>
* | Merge pull request #12914 from rhatdan/commitOpenShift Merge Robot2022-01-19
|\ \ | | | | | | Handle changes in docker compat mode
| * | Handle changes in docker compat modeDaniel J Walsh2022-01-19
| | | | | | | | | | | | | | | | | | Fixes: https://github.com/containers/podman/issues/12830 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #12925 from edsantiago/apiv2_logsOpenShift Merge Robot2022-01-19
|\ \ \ | |/ / |/| | APIv2 tests: followup to recent log test
| * | APIv2 tests: followup to recent log testEd Santiago2022-01-19
|/ / | | | | | | | | | | | | | | | | | | | | | | | | Followup to #12919, which merged while I was writing review feedback. This actually confirms log output. This required a minor change to the 't' helper: stripping NUL chars from the http result. And, while I'm at it, a bunch of cleanup for running rootless: - set $CONTAINERS_HELPER_BINARY_DIR, so we can find rootlessport - add a few conditionals for different expectations Signed-off-by: Ed Santiago <santiago@redhat.com>
* | Merge pull request #12921 from ↵OpenShift Merge Robot2022-01-19
|\ \ | | | | | | | | | | | | containers/dependabot/go_modules/github.com/opencontainers/runc-1.1.0 Bump github.com/opencontainers/runc from 1.0.3 to 1.1.0
| * | Bump github.com/opencontainers/runc from 1.0.3 to 1.1.0dependabot[bot]2022-01-19
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/opencontainers/runc](https://github.com/opencontainers/runc) from 1.0.3 to 1.1.0. - [Release notes](https://github.com/opencontainers/runc/releases) - [Changelog](https://github.com/opencontainers/runc/blob/master/CHANGELOG.md) - [Commits](https://github.com/opencontainers/runc/compare/v1.0.3...v1.1.0) --- updated-dependencies: - dependency-name: github.com/opencontainers/runc dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
* | Merge pull request #12862 from matejvasek/fix-info-epOpenShift Merge Robot2022-01-19
|\ \ | | | | | | Add IndexConfigs info to compat /info endpoint
| * | Add IndexConfigs to compat /info endpointMatej Vasek2022-01-19
| | | | | | | | | | | | Signed-off-by: Matej Vasek <mvasek@redhat.com>
* | | Merge pull request #12915 from kolyshkin/patch-1OpenShift Merge Robot2022-01-19
|\ \ \ | | | | | | | | [CI:DOCS] SECURITY.md: fix the project name
| * | | SECURITY.md: fix the project nameKir Kolyshkin2022-01-18
| | |/ | |/| | | | | | | Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
* | | Merge pull request #12919 from vrothberg/fix-12904OpenShift Merge Robot2022-01-19
|\ \ \ | |/ / |/| | apiv2 test: add regression test for #12904
| * | apiv2 test: add regression test for #12904Valentin Rothberg2022-01-19
|/ / | | | | | | | | | | | | | | | | Add a regression test for issue #12904 to make sure that attaching with logs=true to the compact endpoint does not blow up. Note that I did not find a way to test the output (i.e., '123'); logs are sent in a binary format and I did not find a way to compare the control characters. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | Merge pull request #12908 from Luap99/network-conf-dirOpenShift Merge Robot2022-01-18
|\ \ | | | | | | rename --cni-config-dir to --network-config-dir
| * | rename --cni-config-dir to --network-config-dirPaul Holzinger2022-01-18
| | | | | | | | | | | | | | | | | | | | | | | | Since this option will also be used for netavark we should rename it to something more generic. It is important that --cni-config-dir still works otherwise we could break existing container cleanup commands. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* | | Merge pull request #12909 from vrothberg/fix-12904OpenShift Merge Robot2022-01-18
|\ \ \ | |_|/ |/| | compat attach: fix write on closed channel
| * | compat attach: fix write on closed channelValentin Rothberg2022-01-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | Waiting on an initialized sync.WaitGroup returns immediately. Hence, move the goroutine to wait and close *after* reading the logs. Fixes: #12904 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | Merge pull request #12894 from Luap99/depsOpenShift Merge Robot2022-01-18
|\ \ \ | |/ / |/| | upgrade all dependencies
| * | upgrade all dependenciesPaul Holzinger2022-01-18
| |/ | | | | | | | | | | | | | | | | | | | | The dependabot does not update dependencies when they do not use a tag. This patch upgrades all untagged depenencies if possible. You can upgrade all dependencies with `go get -u ./... && make vendor` in theory however this failed since the k8s changes do not compile on go v1.16 so I only updated the other dependencies. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* | Merge pull request #12797 from edsantiago/test_image_scp_sudoOpenShift Merge Robot2022-01-18
|\ \ | |/ |/| Tests for podman image scp (the sudo form)
| * CI: rootless user: also create in some root testsEd Santiago2022-01-17
| | | | | | | | | | | | | | | | | | | | | | | | viz, rootful system tests. The rootless account will be used by image-scp tests. Unfortunately, having ssh available means the system-connection tests will start running, which is very bad because they will fail, because system connection doesn't actually work (long story). Add a few more checks to prevent this test from running. Signed-off-by: Ed Santiago <santiago@redhat.com>
| * [WIP] Tests for podman image scp (the sudo form)Ed Santiago2022-01-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Start inching our way back to having tests for the sudo form of podman image scp. Basically, copy an image to another user and then back, using a pseudorandom name. Confirm that the image makes it to the remote end, and that when we copy it back, the original image digest is preserved. When scp'ing as root, we identify the destination rootless user account via the $PODMAN_ROOTLESS_USER envariable. Setting this and creating the account is left as an exercise for the CI framework (be it github, or Fedora/CentOS/RHEL gating, or other). Also: amend hack/bats to set and relay $PODMAN_ROOTLESS_USER, so developers can test locally. Also: remove what I'm 99% sure is a debugging printf. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | Merge pull request #12900 from ↵OpenShift Merge Robot2022-01-18
|\ \ | | | | | | | | | | | | containers/dependabot/go_modules/github.com/opencontainers/runc-1.1.0 Bump github.com/opencontainers/runc from 1.0.3 to 1.1.0
| * | Bump github.com/opencontainers/runc from 1.0.3 to 1.1.0dependabot[bot]2022-01-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/opencontainers/runc](https://github.com/opencontainers/runc) from 1.0.3 to 1.1.0. - [Release notes](https://github.com/opencontainers/runc/releases) - [Changelog](https://github.com/opencontainers/runc/blob/master/CHANGELOG.md) - [Commits](https://github.com/opencontainers/runc/compare/v1.0.3...v1.1.0) --- updated-dependencies: - dependency-name: github.com/opencontainers/runc dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
* | | Merge pull request #12905 from cevich/re-enable_osxOpenShift Merge Robot2022-01-18
|\ \ \ | | | | | | | | [CI:DOCS] Restore OSX cross-build task
| * | | Revert "Cirrus: Temporarily disable OSX Cross task"Chris Evich2022-01-18
|/ / / | | | | | | | | | | | | | | | This reverts commit 860463d97eb3a006f2c608165d9e657be86080ec. Signed-off-by: Chris Evich <cevich@redhat.com>
* | | Merge pull request #12897 from vrothberg/bump-moduleOpenShift Merge Robot2022-01-18
|\ \ \ | |/ / |/| | bump go module to version 4
| * | bump go module to version 4Valentin Rothberg2022-01-18
|/ / | | | | | | | | | | | | | | | | | | | | | | | | Automated for .go files via gomove [1]: `gomove github.com/containers/podman/v3 github.com/containers/podman/v4` Remaining files via vgrep [2]: `vgrep github.com/containers/podman/v3` [1] https://github.com/KSubedi/gomove [2] https://github.com/vrothberg/vgrep Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | Merge pull request #12684 from mheon/remap_statesOpenShift Merge Robot2022-01-18
|\ \ | | | | | | Revamp Libpod state strings for Docker compat
| * | Revamp Libpod state strings for Docker compatMatthew Heon2022-01-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve our compatibility with Docker by better handling the state strings that we print in `podman ps`. Docker capitalizes all states in `ps` (we do not) - fix this in our PS code. Also, stop normalizing ContainerStateConfigured to the "Created" state, and instead make it always be Created, with the existing Created state becoming Initialized. I didn't rename the actual states because I'm somewhat reticent to make such a large change a day before we leave for break. It's somewhat confusing that ContainerStateConfigured now returns Created, but internally and externally we're still consistent. [NO NEW TESTS NEEDED] existing tests should catch anything that broke. I also consider this a breaking change. I will flag appropriately on Github. Fixes RHBZ#2010432 and RHBZ#2032561 Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | Merge pull request #12870 from rhatdan/userns1OpenShift Merge Robot2022-01-18
|\ \ \ | | | | | | | | Use PODMAN_USERNS environment variable when running as a service
| * | | Use PODMAN_USERNS environment variable when running as a serviceDaniel J Walsh2022-01-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: https://github.com/containers/podman/issues/11350#issuecomment-1011562526 Also add inspect information about the idmappings if they exists. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #12891 from lsm5/copr-fix-2OpenShift Merge Robot2022-01-17
|\ \ \ \ | |_|_|/ |/| | | [NO NEW TESTS NEEDED] add builddeps to copr template
| * | | [NO NEW TESTS NEEDED] add builddeps to copr templateLokesh Mandvekar2022-01-17
| | |/ | |/| | | | | | | Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
* | | Merge pull request #12893 from cevich/tmp_dis_osxOpenShift Merge Robot2022-01-17
|\ \ \ | | | | | | | | [CI:DOCS] Cirrus: Temporarily disable OSX Cross task
| * | | Cirrus: Temporarily disable OSX Cross taskChris Evich2022-01-17
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | At the time of this commit, something is broken within Cirrus-CI or dependent infrastructure. This appears to be causing all OSX tasks to hang in the scheduling queue indefinitely. Workaround this by disabling the task to allow development work to proceed while a fix is realized. Signed-off-by: Chris Evich <cevich@redhat.com>
* | | Merge pull request #12892 from Luap99/commonOpenShift Merge Robot2022-01-17
|\ \ \ | |/ / |/| | update c/common to latest
| * | update c/common to latestPaul Holzinger2022-01-17
|/ / | | | | | | | | | | This contains changes that are needed to enable netavark e2e testing. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* | Merge pull request #12860 from rhatdan/cgroupsOpenShift Merge Robot2022-01-17
|\ \ | | | | | | Use CONTAINERS_CONF cgroups flag for remote API.
| * | Fix cgroup mode handling in api serverDaniel J Walsh2022-01-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | Also change code to globably be consistent when refering to capatilized Cgroup. Fixed: https://github.com/containers/podman/issues/12550 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
| * | Standardize on capatalized CgroupsDaniel J Walsh2022-01-14
| | | | | | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #12882 from jmguzik/unify-filters-cmdOpenShift Merge Robot2022-01-17
|\ \ \ | |_|/ |/| | Unify the method of parsing filters in cmd
| * | Unify the method of parsing filters in cmdJakub Guzik2022-01-16
| | | | | | | | | | | | | | | | | | | | | | | | This commit unifies the method of filters parsing in cmd. It removes also the function redundancy. [NO NEW TESTS NEEDED] Signed-off-by: Jakub Guzik <jguzik@redhat.com>
* | | Merge pull request #12880 from ↵OpenShift Merge Robot2022-01-17
|\ \ \ | | | | | | | | | | | | | | | | eriksjolund/replace_master_branch_links_with_main_branch_links_in_docs [CI:DOCS] fix default branch links
| * | | [CI:DOCS] fix default branch linksErik Sjölund2022-01-15
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | * Replace https://github.com/containers/podman/blob/master with https://github.com/containers/podman/blob/main to match the new default branch "main". Previously the default branch was "master". The substitutions were made in the documentation but not the code. Signed-off-by: Erik Sjölund <erik.sjolund@gmail.com>
* | | Merge pull request #12881 from ↵OpenShift Merge Robot2022-01-17
|\ \ \ | | | | | | | | | | | | | | | | eriksjolund/replace_master_branch_links_with_main_branch_links_in_code fix default branch links
| * | | fix default branch linksErik Sjölund2022-01-15
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Replace https://github.com/containers/podman/blob/master with https://github.com/containers/podman/blob/main to match the new default branch "main". Previously the default branch was "master". This is the only occurence found in the code. * Replace https://raw.githubusercontent.com/containers/libpod/master with https://raw.githubusercontent.com/containers/podman/main Signed-off-by: Erik Sjölund <erik.sjolund@gmail.com>
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-12-27 22:27:40 +0000