summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Add generate systemd -e/--env optionToshiki Sonoda2022-09-06
| | | | | | | | -e/--env option sets environment variables to the systemd unit files. Fixes: #15523 Signed-off-by: Toshiki Sonoda <sonoda.toshiki@fujitsu.com>
* Merge pull request #15587 from edsantiago/skip_ubuntu_flakeOpenShift Merge Robot2022-09-02
|\ | | | | CI: disable flaking test on ubuntu
| * CI: disable flaking test on ubuntuEd Santiago2022-09-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://github.com/containers/conmon/pull/352 As of a few days ago, Ubuntu still hadn't built a fixed conmon. Just skip the test until we get a fixed Ubuntu or until we figure out a better solution to the test-something-RHEL8ish problem. UPDATE: WEIRD: this 'skip' triggered a baffling failure on Ubuntu: the "Kubernetes only allows 63 characters" warning message stopped appearing, on Ubuntu only, which then caused the kube-generate tests to fail because they actually checked for that. The message doesn't appear because generate-kube is no longer spitting out a line for org.opencontainers.image.base.digest/CONTAINER. (Why this line is gone, I don't know, and choose not to investigate). Solution: stop checking for the kube-63 warning. It's just not that important. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | Merge pull request #15601 from edsantiago/docs_dedup_nameOpenShift Merge Robot2022-09-01
|\ \ | | | | | | [CI:DOCS] Man pages: refactor common options: --name
| * | Man pages: refactor common options: --nameEd Santiago2022-09-01
| |/ | | | | | | | | | | | | | | | | | | Only for podman-create and -run, unfortunately: all the others are too different, and can't easily be combined. I went with the podman-run version because it was most recently updated in #5192. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | Merge pull request #15276 from cdoern/updateOpenShift Merge Robot2022-09-01
|\ \ | |/ |/| implement podman update
| * implement podman updateCharlie Doern2022-09-01
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | podman update allows users to change the cgroup configuration of an existing container using the already defined resource limits flags from podman create/run. The supported flags in crun are: this command is also now supported in the libpod api via the /libpod/containers/<CID>/update endpoint where the resource limits are passed inthe request body and follow the OCI resource spec format –memory –cpus –cpuset-cpus –cpuset-mems –memory-swap –memory-reservation –cpu-shares –cpu-quota –cpu-period –blkio-weight –cpu-rt-period –cpu-rt-runtime -device-read-bps -device-write-bps -device-read-iops -device-write-iops -memory-swappiness -blkio-weight-device resolves #15067 Signed-off-by: Charlie Doern <cdoern@redhat.com>
* Merge pull request #15571 from umohnani8/gen-kubeOpenShift Merge Robot2022-09-01
|\ | | | | Set enableServiceLinks to false in generated yaml
| * Set enableServiceLinks to false in generated yamlUrvashi Mohnani2022-08-31
| | | | | | | | | | | | | | | | Since podman doesn't set/use the needed service env variable, always set enableServiceLinks to false in the generated kube yaml. Signed-off-by: Urvashi Mohnani <umohnani@redhat.com>
* | Merge pull request #15574 from edsantiago/fix_useradd_flakeOpenShift Merge Robot2022-09-01
|\ \ | | | | | | Cirrus: pick UIDs/GIDs starting at 1500, not 1000
| * | Cirrus: pick UIDs/GIDs starting at 1500, not 1000Ed Santiago2022-08-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | Reason: looks like UIDs 1001, 1003, 1006 are already taken in the CI VMs. Fixes: #15573 Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | Merge pull request #15360 from m0duspwnens/api_compat_containersOpenShift Merge Robot2022-09-01
|\ \ \ | | | | | | | | api: return imageID instead of imageName, for "Image" when Podman api is queried
| * \ \ Merge branch 'containers:main' into api_compat_containersJason Ertel2022-08-30
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/main' into api_compat_containersJosh Patterson2022-08-29
| |\ \ \ \
| * | | | | updated apiv2 tests to reflect hash compat fixJason Ertel2022-08-29
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jason Ertel <jason.ertel@securityonionsolutions.com>
| * | | | | api: return imageID instead of imageName, for "Image" when Podman API is queriedJosh Patterson2022-08-17
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Josh Patterson <josh.patterson@securityonionsolutions.com>
* | | | | | Merge pull request #15560 from dfr/freebsd-specgenOpenShift Merge Robot2022-09-01
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add FreeBSD support for pkg/specgen/generate
| * | | | | | specgen/generate: Add support for FreeBSDDoug Rabson2022-08-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson <dfr@rabson.org>
| * | | | | | specgen/generate: Move specConfigNamespaces to namespace_linux.go and add stubsDoug Rabson2022-08-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Everthing except for hostname management is linux-specific. [NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson <dfr@rabson.org>
| * | | | | | specgen/generate: Move SpecGenToOCI, WeightDevices to oci_linux.go and add ↵Doug Rabson2022-08-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stubs. Almost all of SpecGenToOCI deals with linux-specific aspects of the runtime spec. Rather than try to factor this out piecemeal, I think it is cleaner to move the whole function along with its implementation helper functions. This also meams we don't need non-linux stubs for functions called from oci_linux.go [NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson <dfr@rabson.org>
| * | | | | | specgen/generate: Move security.go to security_linux.go and add stubsDoug Rabson2022-08-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The security features (selinux, apparmor, capabilities) are linux specific. [NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson <dfr@rabson.org>
* | | | | | | Merge pull request #15572 from lsm5/disable-packitOpenShift Merge Robot2022-09-01
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | [CI:BUILD] Packit: Disable until proved in other repos
| * | | | | | [CI:BUILD] Packit: Disable until proved in other reposLokesh Mandvekar2022-08-31
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are concerns with Packit causing flakes and delays on Podman so let's have Packit prove itself in other repos and only then make its way into Podman. See: https://github.com/containers/podman/pull/15549#issuecomment-1233230573 [NO NEW TESTS NEEDED] Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
* | | | | | Merge pull request #15566 from mheon/fix_15557OpenShift Merge Robot2022-08-31
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Inhibit SIGTERM during Conmon startup
| * | | | | Inhibit SIGTERM during Conmon startupMatthew Heon2022-08-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we get a SIGTERM immediately after Conmon starts but before we record its PID in the database, we end up leaking a Conmon and associated OCI runtime process. Inhibit shutdown using the logic we originally wrote to prevent similar issues during container creation to prevent this problem. [NO NEW TESTS NEEDED] No real way to test this I can think of. Fixes #15557 Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | | | Merge pull request #15473 from umohnani8/empty-dirOpenShift Merge Robot2022-08-31
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add emptyDir volume support to kube play
| * | | | | | Add emptyDir volume support to kube playUrvashi Mohnani2022-08-30
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a kube yaml has a volume set as empty dir, podman will create an anonymous volume with the empty dir name and attach it to the containers running in the pod. When the pod is removed, the empy dir volume created is also removed. Add tests and docs for this as well. Signed-off-by: Urvashi Mohnani <umohnani@redhat.com>
* | | | | | Merge pull request #15562 from edsantiago/docs_dedup_signalOpenShift Merge Robot2022-08-31
|\ \ \ \ \ \ | | | | | | | | | | | | | | [CI:DOCS] Man pages: refactor common options: --signal
| * | | | | | Man pages: refactor common options: --signalEd Santiago2022-08-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Would've been an easy one, except I decided to fix the text to conform to our guidelines. I haven't been doing this, but in this case it's only two man pages and the text is short enough to make for easy review. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | | | Merge pull request #15479 from dcermak/don-t-use-privileged-containersOpenShift Merge Robot2022-08-31
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Makefile: Mount . with --security-opt label=disable instead of using --privileged
| * | | | | | | [makefile] disable security labeling instead of using --privilegedDan Čermák2022-08-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | $(CURDIR) is mounted in podman as is which causes issues on systems with SELinux as then the container cannot read or write anything inside /src/. This has been worked around with the --privileged flag, but that's a rather brutal solution. Adding :Z is also suboptimal, as that requires a full relabeling after every run. Instead, we disable security labeling via `--security-opt label=disable` for this development container allowing us to run `make vendor-in-container` unprivileged. Signed-off-by: Dan Čermák <dcermak@suse.com>
* | | | | | | | Merge pull request #15510 from vrothberg/fix-15485OpenShift Merge Robot2022-08-31
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | podman rmi: emit untag events
| * | | | | | | | podman rmi: emit untag eventsValentin Rothberg2022-08-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Emit untag events for each tag when removing an image. Fixes: #15485 Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
* | | | | | | | | Merge pull request #15411 from arixmkii/override_default_usernameOpenShift Merge Robot2022-08-31
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Allow to override default username via command line
| * | | | | | | | | Allow to override default username via command lineArthur Sengileyev2022-08-30
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Sengileyev <arthur.sengileyev@gmail.com>
* | | | | | | | | Merge pull request #15389 from giuseppe/userns-map-userOpenShift Merge Robot2022-08-31
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | podman: add uid and gid options to keep-id
| * | | | | | | | docs: move userns options to separate fileGiuseppe Scrivano2022-08-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | | | | | podman: add uid and gid options to keep-idGiuseppe Scrivano2022-08-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add two new options to the keep-id user namespace option: - uid: allow to override the UID used inside the container. - gid: allow to override the GID used inside the container. For example, the following command will map the rootless user (that has UID=0 inside the rootless user namespace) to the UID=11 inside the container user namespace: $ podman run --userns=keep-id:uid=11 --rm -ti fedora cat /proc/self/uid_map 0 1 11 11 0 1 12 12 65525 Closes: https://github.com/containers/podman/issues/15294 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | | | | | infra: remove dead codeGiuseppe Scrivano2022-08-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | | | | | Merge pull request #15491 from marshall-lee/bindings-schema-ignoreOpenShift Merge Robot2022-08-31
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | Mark some of the option fields as ignored in pkg/bindings
| * | | | | | | | Mark some of the option fields as ignored in pkg/bindingsVladimir Kochnev2022-08-26
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I realized that `params.Del("SkipTLSVerify")` doesn't have any effect because keys are always lowercased. So it should really be `params.Del("skiptlsverify")`. There's also a little bug introduced by 3bf52aa and b1d1248: if one passes `ProgressWriter` object having `Stringer` interface i.e. `bytes.Buffer` it ends up been serialized in query with `util.ToParams()`. To circumvent both problems I propose to mark non-serializable parameters with `schema:"-"` so there's no need to delete them from resulting `url.Values`. Signed-off-by: Vladimir Kochnev <hashtable@yandex.ru>
* | | | | | | | Merge pull request #15530 from dfr/freebsd-conmonDaniel J Walsh2022-08-31
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | libpod: Make sure writeConmonPipeData is called on FreeBSD
| * | | | | | | | libpod: Make sure writeConmonPipeData is called on FreeBSDDoug Rabson2022-08-29
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I managed to miss this while factoring out moveConmonToCgroupAndSignal. Perhaps the signalling part should move to the caller instead? [NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson <dfr@rabson.org>
* | | | | | | | Merge pull request #15548 from edsantiago/docs_dedup_restartOpenShift Merge Robot2022-08-31
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | [CI:DOCS] Man pages: refactor common options: --restart
| * | | | | | | Man pages: refactor common options: --restartEd Santiago2022-08-30
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only applicable to podman-create and -run. I went with the -run version because it is cleaner and more recently updated. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | | | Merge pull request #15545 from edsantiago/docs_dedup_subxidnameOpenShift Merge Robot2022-08-30
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [CI:DOCS] Man pages: refactor common options: --subXidname
| * | | | | | | Man pages: refactor common options: --subXidnameEd Santiago2022-08-30
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whew! This one started off identical everywhere, but the version in podman-run got fixed in #1380, then again in #5192, with no corresponding fixes to any of the other man pages. I went with the podman-run version, with a small change in wording. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | | | Merge pull request #15517 from tyler92/remove-libnetwork-depOpenShift Merge Robot2022-08-30
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | remove github.com/docker/libnetwork dependency
| * | | | | | remove github.com/docker/libnetwork dependencyMikhail Khachayants2022-08-27
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code from this dependency was replaced with a simple version. As a result Podman's memory consumption has been reduced by ~10%. [NO NEW TESTS NEEDED] Signed-off-by: Mikhail Khachayants <tyler92@inbox.ru>
* | | | | | Merge pull request #15532 from edsantiago/docs_dedup_httpproxyOpenShift Merge Robot2022-08-30
|\ \ \ \ \ \ | | | | | | | | | | | | | | [CI:DOCS] Man pages: refactor common options: --http-proxy