summaryrefslogtreecommitdiff
path: root/pkg
Commit message (Collapse)AuthorAge
* Merge pull request #12712 from flouthoc/volume_overlay_advancedOpenShift Merge Robot2022-01-28
|\ | | | | volume: add support for non-volatile `upperdir`,`workdir` for overlay volumes
| * volume: add support for non-volatile upperdir,workdir for overlay volumesAditya Rajan2022-01-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Often users want their overlayed volumes to be `non-volatile` in nature that means that same `upper` dir can be re-used by one or more containers but overall of nature of volumes still have to be `overlay` so work done is still on a overlay not on the actual volume. Following PR adds support for more advanced options i.e custom `workdir` and `upperdir` for overlayed volumes. So that users can re-use `workdir` and `upperdir` across new containers as well. Usage ```console $ podman run -it -v myvol:/data:O,upperdir=/path/persistant/upper,workdir=/path/persistant/work alpine sh ``` Signed-off-by: Aditya R <arajan@redhat.com>
* | network create: allow multiple subnetsPaul Holzinger2022-01-27
|/ | | | | | | | | | | podman network create --subnet, --gateway and --ip-range can now be specified multiple times to join the network to more than one subnet. This is very useful if you want to use a dual stack network and assign a fixed ipv4 and ipv6 subnet. The order of the options is important here, the first --gateway/--ip-range will be assigned to the first subnet and so on. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* Merge pull request #12867 from cdoern/scpOpenShift Merge Robot2022-01-27
|\ | | | | switch podman image scp from depending on machinectl to just os/exec
| * switch podman image scp from depending on machinectl to just os/execcdoern2022-01-26
| | | | | | | | | | | | | | | | | | machinectl does not propogate error messages and adds extra lines in the output, exec.Cmd is able to clear the env besides PATH and TERM, and use the given UID and GID to execute the command properly. machinectl is still used to create a user session. Ubuntu support is limited by this. Signed-off-by: cdoern <cdoern@redhat.com>
* | rootless: drop permission check for devicesGiuseppe Scrivano2022-01-27
|/ | | | | | | | | | | | | commit 350ede1eeb6ab33bce2918d7768b940c255e63c6 added the feature. Do not check whether the device is usable by the rootless user before adding to the container. Closes: https://github.com/containers/podman/issues/12704 [NO NEW TESTS NEEDED] it requires changes on the host to test it Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* Update godoc, swagger using wrong structJhon Honce2022-01-25
| | | | | | | | | | | Documentation for API volume list, pointed to a different struct than the code. [NO NEW TESTS NEEDED] Fixes #12987 Signed-off-by: Jhon Honce <jhonce@redhat.com>
* Merge pull request #12974 from kolyshkin/typoOpenShift Merge Robot2022-01-25
|\ | | | | pkg/specgen/generate/security: fix error message text
| * pkg/specgen/generate/security: fix error messageKir Kolyshkin2022-01-24
| | | | | | | | | | | | | | | | | | This should be Network Namespace, not Host Namespace. [NO NEW TESTS NEEDED] Fixes: 0d70df11 Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
* | 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>
* / 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>
* 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 #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 #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 #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 #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 #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 #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>
* | / 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 #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>
* | 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>
* 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 #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 #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>
* | | 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 #12572 from rhatdan/imageOpenShift Merge Robot2022-01-15
|\ \ | | | | | | Remove two GetImages functions from API
| * | Remove two GetImages functions from APIDaniel J Walsh2022-01-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | [NO NEW TESTS NEEDED] This is just code cleanup. The remote API has three different GetImages functions, which I believe can be handled by just one function. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #12861 from aklajnert/recursively_copy_certsOpenShift Merge Robot2022-01-15
|\ \ \ | | | | | | | | ignition: recursively copy cert files