summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #8333 from rhatdan/buildahOpenShift Merge Robot2020-11-14
|\ | | | | Podman-remote build is getting ID twice
| * Podman-remote build is getting ID twiceDaniel J Walsh2020-11-14
| | | | | | | | | | | | | | | | | | This PR eliminates the second sending of the image id to the podman-remote client. Fixes: https://github.com/containers/podman/issues/8332 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #8336 from TomSweeneyRedHat/dev/tsweeney/podmanmanOpenShift Merge Robot2020-11-14
|\ \ | | | | | | [CI:DOCS] Touch up Podman description in man page menu
| * | [CI:DOCS] Touch up Podman description in man page menuTomSweeneyRedHat2020-11-13
| | | | | | | | | | | | | | | | | | | | | The title for the Podman man page on the commands menu was a little light, adding a few more words to it. Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
* | | Merge pull request #8327 from rhatdan/buildOpenShift Merge Robot2020-11-14
|\ \ \ | |/ / |/| | test for buildah version in container images.
| * | test for buildah version in container images.Daniel J Walsh2020-11-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check to see if we are recording the version of buildah used to build the image as a label in the image. Also we should make sure the filter "since" works. We are only testing "after", which we don't document. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #7964 from vrothberg/shortnamesOpenShift Merge Robot2020-11-13
|\ \ \ | | | | | | | | short-name aliasing
| * | | short-name aliasingValentin Rothberg2020-11-13
| | | | | | | | | | | | | | | | | | | | | | | | Add support for short-name aliasing. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | Merge pull request #6442 from Luap99/podman-autocompleteOpenShift Merge Robot2020-11-13
|\ \ \ \ | | | | | | | | | | Shell completion
| * | | | Install the new shell completion logicPaul Holzinger2020-11-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new make target (completion) to generate the shell completion scripts. This will generate the scripts for bash, zsh and fish for both podman and podman-remote with `podman completion`. The scripts are put into the completions directory and can be installed system wide with `sudo make install.completions`. This commit replaces the current handwritten scripts for bash and zsh. The `validate.completion` target has been adjusted to make sure nobody edits these scripts directly. Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
| * | | | Add shell completion with cobraPaul Holzinger2020-11-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow automatic generation for shell completion scripts with the internal cobra functions (requires v1.0.0+). This should replace the handwritten completion scripts and even adds support for fish. With this approach it is less likley that completions and code are out of sync. We can now create the scripts with - podman completion bash - podman completion zsh - podman completion fish To test the completion run: source <(podman completion bash) The same works for podman-remote and podman --remote and it will complete your remote containers/images with the correct endpoints values from --url/--connection. The completion logic is written in go and provided by the cobra library. The completion functions lives in `cmd/podman/completion/completion.go`. The unit test at cmd/podman/shell_completion_test.go checks if each command and flag has an autocompletion function set. This prevents that commands and flags have no shell completion set. This commit does not replace the current autocompletion scripts. Closes #6440 Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
| * | | | Vendor in some cobra PRs to improve the completion experience.Paul Holzinger2020-11-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is only temporary until the cobra following PRs are merged: - PR#1258 Custom completion handle multiple shorhand flags together - PR#1249 Fix fish handling of "ShellCompDirectiveNoSpace" and file completion - PR#1213 Fix zsh completion handling of nospace and file completion - PR#1146 Bash completion V2 with completion descriptions Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | | | | Merge pull request #8326 from Luap99/fix-build-namespaceOpenShift Merge Robot2020-11-13
|\ \ \ \ \ | |_|/ / / |/| | | | Fix namespace flag parsing for podman build
| * | | | Fix namespace flag parsing for podman buildPaul Holzinger2020-11-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The namespace options for pid,ipc,uts were completely ignored. The network namespace did not accept `none`. This commit fixes these issues simply by calling `parse.NamespaceOptions` from buildah instead of implementing our own logic. Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
| * | | | Add podman build --net alias for --networkPaul Holzinger2020-11-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #8332 Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | | | | Merge pull request #8308 from jwhonce/jira/run-976OpenShift Merge Robot2020-11-13
|\ \ \ \ \ | | | | | | | | | | | | Refactor to use DockerClient vs APIClient
| * | | | | Refactor to use DockerClient vs APIClientJhon Honce2020-11-12
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update tests and framework * remove tests for APIClient methods Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | | | Merge pull request #8334 from vilgotf/patch-1OpenShift Merge Robot2020-11-13
|\ \ \ \ \ | |_|_|_|/ |/| | | | Set podman-auto-update.service Type=oneshot
| * | | | Set podman-auto-update.service Type=oneshotVilgot Fredenberg2020-11-13
|/ / / / | | | | | | | | | | | | Signed-off-by: Vilgot Fredenberg <vilgot@fredenberg.xyz>
* | | | Merge pull request #8301 from TomSweeneyRedHat/dev/tsweeney/fixpullyOpenShift Merge Robot2020-11-13
|\ \ \ \ | |_|_|/ |/| | | Change podman build --pull=true to PullIfMissing
| * | | Change podman build --pull=true to PullIfMissingTomSweeneyRedHat2020-11-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One last tweak to the man page for 'build --pull' and after further testing against Docker, one slight change to the pull policy. First I changed `--pull=false` from PullNever to PullIfMissing. This matches Docker and will pull the image if it's not present rather than erroring. We've the `--pull-never` option if someone wants the pull to not do an actual pull and to error if the image isn't local. Then for the man page, I'd a much bigger change, in the initial PR, I've backed most of that out and just added a tweak. Hopefully this puts this portion of the pull work behind us for a while. Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
* | | | Merge pull request #8328 from FreedomBen/add-socket-startOpenShift Merge Robot2020-11-13
|\ \ \ \ | |/ / / |/| | | [CI:DOCS] Add missing --now in systemctl start command
| * | | Add missing --now in systemctl start commandBenjamin Porter2020-11-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you don't use --now or also run systemctl --user start podman.socket then the socket won't start until a reboot. Much easier to just start the socket at the same time as enabling it. Signed-off-by: Benjamin Porter <FreedomBen@users.noreply.github.com>
* | | | Merge pull request #8316 from rhatdan/codespellOpenShift Merge Robot2020-11-12
|\ \ \ \ | |_|/ / |/| | | Fix issues found with codespell
| * | | Fix issues found with codespellDaniel J Walsh2020-11-12
| |/ / | | | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #8304 from rhatdan/errorOpenShift Merge Robot2020-11-12
|\ \ \ | | | | | | | | Cleanup error reporting
| * | | Cleanup error reportingDaniel J Walsh2020-11-11
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The error message reported is overlay complicated and the added test does not really help the user. Currently the error looks like: podman run -p 80:80 fedora echo hello Error: failed to expose ports via rootlessport: "cannot expose privileged port 80, you might need to add "net.ipv4.ip_unprivileged_port_start=0" (currently 1024) to /etc/sysctl.conf, or choose a larger port number (>= 1024): listen tcp 0.0.0.0:80: bind: permission denied\n" After this change ./bin/podman run -p 80:80 fedora echo hello Error: cannot expose privileged port 80, you might need to add "net.ipv4.ip_unprivileged_port_start=0" (currently 1024) to /etc/sysctl.conf, or choose a larger port number (>= 1024): listen tcp 0.0.0.0:80: bind: permission denied Control chars have been eliminated. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #8318 from Luap99/doc-consistent-flag-orderOpenShift Merge Robot2020-11-12
|\ \ \ | | | | | | | | [CI:DOCS] Maintain consistent order of short and long flag names in docs
| * | | Maintain consistent order of short and long flag names in docsPaul Holzinger2020-11-12
| | |/ | |/| | | | | | | | | | | | | | | | | | | Make the order of short and long flag names in the documentation consistent. Also adjust the man page validaten script to only allow the `**--long**, **-s**` syntax. Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | | Merge pull request #8107 from cevich/measure_testing_statsOpenShift Merge Robot2020-11-12
|\ \ \ | | | | | | | | Cirrus: Collect runner.sh stats
| * | | Cirrus: Detailed CPU/Memory/Time runner.sh statsChris Evich2020-11-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On several occasions, there have been questions about CPU/Memory/IO trends in testing over time. Start collecting this data for all jobs, using a common/stable format so that trending analysis can be performed within/across multiple Cirrus-CI builds. This PR doesn't add any related tooling, it simply arranges for the collection of the data. Stats generation is done at the orchestration level to guarantee they reflect everything happening inside `runner.sh`. For example, the container-based tests re-exec `runner.sh` inside a container, but we're only interested in the top-level stats. Update all tasks to include collection of the stats file. Unfortunately, due to the way the Cirrus-CI YAML parser works, it is *not* possible to alias the artifacts collection more clearly, for example: ```yaml always: <<: *runner_stats <<: *logs_artifacts ``` Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | Merge pull request #8298 from mheon/db_network_connectOpenShift Merge Robot2020-11-12
|\ \ \ \ | |_|/ / |/| | | Add support for network connect / disconnect to DB
| * | | Add support for network connect / disconnect to DBMatthew Heon2020-11-11
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert the existing network aliases set/remove code to network connect and disconnect. We can no longer modify aliases for an existing network, but we can add and remove entire networks. As part of this, we need to add a new function to retrieve current aliases the container is connected to (we had a table for this as of the first aliases PR, but it was not externally exposed). At the same time, remove all deconflicting logic for aliases. Docker does absolutely no checks of this nature, and allows two containers to have the same aliases, aliases that conflict with container names, etc - it's just left to DNS to return all the IP addresses, and presumably we round-robin from there? Most tests for the existing code had to be removed because of this. Convert all uses of the old container config.Networks field, which previously included all networks in the container, to use the new DB table. This ensures we actually get an up-to-date list of in-use networks. Also, add network aliases to the output of `podman inspect`. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | Merge pull request #8311 from ↵OpenShift Merge Robot2020-11-12
|\ \ \ | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/rootless-containers/rootlesskit-0.11.1 Bump github.com/rootless-containers/rootlesskit from 0.11.0 to 0.11.1
| * | | Bump github.com/rootless-containers/rootlesskit from 0.11.0 to 0.11.1dependabot-preview[bot]2020-11-12
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/rootless-containers/rootlesskit](https://github.com/rootless-containers/rootlesskit) from 0.11.0 to 0.11.1. - [Release notes](https://github.com/rootless-containers/rootlesskit/releases) - [Commits](https://github.com/rootless-containers/rootlesskit/compare/v0.11.0...v0.11.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #8307 from mheon/fix_8221OpenShift Merge Robot2020-11-12
|\ \ \ | | | | | | | | Ensure we do not double-lock the same volume in create
| * | | Ensure we do not double-lock the same volume in createMatthew Heon2020-11-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When making containers, we want to lock all named volumes we are adding the container to, to ensure they aren't removed from under us while we are working. Unfortunately, this code did not account for a container having the same volume mounted in multiple places so it could deadlock. Add a map to ensure that we don't lock the same name more than once to resolve this. Fixes #8221 Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | Merge pull request #8272 from rhatdan/logsOpenShift Merge Robot2020-11-12
|\ \ \ \ | | | | | | | | | | Test podman-remote logs works the same as podman logs
| * | | | Add tests to make sure podman-remote logs works correctly.Daniel J Walsh2020-11-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: https://github.com/containers/podman/issues/7942 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | Merge pull request #8300 from TomSweeneyRedHat/dev/tsweeney/addmainOpenShift Merge Robot2020-11-12
|\ \ \ \ \ | |_|_|/ / |/| | | | Add podman(1) to the list of man pages on docs.podman.io
| * | | | Add podman(1) to the list of man pages on docs.podman.ioTomSweeneyRedHat2020-11-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As the title says. Addresses: #7219 Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
* | | | | Merge pull request #8306 from edsantiago/ci_update_vmsOpenShift Merge Robot2020-11-11
|\ \ \ \ \ | | | | | | | | | | | | Cirrus: update VMs
| * | | | | Cirrus: update VMsEd Santiago2020-11-11
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reason: include perl-FindBin RPM in f33 VM, needed for hack/xref-helpmsgs-manpages Ref: https://github.com/containers/automation_images/pull/39 Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | Merge pull request #8299 from edsantiago/ci_reenable_manpage_xrefOpenShift Merge Robot2020-11-11
|\ \ \ \ \ | | | | | | | | | | | | [CI:DOCS] Restore man page cross-checker
| * | | | | [CI:DOCS] Restore man page cross-checkerEd Santiago2020-11-11
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Somewhere in the CIv2 migration we lost the man page vs --help cross-checker. Add it back, by adding it into the man-page-check Makefile target; this is part of 'make validate', which is run in CI even on CI:DOCS PRs. As happens when CI doesn't run, things broke. Man pages got out of sync with --help. This PR: 1) Fixes hack/xref-helpmsgs-manpages to deal with the new "Options" (instead of "Flags") form of podman help. #8034 did part of that, but one of my review comments was accidentally left out. 2) Fixes hack/xref-helpmsgs-manpages to deal with the new option syntax in man pages, post- #8292, in which each option is preceded by four hashes so as to make them HTML <h4> elements with named anchors. 3) Fixes man pages that #8292 accidentally missed. 4) Adds man page entries for two flags that got added to podman but not documented (pod create --network-alias, play kube --log-driver) Fixes: #8296 Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | Merge pull request #8297 from cevich/restore_docs_testingOpenShift Merge Robot2020-11-11
|\ \ \ \ \ | | | | | | | | | | | | Cirrus: Run validation tests in CI:DOCS mode
| * | | | | Cirrus: Run validation tests in CI:DOCS modeChris Evich2020-11-11
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | | Merge pull request #8295 from baude/issue8294OpenShift Merge Robot2020-11-11
|\ \ \ \ \ | |/ / / / |/| | | | Set default network driver for APIv2 networks
| * | | | Set default network driver for APIv2 networksbaude2020-11-10
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recent changes in networking require that the cni network driver be set. If the user provides no driver, we set the driver to the defaultnetworkdriver which currently is "bridge". Fixes: #8294 Signed-off-by: baude <bbaude@redhat.com>
* | | | Merge pull request #8252 from baude/playkubetospecgenOpenShift Merge Robot2020-11-10
|\ \ \ \ | | | | | | | | | | migrate play kube to spec gen