summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #12969 from rhatdan/remoteOpenShift Merge Robot2022-01-25
|\ | | | | Fix handling of duplicate matches on id expansion
| * Fix handling of duplicate matches on id expansionDaniel J Walsh2022-01-24
| | | | | | | | | | | | | | | | | | | | Fixes: https://github.com/containers/podman/issues/12963 [NO NEW TESTS NEEDED] I don't know how to create two containers with the same first digit of the digest, which I could them attempt to remove. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #12996 from Luap99/buildah-rootlessOpenShift Merge Robot2022-01-24
|\ \ | | | | | | remote build: set rootless oci isolation correctly
| * | remote build: set rootless oci isolation correctlyPaul Holzinger2022-01-24
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | When we run rootless buildah needs to have IsolationOCIRootless set otherwise it will run code which cannot be used as rootless user. Podman should use the buildah default if possible and change it to rootless mode if needed. [NO NEW TESTS NEEDED] Should be covered by existing tests once we have podman-remote rootless tests. Fixes #12989 Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* | Merge pull request #12995 from eriksjolund/fix_typos_and_improve_languageOpenShift Merge Robot2022-01-24
|\ \ | | | | | | [CI:DOCS] Fix typos and improve language
| * | [CI:DOCS] Fix typos and improve languageErik Sjölund2022-01-24
| |/ | | | | | | Signed-off-by: Erik Sjölund <erik.sjolund@gmail.com>
* | Merge pull request #12982 from rhatdan/defaultOpenShift Merge Robot2022-01-24
|\ \ | | | | | | Show correct default values or show none
| * | Show correct default values or show noneDaniel J Walsh2022-01-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | Before this PR, the podman --help command shows the defaults as runc and overlay even if the storage.conf and containers.conf files do not match. This PR changes them to show the actual defaults and in the case of storage driver, does not show the default at all. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #12991 from Luap99/aliasesOpenShift Merge Robot2022-01-24
|\ \ \ | |_|/ |/| | container create: do not check for network dns support
| * | container create: do not check for network dns supportPaul Holzinger2022-01-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should not check if the network supports dns when we create a container with network aliases. This could be the case for containers created by docker-compose for example if the dnsname plugin is not installed or the user uses a macvlan config where we do not support dns. Fixes #12972 Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* | | Merge pull request #12973 from jmguzik/api-unused-paramOpenShift Merge Robot2022-01-24
|\ \ \ | |_|/ |/| | Remove unused param from utils.Error in pkg/api and clean API handlers
| * | Remove unused param and clean API handlersJakub Guzik2022-01-22
| | | | | | | | | | | | | | | | | | | | | | | | This commit removes error message string from utils.Error in pkg/api. Param was not used inside a function for quite a long time [NO NEW TESTS NEEDED] Signed-off-by: Jakub Guzik <jguzik@redhat.com>
* | | Merge pull request #12976 from patrycja-guzik/docs-labelsOpenShift Merge Robot2022-01-24
|\ \ \ | |_|/ |/| | [CI:DOCS] Fix filter description and unify filters docs for containers/images prune
| * | Fix filter description and unify filters docs for containers/images prunePatrycja Guzik2022-01-22
| |/ | | | | | | Signed-off-by: Patrycja Guzik <patrycja.k.guzik@gmail.com>
* | Merge pull request #12979 from eriksjolund/fix_typo_subpordinateOpenShift Merge Robot2022-01-23
|\ \ | |/ |/| [CI:DOCS] fix typo subpordinate
| * [CI:DOCS] fix typo subpordinateErik Sjölund2022-01-22
|/ | | | Signed-off-by: Erik Sjölund <erik.sjolund@gmail.com>
* Merge pull request #12961 from rhatdan/codespellOpenShift Merge Robot2022-01-21
|\ | | | | Run codespell
| * Run codespell on codeDaniel J Walsh2022-01-21
| | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #12964 from mheon/bump_400_rc2OpenShift Merge Robot2022-01-21
|\ \ | | | | | | Bump to v4.0.0-RC2
| * | Bump to v4.0.0-devMatthew Heon2022-01-21
| | | | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
| * | Bump to v4.0.0-RC2v4.0.0-rc2Matthew Heon2022-01-21
| | | | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
| * | Final release notes for v4.0.0-rc2Matthew Heon2022-01-21
| | | | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | Merge pull request #12959 from afbjorklund/machine-waitOpenShift Merge Robot2022-01-21
|\ \ \ | | | | | | | | Restore machine start logic that was hanging
| * | | Restore machine start logic that was hangingAnders F Björklund2022-01-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After refactoring Stop(), mounting volumes was hanging in Start(). Restore the conditional, and add error reporting from isListening. [NO NEW TESTS NEEDED] Signed-off-by: Anders F Björklund <anders.f.bjorklund@gmail.com>
* | | | 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>