summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* tweak a couple of flag descriptions in help outputNalin Dahyabhai2021-11-04
| | | | | | Descriptions of flags don't need to start with whitespace of their own. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
* Merge pull request #12177 from Luap99/log-testOpenShift Merge Robot2021-11-04
|\ | | | | Fix bindings container log test
| * Fix bindings container log testPaul Holzinger2021-11-04
|/ | | | | | | | | | | The returned error was not checked, thus the test could hang forever since it blocks on the log channel. Also handle unexpectedEOF like EOF. Fixes #12176 Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* Merge pull request #12162 from giuseppe/run-split-test-in-separate-cgroupOpenShift Merge Robot2021-11-04
|\ | | | | test: run --cgroups=split in new cgroup
| * test: run --cgroups=split in new cgroupGiuseppe Scrivano2021-11-04
| | | | | | | | | | | | | | | | | | | | the --cgroups=split test changes the current cgroup as it creates a sub-cgroup. This can cause a race condition in tests that are reading the current cgroup. Closes: https://github.com/containers/podman/issues/11191 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | Merge pull request #12060 from mtrmac/podman-trust-show-f35OpenShift Merge Robot2021-11-03
|\ \ | | | | | | Fix `Podman image trust` tests
| * | Fix tests of podman image trust --raw and --jsonMiloslav Trmač2021-10-25
| | | | | | | | | | | | | | | | | | | | | | | | Instead using the OS-wide system default policy, use the one in this repo, and adjust the expected results (as well as making the test stricter). Signed-off-by: Miloslav Trmač <mitr@redhat.com>
| * | Tighten the expected output of the "podman image trust show" testMiloslav Trmač2021-10-25
| | | | | | | | | | | | | | | | | | ... to include all fields. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
| * | Use INTEGRATION_ROOT instead of current directoryMiloslav Trmač2021-10-25
| | | | | | | | | | | | | | | | | | | | | Should not change behavior, just to set a consistent precedent for code introduced in future commits. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | | Merge pull request #12166 from Luap99/macOpenShift Merge Robot2021-11-03
|\ \ \ | | | | | | | | MAC address json unmarshal should allow strings
| * | | MAC address json unmarshal should allow stringsPaul Holzinger2021-11-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a new mac address type which supports json marshal/unmarshal from and to string. This change is backwards compatible with the previous versions as the unmarshal method still accepts the old byte array or base64 encoded string. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* | | | Merge pull request #12157 from afbjorklund/stop-messageOpenShift Merge Robot2021-11-03
|\ \ \ \ | | | | | | | | | | Make stop message more similar to start
| * | | | Make stop message more similar to startAnders F Björklund2021-11-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [NO TESTS NEEDED] Signed-off-by: Anders F Björklund <anders.f.bjorklund@gmail.com>
* | | | | Merge pull request #12159 from jwhonce/issues/12115OpenShift Merge Robot2021-11-02
|\ \ \ \ \ | |_|/ / / |/| | | | Implement top streaming for containers and pods
| * | | | Implement top streaming for containers and podsJhon Honce2021-11-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Implement API query parameter stream and delay for containers and pods top endpoints * Update swagger with breaking changes * Add python API tests for endpoints Fixes #12115 Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | | | Merge pull request #12158 from edsantiago/more_batsOpenShift Merge Robot2021-11-02
|\ \ \ \ \ | | | | | | | | | | | | System tests: enhance volume test, add debug prints
| * | | | | System tests: enhance volume test, add debug printsEd Santiago2021-11-01
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Volume test: add a sequence of stat()s to confirm that volumes are mounted as a different device than root. Network test: add debugging code for #11825 (dnsmasq inotify failure in bodhi only). Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | Merge pull request #12156 from matejvasek/docker-api-zero-value-fixesOpenShift Merge Robot2021-11-02
|\ \ \ \ \ | | | | | | | | | | | | Fix libpod API conformance to swagger
| * | | | | Add testsMatej Vasek2021-11-01
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matej Vasek <mvasek@redhat.com>
| * | | | | More conforming libpod API and swagger typesMatej Vasek2021-11-01
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matej Vasek <mvasek@redhat.com>
| * | | | | More conforming libpod API and swagger typesMatej Vasek2021-11-01
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matej Vasek <mvasek@redhat.com>
| * | | | | Better emptiness test for custom JSON serializerMatej Vasek2021-11-01
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matej Vasek <mvasek@redhat.com>
| * | | | | Use correct swagger type in doc-commentMatej Vasek2021-11-01
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matej Vasek <mvasek@redhat.com>
| * | | | | Fix libpod API conformance to swaggerMatej Vasek2021-11-01
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Return empty array when nothing has been pruned. * Use correct return type swagger doc-comment. Signed-off-by: Matej Vasek <mvasek@redhat.com>
* | | | | Merge pull request #12051 from machacekondra/fix_http409_errorhandlingOpenShift Merge Robot2021-11-02
|\ \ \ \ \ | |_|_|_|/ |/| | | | Handle HTTP 409 error messages properly
| * | | | Handle HTTP 409 error messages properly for Pod actionsOndra Machacek2021-11-02
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | This PR fixes the case when the API return HTTP 409 response. Where the API return the body format different then for other HTTP error codes. Signed-off-by: Ondra Machacek <omachace@redhat.com>
* | | | Merge pull request #12118 from hshiina/log-f-journaldOpenShift Merge Robot2021-11-02
|\ \ \ \ | | | | | | | | | | Set flags to test 'logs -f' with journald driver
| * | | | Set flags to test 'logs -f' with journald driverHironori Shiina2021-10-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `logs -f` with `journald` is supported only when `journald` events backend is used. To pass system tests using `logs -f` in an environment where `events_logger` is not set to `journald` in `containers.conf`, this fix sets `--events-backend` or `--log-driver` temporally. Signed-off-by: Hironori Shiina <shiina.hironori@jp.fujitsu.com>
* | | | | Merge pull request #12160 from matejvasek/fix-swagger-apiOpenShift Merge Robot2021-11-02
|\ \ \ \ \ | |_|/ / / |/| | | | Fix swagger definitions
| * | | | Fix swagger definitionsMatej Vasek2021-11-01
| | |/ / | |/| | | | | | | | | | | | | | | | | | [NO TESTS NEEDED] Signed-off-by: Matej Vasek <mvasek@redhat.com>
* | | | Merge pull request #12139 from cevich/add_rootless_sshkeyOpenShift Merge Robot2021-11-01
|\ \ \ \ | |/ / / |/| | | Cirrus: Authorize rootless user self-ssh
| * | | Cirrus: Authorize rootless user self-sshChris Evich2021-11-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Future testing needs dictate rootless (in addition to root) users are able to ssh to localhost. Add ssh-key generation commands for the rootless user, and authorize their public key. Minor: Also remove update of `/etc/sub{uid,gid}` files, since this is now done automatically by `{user,group}add` commands. Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | Merge pull request #12119 from ashley-cui/updatesOpenShift Merge Robot2021-10-30
|\ \ \ \ | | | | | | | | | | [CI:DOCS] Add information on how podman machine is updated
| * | | | Add information on how podman machine is updatedAshley Cui2021-10-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update documentation on how the default podman machine distribution, FCOS, is updated. Signed-off-by: Ashley Cui <acui@redhat.com>
* | | | | Merge pull request #12141 from kprav33n/help-docOpenShift Merge Robot2021-10-30
|\ \ \ \ \ | | | | | | | | | | | | Fix help message case for `podman version`
| * | | | | Fix help message case for `podman version`Praveen Kumar2021-10-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a cosmetic change. The help message for `podman version` is in title case whereas all other command help messages are not in title case. This stands out as inconsistent when looking at the output of `podman help`. Signed-off-by: Praveen Kumar <praveen+git@kumar.in>
* | | | | | Merge pull request #12090 from afbjorklund/image-streamOpenShift Merge Robot2021-10-29
|\ \ \ \ \ \ | | | | | | | | | | | | | | Record the image stream along with the path
| * | | | | | Record the image stream along with the pathAnders F Björklund2021-10-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [NO TESTS NEEDED] Signed-off-by: Anders F Björklund <anders.f.bjorklund@gmail.com>
* | | | | | | Merge pull request #12128 from ↵OpenShift Merge Robot2021-10-29
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | containers/dependabot/go_modules/k8s.io/api-0.22.3 Bump k8s.io/api from 0.22.2 to 0.22.3
| * | | | | | Bump k8s.io/api from 0.22.2 to 0.22.3dependabot[bot]2021-10-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [k8s.io/api](https://github.com/kubernetes/api) from 0.22.2 to 0.22.3. - [Release notes](https://github.com/kubernetes/api/releases) - [Commits](https://github.com/kubernetes/api/compare/v0.22.2...v0.22.3) --- updated-dependencies: - dependency-name: k8s.io/api dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
* | | | | | | Merge pull request #12127 from vrothberg/bz-2014149OpenShift Merge Robot2021-10-29
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | volumes: be more tolerant and fix infinite loop
| * | | | | | | volumes: be more tolerant and fix infinite loopValentin Rothberg2021-10-28
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make Podman more tolerant when parsing image volumes during container creation and further fix an infinite loop when checking them. Consider `VOLUME ['/etc/foo', '/etc/bar']` in a Containerfile. While it looks correct to the human eye, the single quotes are wrong and yield the two volumes to be `[/etc/foo,` and `/etc/bar]` in Podman and Docker. When running the container, it'll create a directory `bar]` in `/etc` and a directory `[` in `/` with two subdirectories `etc/foo,`. This behavior is surprising to me but how Docker behaves. We may improve on that in the future. Note that the correct way to syntax for volumes in a Containerfile is `VOLUME /A /B /C` or `VOLUME ["/A", "/B", "/C"]`; single quotes are not supported. This change restores this behavior without breaking container creation or ending up in an infinite loop. BZ: https://bugzilla.redhat.com/show_bug.cgi?id=2014149 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | | | | Merge pull request #12138 from gsanchietti/doc_pause_typoOpenShift Merge Robot2021-10-29
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [CI:DOCS] Fix pause usage example
| * | | | | | | Fix pause usage exampleGiacomo Sanchietti2021-10-29
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The page contains a wrong 'stop' command example. Signed-off-by: Giacomo Sanchietti <giacomo.sanchietti@nethesis.it>
* | | | | | | Merge pull request #12133 from jwhonce/issues/12102OpenShift Merge Robot2021-10-29
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Allow label and labels when creating volumes
| * | | | | | | Allow label and labels when creating volumesJhon Honce2021-10-28
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JSON payload may have either key. Labels will override any values set via Label. Fixes #12102 Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | | | | | Merge pull request #12124 from giuseppe/allow-devpts-optionsOpenShift Merge Robot2021-10-28
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | volumes: allow more options for devpts
| * | | | | | | volumes: allow more options for devptsGiuseppe Scrivano2021-10-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allow to pass down more options that are supported by the kernel. Discussion here: https://github.com/containers/toolbox/issues/568 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | | | | volumes: do not pass mount opt as formatter stringGiuseppe Scrivano2021-10-28
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | otherwise passing a formatter string as an option causes a weird error message: $ podman run --mount type=devpts,destination=/dev/pts,%sfoo ... Error: %!s(MISSING)foo: invalid mount option Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | | | Merge pull request #12117 from ↵OpenShift Merge Robot2021-10-28
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | adrianreber/2021-10-27-set-checkpointed-false-after-restore Set Checkpointed state to false after restore