summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #12951 from rhatdan/commitOpenShift Merge Robot2022-01-21
|\ | | | | Fix #2 for compat commit handling of --changes
| * Fix #2 for compat commit handling of --changesDaniel J Walsh2022-01-21
| | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #12948 from Luap99/rootless-networkingOpenShift Merge Robot2022-01-21
|\ \ | | | | | | Remove rootless_networking option from containers.conf
| * | Remove rootless_networking option from containers.confPaul Holzinger2022-01-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This field was only needed for machine to force cni, however you can set netns="bridge" in the config to have the same effect. This is already done in the machine setup. see https://github.com/containers/common/pull/895 [NO NEW TESTS NEEDED] Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* | | Merge pull request #12952 from mheon/release_notes_400OpenShift Merge Robot2022-01-21
|\ \ \ | | | | | | | | [CI:DOCS] Update release notes for Podman v4.0.0
| * | | Update release notes for Podman v4.0.0Matthew Heon2022-01-21
| | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | | Merge pull request #12924 from afbjorklund/package-alpineOpenShift Merge Robot2022-01-21
|\ \ \ \ | | | | | | | | | | Show package version when running on alpine
| * | | | Show package version when running on alpineAnders F Björklund2022-01-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tested manually. [NO NEW TESTS NEEDED] Signed-off-by: Anders F Björklund <anders.f.bjorklund@gmail.com>
* | | | | Merge pull request #12943 from machacekondra/nil_fixOpenShift Merge Robot2022-01-21
|\ \ \ \ \ | |_|_|_|/ |/| | | | Fix nil pointer dereference for configmap optional
| * | | | Fix nil pointer dereference for configmap optionalOndra Machacek2022-01-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR fixes nil pointer dereference for configmap optional parameter. When optional parameter is not passed, the code tried to acces the parameter which caused nil pointer dereference. Signed-off-by: Ondra Machacek <omachace@redhat.com>
* | | | | Merge pull request #12958 from dgibson/ociplex-testOpenShift Merge Robot2022-01-21
|\ \ \ \ \ | | | | | | | | | | | | Remove some explicit dependencies on runc/crun in the system tests
| * | | | | Make error message matching in 030-run.bats less fragileDavid Gibson2022-01-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Amongst other things 030-run.bats checks for sensible error messages when attempting a "podman run" with a non-existent or inaccessible path. It checks for these messages, which come from the low-level runtime, in a lot of detail, including separate versions for runc and crun. This is fragile in several ways: * It's likely to fail if using a runtime other than crun or runc * It relies on detecting whether the runtime is crun vs. runc using the path, which could fail if the binary has been named something unusual * It will break if crun or runc ever alter their error message (even if it's just changing case) This replaces the checked versions with a much more accepting regex which will work for both the runc and crun messages, while still looking for the essential pieces. This isn't guaranteed to work with other runtimes, but it's much more likely to. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
| * | | | | Don't explicitly check for crun|runc in package informationDavid Gibson2022-01-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Amongst other things 005-info.bats tests that the host.ociRuntime.package field in the output from "podman info" reports something containing "crun" or "runc". While those are obviously the dominant runtimes in practice, it seems undesirable to explicitly exclude them in testing. So, remove this specific test. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
* | | | | | Merge pull request #12936 from cgwalters/null-historyOpenShift Merge Robot2022-01-21
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Don't segfault if an image layer has no creation timestamp
| * | | | | Don't segfault if an image layer has no creation timestampColin Walters2022-01-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's optional in the specification, and I initially omitted it in the ostree code. Now I've fixed the ostree code to inject a timestamp, but we should clearly avoid segfaulting on this case. Signed-off-by: Colin Walters <walters@verbum.org>
* | | | | | Merge pull request #12942 from flouthoc/compat-load-tar-with-multiple-imagesOpenShift Merge Robot2022-01-20
|\ \ \ \ \ \ | | | | | | | | | | | | | | compat: `images/load` must be able to load tar with multiple images
| * | | | | | compat: remove hardcoded index from load images output reportAditya R2022-01-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Aditya R <arajan@redhat.com>
| * | | | | | compat: images/load must be able to load tar with multiple imagesAditya R2022-01-21
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `http:/host:port/images/load` fails to accept tar with more than one images however manual load works as expected. Remove explicit check for `1` image and only fail if result set has value less than `1`. Signed-off-by: Aditya R <arajan@redhat.com>
* | | | | | Merge pull request #12950 from edsantiago/systemd_250OpenShift Merge Robot2022-01-20
|\ \ \ \ \ \ | | | | | | | | | | | | | | System tests: fix for new systemd on rawhide
| * | | | | | System tests: fix for new systemd on rawhideEd Santiago2022-01-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | systemd 250 on f36 has changed the output format of a message our tests rely on. This breaks bodhi gating tests. Fix test so it accepts a continually-growing set of systemd outputs. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | | | Merge pull request #12871 from jwhonce/issues/12866OpenShift Merge Robot2022-01-20
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Engine.Remote from containers.conf
| * | | | | | Engine.Remote from containers.confJhon Honce2022-01-20
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Heuristic to initialize TunnelMode/remote podman: - Podman built with remote tag - Podman running on darwin or windows GOOS - CONTAINER_HOST or CONTAINER_CONNECTION set in environment - --remote flag given on command line - From containers.conf, Engine.Remote == true and GOOS == linux Otherwise, podman will run in ABIMode/linked against libpod library. Fixes #12866 Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | | | | Merge pull request #12945 from vrothberg/vendor-psgoOpenShift Merge Robot2022-01-20
|\ \ \ \ \ \ | |/ / / / / |/| | | | | vendor c/psgo@v1.7.2
| * | | | | vendor c/psgo@v1.7.2Valentin Rothberg2022-01-20
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | | Merge pull request #12928 from n1hility/win-envOpenShift Merge Robot2022-01-20
|\ \ \ \ \ | |/ / / / |/| | | | Implement env parsing on Windows
| * | | | Implement env parsing on WindowsJason T. Greene2022-01-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #12056 Also, enables existing parsing logic for all Unix derived OSs Signed-off-by: Jason T. Greene <jason.greene@redhat.com>
* | | | | Merge pull request #12939 from flouthoc/vendor-commonOpenShift Merge Robot2022-01-20
|\ \ \ \ \ | | | | | | | | | | | | vendor: bump `c/common` for netavark and other pkgs as well.
| * | | | | vendor: bump c/common and other vendorsAditya R2022-01-20
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit bumps majorly c/common so netavark features could be synced with podman. But there are some other vendor bumps as well [NO NEW TESTS NEEDED] [NO TESTS NEEDED] Signed-off-by: Aditya R <arajan@redhat.com>
* | | | | Merge pull request #12931 from giuseppe/fix-crash-with-bazel-linux-sandboxOpenShift Merge Robot2022-01-20
|\ \ \ \ \ | | | | | | | | | | | | rootless: report correctly the error
| * | | | | rootless: report correctly the errorGiuseppe Scrivano2022-01-19
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `err` is nil at this point, so errors.Wrapf() would return nil ignoring the remaining arguments. This would prevent SetupRootless() to fail causing podman to run without capabilities but believing so, and it would end up in a crash when accessing the local store. Closes: https://github.com/containers/podman/discussions/12923 [NO NEW TESTS NEEDED] it requires running in the environment created by bazel linux-sandbox. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | 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>
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 15:26:43 +0000