summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* podman generate kube - add actual testsEd Santiago2022-08-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This exposed a nasty bug in our system-test setup: Ubuntu (runc) was writing a scratch containers.conf file, and setting CONTAINERS_CONF to point to it. This was well-intentionedly introduced in #10199 as part of our long sad history of not testing runc. What I did not understand at that time is that CONTAINERS_CONF is **dangerous**: it does not mean "I will read standard containers.conf and then override", it means "I will **IGNORE** standard containers.conf and use only the settings in this file"! So on Ubuntu we were losing all the default settings: capabilities, sysctls, all. Yes, this is documented in containers.conf(5) but it is such a huge violation of POLA that I need to repeat it. In #14972, as yet another attempt to fix our runc crisis, I introduced a new runc-override mechanism: create a custom /etc/containers/containers.conf when OCI_RUNTIME=runc. Unlike the CONTAINERS_CONF envariable, the /etc file actually means what you think it means: "read the default file first, then override with the /etc file contents". I.e., we get the desired defaults. But I didn't remember this helpers.bash workaround, so our runc testing has actually been flawed: we have not been testing with the system containers.conf. This commit removes the no-longer-needed and never-actually-wanted workaround, and by virtue of testing the cap-drops in kube generate, we add a regression test to make sure this never happens again. It's a little scary that we haven't been testing capabilities. Also scary: this PR requires python, for converting yaml to json. I think that should be safe: python3 'import yaml' and 'json' works fine on a RHEL8.7 VM from 1minutetip. Signed-off-by: Ed Santiago <santiago@redhat.com>
* Merge pull request #15368 from m0duspwnens/api_sort_hc_bindsOpenShift Merge Robot2022-08-17
|\ | | | | sort hc.Binds returned from compat api
| * sort hc.Binds returned from compat apiJosh Patterson2022-08-17
| | | | | | | | Signed-off-by: Josh Patterson <josh.patterson@securityonionsolutions.com>
* | Merge pull request #15364 from rhatdan/statsOpenShift Merge Robot2022-08-17
|\ \ | | | | | | Add podman stats --no-trunc option
| * | Add podman stats --no-trunc optionDaniel J Walsh2022-08-17
| | | | | | | | | | | | | | | | | | | | | | | | This is for compatibility with Docker. Partial fix for https://github.com/containers/podman/issues/14917 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #15362 from rhatdan/manifest1OpenShift Merge Robot2022-08-17
|\ \ \ | |/ / |/| | Add podman manifest create -a. Alias for --amend:Docker compatibility
| * | Add podman manifest create -a. Alias for --amend:Docker compatibilityDaniel J Walsh2022-08-17
|/ / | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #15341 from rhatdan/kubeOpenShift Merge Robot2022-08-17
|\ \ | | | | | | Fix podman kube generate --help to show correct help message
| * | Fix podman kube generate --help to show correct help messageDaniel J Walsh2022-08-16
| |/ | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #15031 from lsm5/ec2-aarch64-machineOpenShift Merge Robot2022-08-17
|\ \ | | | | | | Cirrus: add podman_machine_aarch64
| * | Cirrus: add podman_machine_aarch64Lokesh Mandvekar2022-08-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | Run machine tests on every PR as label-driven machine test triggering is currently hard to predict and debug. Co-authored-by: Ed Santiago <santiago@redhat.com> Co-authored-by: Miloslav Trmač <mitr@redhat.com> Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
* | | Merge pull request #15357 from dfr/freebsd-buildOpenShift Merge Robot2022-08-17
|\ \ \ | |/ / |/| | Add non-linux build stubs for libpod
| * | libpod: Move uses of unix.O_PATH to container_internal_linux.goDoug Rabson2022-08-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The O_PATH flag is a recent addition to the open syscall and is not present in darwin or in FreeBSD releases before 13.1. The constant is not present in the FreeBSD version of x/sys/unix since that package supports FreeBSD 12.3 and later. [NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson <dfr@rabson.org>
| * | libpod: Move rootless network setup details to container_internal_linux.goDoug Rabson2022-08-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes a use of state.NetNS which is a linux-specific field defined in container_linux.go from the generic container_internal.go, allowing that to build on non-linux platforms. [NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson <dfr@rabson.org>
| * | libpod: Add stubs for non-linux buildsDoug Rabson2022-08-17
|/ / | | | | | | | | | | | | | | | | Note: this makes info.go linux-only since it mixes linux-specific and generic code. This should be addressed in a separate refactoring PR. [NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson <dfr@rabson.org>
* | Merge pull request #14999 from sstosh/restart-optionOpenShift Merge Robot2022-08-17
|\ \ | | | | | | Add restart --cidfile, --filter
| * | Update cmd/podman/containers/restart.goTom Sweeney2022-08-12
| | | | | | | | | | | | | | | Co-authored-by: Tom Sweeney <tsweeney@redhat.com> Signed-off-by: Toshiki Sonoda <sonoda.toshiki@fujitsu.com>
| * | Add restart --cidfile, --filterToshiki Sonoda2022-08-12
| | | | | | | | | | | | | | | | | | | | | --cidfile : Read container ID from the specified file and restart the container. --filter : restart the filtered container. Signed-off-by: Toshiki Sonoda <sonoda.toshiki@fujitsu.com>
* | | Merge pull request #15350 from nalind/manifest-amendOpenShift Merge Robot2022-08-17
|\ \ \ | | | | | | | | podman manifest create: accept --amend and --insecure flags
| * | | podman manifest create: accept --amend and --insecure flagsNalin Dahyabhai2022-08-16
| | |/ | |/| | | | | | | | | | | | | | | | | | | Accept a --amend flag in `podman manifest create`, and treat `--insecure` as we would `--tls-verify=false` in `podman manifest`'s "add", "create", and "push" subcommands. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
* | | Merge pull request #15324 from dfr/freebsd-buildOpenShift Merge Robot2022-08-17
|\ \ \ | |/ / |/| | utils: Add missing symbols for FreeBSD
| * | utils: Add missing symbols for FreeBSDDoug Rabson2022-08-16
| | | | | | | | | | | | | | | | | | [NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson <dfr@rabson.org>
* | | Merge pull request #15345 from edsantiago/runc_fixOpenShift Merge Robot2022-08-16
|\ \ \ | | | | | | | | system tests: fix broken runc test
| * | | system tests: fix broken runc testEd Santiago2022-08-16
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Followup to #14613, which was never actually tested until this week in RHEL8 gating tests (see issue #15337). * add missing backslash in '|' expression * allow extra text after error (e.g., "invalid argument") No way to test this until it makes its way into RHEL8, so, fingers crossed. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | Merge pull request #15317 from rhatdan/debugOpenShift Merge Robot2022-08-16
|\ \ \ | | | | | | | | Add compatibility support for --debug flag from docker
| * | | Add compatibility support for --debug -D flag from dockerDaniel J Walsh2022-08-15
| | | | | | | | | | | | | | | | | | | | | | | | This is another fix for https://github.com/containers/podman/issues/14917 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #15339 from edsantiago/docs_dedup_annotationOpenShift Merge Robot2022-08-16
|\ \ \ \ | | | | | | | | | | Man pages: refactor common options: --annotation
| * | | | Man pages: refactor common options: --annotationEd Santiago2022-08-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor the --annotation option, but only between podman create, kube play, and run. This does not include: * podman build: - usage is in terms of images, not containers/pods * manifest add, manifest annotate: - usage is in terms of images, not containers/pods - also, wording is slightly different Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | Merge pull request #15270 from nicrowe00/kubegenerateOpenShift Merge Robot2022-08-16
|\ \ \ \ \ | |/ / / / |/| | | | Add "podman kube generate" command
| * | | | Add "podman kube generate" commandNiall Crowe2022-08-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "podman kube generate" creates Kubernetes YAML from Podman containers, pods or volumes. Users will still be able to use "podman generate kube" as an alias of "kube generate". Signed-off-by: Niall Crowe <nicrowe@redhat.com>
* | | | | Merge pull request #15331 from edsantiago/docs_dedup_piecemealOpenShift Merge Robot2022-08-16
|\ \ \ \ \ | |_|_|/ / |/| | | | Man pages: refactor common options: arch
| * | | | Man pages: refactor common options: archEd Santiago2022-08-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Smaller, more reviewable chunks. This is just one option, --arch. Future PRs may, if the reviewing is easy, include multiple options. This one includes fixes to the preprocessor script, though: * big oops, I was not handling '<<something pod|something>>' where 'pod' appears other than the beginning of the string. * I was also not handling 'container<<| or pod>>', where one side was empty. * Behavior change: <<subcommand>>, on podman-pod-foo, becomes just 'foo' (not 'pod foo'). This will be useful in a future PR where we refactor --pod-id-file. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | Merge pull request #15328 from cevich/machine_fixupsOpenShift Merge Robot2022-08-15
|\ \ \ \ \ | | | | | | | | | | | | [CI:DOCS] Cirrus: Update podman-machine comment
| * | | | | Cirrus: Update podman-machine commentChris Evich2022-08-15
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Replace TODO comment with helpful hint for future maintainers. Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | | Merge pull request #15318 from rhatdan/dns-optOpenShift Merge Robot2022-08-15
|\ \ \ \ \ | | | | | | | | | | | | Add Docker compatibility for --dns-option to --dns-opt
| * | | | | Add Docker compatibility for --dns-option to --dns-optDaniel J Walsh2022-08-15
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | Fixes one of the issues found in https://github.com/containers/podman/issues/14917 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | Merge pull request #15327 from rhatdan/man1OpenShift Merge Robot2022-08-15
|\ \ \ \ \ | | | | | | | | | | | | [CI:DOCS] podman images and friends can take one image as argument
| * | | | | podman images and friends can take one image as argumentDaniel J Walsh2022-08-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: https://github.com/containers/podman/issues/15309 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | | Merge pull request #15323 from rhatdan/warnOpenShift Merge Robot2022-08-15
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Don't warn on '/' not being shared while in a container
| * | | | | Don't warn on '/' not being shared while in a containerDaniel J Walsh2022-08-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: https://github.com/containers/podman/issues/15295 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | | Merge pull request #15325 from ashley-cui/dstoreOpenShift Merge Robot2022-08-15
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | [CI:DOCS] Add .DS_Store to gitignore
| * | | | | [CI:DOCS] Add .DS_Store to gitignoreAshley Cui2022-08-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore .DS_Store, a MacOS metadata file created by the OS. Signed-off-by: Ashley Cui <acui@redhat.com>
* | | | | | Merge pull request #15301 from chenxiaolong/restart_neverOpenShift Merge Robot2022-08-15
|\ \ \ \ \ \ | |/ / / / / |/| | | | | podman-kube@.service.in: Remove Restart=never option with typo
| * | | | | podman-kube@.service.in: Remove Restart=never option with typoAndrew Gunnerson2022-08-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | systemd expects the value of the option to be `no` instead, but this is already the default behavior. This fixes the following warning when running `systemctl status` on the unit: Failed to parse service restart specifier, ignoring: never Signed-off-by: Andrew Gunnerson <chillermillerlong@hotmail.com>
* | | | | | Merge pull request #15319 from ↵OpenShift Merge Robot2022-08-15
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/mattn/go-isatty-0.0.16 build(deps): bump github.com/mattn/go-isatty from 0.0.14 to 0.0.16
| * | | | | build(deps): bump github.com/mattn/go-isatty from 0.0.14 to 0.0.16dependabot[bot]2022-08-15
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/mattn/go-isatty](https://github.com/mattn/go-isatty) from 0.0.14 to 0.0.16. - [Release notes](https://github.com/mattn/go-isatty/releases) - [Commits](https://github.com/mattn/go-isatty/compare/v0.0.14...v0.0.16) --- updated-dependencies: - dependency-name: github.com/mattn/go-isatty dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
* | | | | Merge pull request #15316 from dfr/freebsd-buildOpenShift Merge Robot2022-08-15
|\ \ \ \ \ | |/ / / / |/| | | | Add non-linux build stubs for pkg/domain and pkg/specgen
| * | | | pkg/domain: Add stubs for non-linux buildsDoug Rabson2022-08-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson <dfr@rabson.org>
| * | | | pkg/specgen: Add stubs for non-linux buildsDoug Rabson2022-08-15
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces a local type rlimT which is used to convert runtime-spec POSIXRlimit to platform-specific Rlimit structures - on FreeBSD rlimit members are signed integers. [NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson <dfr@rabson.org>
* | | | Merge pull request #15290 from dfr/freebsd-buildOpenShift Merge Robot2022-08-13
|\ \ \ \ | |/ / / |/| | | FreeBSD build fixes for pkg/util and pkg/machine
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-01-03 22:16:49 +0000