summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Fix cut and paste errors in podman-pod-inspectDaniel J Walsh2019-03-18
| | | | | | | Help information and errors should refer to pod inspection, not container and image inspection. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* Merge pull request #2683 from giuseppe/fix-pod-topOpenShift Merge Robot2019-03-18
|\ | | | | rootless: fix pod top
| * rootless: fix pod topGiuseppe Scrivano2019-03-18
| | | | | | | | | | | | | | | | we need to join the namespace of the target pod. Closes: https://github.com/containers/libpod/issues/2682 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | Merge pull request #2676 from cevich/fix_fail_ircOpenShift Merge Robot2019-03-16
|\ \ | | | | | | Cirrus: Fix post-merge failure notice
| * | Cirrus: Fix post-merge failure noticeChris Evich2019-03-16
| | | | | | | | | | | | | | | | | | | | | | | | Likely caused by rebase typos after removing test-commit. This fixes notifications to actually get sent. Also show env. vars after setting up the environment - helps debugging. Signed-off-by: Chris Evich <cevich@redhat.com>
* | | Merge pull request #2657 from edsantiago/image_tree_usageOpenShift Merge Robot2019-03-16
|\ \ \ | |/ / |/| | podman image tree: fix usage message
| * | podman image tree: fix usage messageEd Santiago2019-03-16
|/ / | | | | | | | | | | | | | | | | | | Minor fix to Use message: add IMAGE argument. (I'm a stickler for this because my zsh completion is self-generating, from the --help messages). Also, sort 'tree' before 'trust' in man page. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | Merge pull request #2620 from baude/multilogsOpenShift Merge Robot2019-03-16
|\ \ | | | | | | display logs for multiple containers at the same time
| * | Integration test tweaksbaude2019-03-15
| | | | | | | | | | | | | | | | | | | | | Wait for more than 1 second on podman info to complete. Also, add clarification to why slirp fails. Signed-off-by: baude <bbaude@redhat.com>
| * | display logs for multiple containers at the same timebaude2019-03-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add the ability for users to specify more than one container at a time while using podman logs. If more than one container is being displayed, podman will also prepend a shortened container id of the container on the log line. also, enabled the podman-remote logs command during the refactoring of the above ability. fixes issue #2219 Signed-off-by: baude <bbaude@redhat.com>
* | | Merge pull request #2672 from TomSweeneyRedHat/dev/tsweeney/clistoreconfOpenShift Merge Robot2019-03-16
|\ \ \ | | | | | | | | Add CLI storage conf example to run manpage
| * | | Add CLI storage conf example to run manpageTomSweeneyRedHat2019-03-15
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com> Add an example to the run man page to illustrate how you can configure storage from the CLI. This addresses a request from issue #2662. Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
* | | Merge pull request #2650 from cevich/notify_post_merge_fail_twoOpenShift Merge Robot2019-03-16
|\ \ \ | | | | | | | | Cirrus: Notify on IRC if post-merge testing fails
| * | | Cirrus: Notify on IRC if post-merge testing failsChris Evich2019-03-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Until recently it was very difficult to execute any scripts if part of a task failed. A new feature in Cirrus-CI makes this easy. Use it to post a notice on IRC when any task fails. Also: Add quotes around yaml-string values for consistency and syntax-highlighting correctness. Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | Merge pull request #2664 from kunalkushwaha/ps-port-fixOpenShift Merge Robot2019-03-16
|\ \ \ \ | | | | | | | | | | port grouping in ps command output
| * | | | testcase added for listing range of ports in ps commandKunal Kushwaha2019-03-15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
| * | | | port grouping in ps command outputKunal Kushwaha2019-03-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | continuous published ports are grouped in ps output. bugfix: #1358 Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
* | | | | Merge pull request #2658 from mheon/sctpOpenShift Merge Robot2019-03-16
|\ \ \ \ \ | | | | | | | | | | | | Add support for SCTP port forwarding
| * | | | | Add support for SCTP port forwardingMatthew Heon2019-03-15
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SCTP is already present and enabled in the CNI plugins, so all we need to do to add support is not error on attempting to bind ports to reserve them. I investigated adding this binding for SCTP, but support for SCTP in Go is honestly a mess - there's no widely-supported library for doing it that will do what we need. For now, warn that port reservation for SCTP is not supported and forward the ports. Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | | | Merge pull request #2675 from giuseppe/rootless-use-readable-path-for-conmonOpenShift Merge Robot2019-03-16
|\ \ \ \ \ | |_|_|/ / |/| | | | rootless: change default path for conmon.pid
| * | | | rootless: change default path for conmon.pidGiuseppe Scrivano2019-03-15
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We cannot use the RunDir for writing the conmon.pid file as we might not be able to read it before we join a namespace, since it is owned by the root in the container which can be a different uid when using uidmap. To avoid completely the issue, we will just write it to the static dir which is always readable by the unprivileged user. Closes: https://github.com/containers/libpod/issues/2673 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | Merge pull request #2643 from rhatdan/volumesOpenShift Merge Robot2019-03-15
|\ \ \ \ | |_|_|/ |/| | | Make sure buildin volumes have the same ownership and permissions as …
| * | | Make sure buildin volumes have the same ownership and permissions as imageDaniel J Walsh2019-03-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When creating a new image volume to be mounted into a container, we need to make sure the new volume matches the Ownership and permissions of the path that it will be mounted on. For example if a volume inside of a containre image is owned by the database UID, we want the volume to be mounted onto the image to be owned by the database UID. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #2595 from jwhonce/bug/1677908OpenShift Merge Robot2019-03-15
|\ \ \ \ | |_|/ / |/| | | Add --replace flag to "podman container runlabel"
| * | | Add --replace flag to "podman container runlabel"Jhon Honce2019-03-13
| | | | | | | | | | | | | | | | | | | | | | | | Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1677908 Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | | Merge pull request #2655 from giuseppe/tmp-userOpenShift Merge Robot2019-03-15
|\ \ \ \ | | | | | | | | | | rootless: use /tmp/libpod-rundir-$EUID for fallback
| * | | | rootless: use Geteuid instead of GetuidGiuseppe Scrivano2019-03-15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | rootless: use /tmp/libpod-rundir-$EUID for fallbackGiuseppe Scrivano2019-03-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when the fallback is in place, the first user creating /tmp/user/$EUID prevents other users for creating other directories since /tmp/user is created with mode 0700. Since there is no way for an unprivileged user to initialize the /tmp/user directory correctly (we would need it to be owned by root with the sticky bit set), let's just use /tmp/libpod-rundir-$EUID. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | Merge pull request #2646 from giuseppe/fix-build-orderOpenShift Merge Robot2019-03-15
|\ \ \ \ \ | | | | | | | | | | | | build: fix build DIR -t TAG
| * | | | | build: fix build DIR -t TAGGiuseppe Scrivano2019-03-15
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | accept also the order "build DIR -t TAG" Closes: https://github.com/containers/libpod/issues/2636 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | Merge pull request #2637 from edsantiago/zsh_completionOpenShift Merge Robot2019-03-15
|\ \ \ \ \ | | | | | | | | | | | | zsh completion
| * | | | | zsh completionEd Santiago2019-03-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Weekend hack by someone who doesn't grok zsh completion but who finds it deeply offensive that most completion files have an unmaintainable duplication of options and arguments. The idea behind this one is to discover the command line using --help, with a few hardcoded helpers for discovering containers, images, pods, and figuring out which args take files/dirs as args. Working remarkably well. I am using this in my daily routine and wondering how I ever managed without it. It's not perfect -- a future version can perhaps show only stopped containers for podman rm, only running ones for podman stop -- but ROI seems low on that given my limited zsh completion skills. Sadly, I can't figure out how to write a regression test suite for this. It would be lovely to have a list if partial command lines and expected completions, because the history of this change is that (seemingly) minor tweaks in one place cause breakage in another. Does anyone know of such a framework? Still... working well enough to ship, IMO. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | | Merge pull request #2633 from edsantiago/default_defaultOpenShift Merge Robot2019-03-15
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Usage messages: deduplicate '(default true)' et al
| * | | | | save-load-export: clear cli-parsing defaultEd Santiago2019-03-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...in order to silence Cobra's usually-helpful "(default xxx)" message. Initialization is now done in code, by testing for empty string and setting that to /dev/std{in,out} as appropriate; make special note of load.go where there's mild duplication between a local variable and cliconfig. Signed-off-by: Ed Santiago <santiago@redhat.com>
| * | | | | Usage messages: deduplicate '(default true)' et alEd Santiago2019-03-13
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove hardcoded '(default: true)' strings from bool flags, and '(default this-or-that)' from string flags. First because it's unmaintainable duplication that would cause confusion should someone ever change the default and not notice the message. Second, because cobra[1] already prints '(default XXXX)' for all options with non-false non-nil default. So in each of these cases, current podman help behavior is: $ podman login --help ... --tls-verify Require HTTPS ... (default: true) (default true) This PR eliminates that duplication. [1] actually spf13/pflag/flag.go The only nontrivial one of these is start.go, where the default for sigProxy depends on the --attach flag. Solution: change the command-line default to false, and implement the new conditional default in logic. Bonus: removed unnecessary check, because now if sigProxy is set without --attach, we can guarantee that it was done by the user. But please pay close scrutiny to this particular section in case there's something I missed. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | Merge pull request #2617 from giuseppe/fix-with-configOpenShift Merge Robot2019-03-15
|\ \ \ \ \ | | | | | | | | | | | | runtime: fill the runtime config with sane defaults
| * | | | | rootless: do not override user settingsGiuseppe Scrivano2019-03-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if the settings are available in the user config file, do not override them with the global configuration. Closes: https://github.com/containers/libpod/issues/2614 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | | runtime: refactor NewRuntime and NewRuntimeFromConfigGiuseppe Scrivano2019-03-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we had two functions NewRuntimeFromConfig and NewRuntime that differed only for the config file they use. Move comon logic to newRuntimeFromConfig and let it lookup the configuration file to use when one is not specified. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | | events: use os.SEEK_END instead of its valueGiuseppe Scrivano2019-03-15
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | Merge pull request #2656 from giuseppe/fix-rootfs-segfaultOpenShift Merge Robot2019-03-15
|\ \ \ \ \ | |/ / / / |/| | | | container: check containerInfo.Config before accessing it
| * | | | container: check containerInfo.Config before accessing itGiuseppe Scrivano2019-03-15
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | check that containerInfo.Config is not nil before trying to access it. Closes: https://github.com/containers/libpod/issues/2654 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | Merge pull request #2645 from mheon/fix_some_flakesOpenShift Merge Robot2019-03-15
|\ \ \ \ | | | | | | | | | | Fix a few flakes
| * | | | Bump timeout on a podman info test to defaultMatthew Heon2019-03-14
| |/ / / | | | | | | | | | | | | | | | | | | | | Saw this flake a few times because of a timeout issue. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | Merge pull request #2660 from giuseppe/upgrade-slirp4netnsOpenShift Merge Robot2019-03-15
|\ \ \ \ | |_|_|/ |/| | | cirrus: upgrade slirp4netns
| * | | cirrus: upgrade slirp4netnsGiuseppe Scrivano2019-03-14
| | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | Merge pull request #2653 from giuseppe/fix-slirp4netns-checkOpenShift Merge Robot2019-03-14
|\ \ \ \ | |/ / / |/| | | rootless: fix CI regression when using slirp4netns
| * | | rootless: fix CI regression when using slirp4netnsGiuseppe Scrivano2019-03-14
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Older versions of slirp4netns do not have the --disable-host-loopback flag. Remove the check once we are sure the updated version is available everywhere. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | Merge pull request #1642 from kunalkushwaha/image-treeOpenShift Merge Robot2019-03-14
|\ \ \ | | | | | | | | Tree implementation for podman images
| * | | Tree implementation for podman imagesKunal Kushwaha2019-03-14
| | | | | | | | | | | | | | | | Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
* | | | Merge pull request #2644 from giuseppe/slirp-disable-loOpenShift Merge Robot2019-03-14
|\ \ \ \ | | | | | | | | | | slirp4netns: use --disable-host-loopback