summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #2632 from ↵OpenShift Merge Robot2019-03-18
|\ | | | | | | | | debarshiray/wip/rishi/podman-rm-exit-with-125-for-bogus-and-running Make 'podman rm' exit with 125 if it had a bogus & a running container
| * Make 'podman rm' exit with 125 if it had a bogus & a running containerDebarshi Ray2019-03-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Getting a list of containers, and then deleting them are two separate fallible steps that can run into different sets of errors. eg., in the case of a bogus missing container and a container that's running or paused, the first step will only trigger libpod.ErrNoSuchCtr. At this point it might appear that the exit code ought to be 1. However, when attempting the deletion, it will fail once more due to the status of the running or paused container. Since libpod.ErrNoSuchCtr is no longer the only error encountered, the exit code should be reset to 125. This problem is currently masked for rootless usage due to commit 35432ecaae4a8372 ("rootless: fix rm when uid in the container != 0"). Fixes: 85db895012bead6b ("rm: set exit code to 1 if a specified ...") e41279b902a334e5 ("Change exit code to 1 on podman rm ...") Signed-off-by: Debarshi Ray <rishi@fedoraproject.org>
* | Merge pull request #2693 from cevich/disable_master_successOpenShift Merge Robot2019-03-18
|\ \ | | | | | | Cirrus: Disable master-success IRC notices
| * | Cirrus: Disable master-success IRC noticesChris Evich2019-03-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since `on_failure` notification is working, and IRC activity is picking up, these messages mostly just get in the way. Leave the PR-testing success messages in place for now, since they're helpful when someone's waiting. Signed-off-by: Chris Evich <cevich@redhat.com>
* | | Merge pull request #2674 from rhatdan/loadOpenShift Merge Robot2019-03-18
|\ \ \ | |/ / |/| | Cleanup messages on podman load
| * | Cleanup messages on podman loadDaniel J Walsh2019-03-18
| | | | | | | | | | | | | | | | | | | | | If user does not specify file or redirect for stdin, then throw an error Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #2689 from cevich/new_imagesOpenShift Merge Robot2019-03-18
|\ \ \ | | | | | | | | Cirrus: Update VM Cache images
| * | | Cirrus: Update VM Cache imagesChris Evich2019-03-18
| | | | | | | | | | | | | | | | | | | | | | | | Undo short-term slirp4netns workaround (#2660) Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | Merge pull request #2687 from rhatdan/inspectOpenShift Merge Robot2019-03-18
|\ \ \ \ | | | | | | | | | | Fix cut and paste errors in podman-pod-inspect
| * | | | 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 #2679 from baude/issue2677OpenShift Merge Robot2019-03-18
|\ \ \ \ \ | |_|_|/ / |/| | | | podman logs on created container should exit
| * | | | podman logs on created container should exitbaude2019-03-18
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when running podman logs on a created container (which has no logs), podman should return gracefully (like docker) with a 0 return code. if multiple containers are provided and one is only in the created state (and no follow is used), we still display the logs for the other ids. fixes issue #2677 Signed-off-by: baude <bbaude@redhat.com>
* | | | Merge pull request #2670 from giuseppe/runtime-write-rootless-conf-before-reloadOpenShift Merge Robot2019-03-18
|\ \ \ \ | | | | | | | | | | rootless: write the custom config file before reload
| * | | | utils: split generation and writing of storage.confGiuseppe Scrivano2019-03-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | split the generation for the default storage.conf and when we write it if not existing for a rootless user. This is necessary because during the startup we might be overriding the default configuration through --storage-driver and --storage-opt, that would not be written down to the storage.conf file we generated. Closes: https://github.com/containers/libpod/issues/2659 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | utils: avoid too long tmp directoryGiuseppe Scrivano2019-03-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | or we will easily pass the 108 chars limits for unix paths. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | rootless: write the custom config file before reloadGiuseppe Scrivano2019-03-15
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | so that when we do a rootlessReload we inherit the correct settings from the command line. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | Merge pull request #2685 from kunalkushwaha/ps-man-page-fix-2664OpenShift Merge Robot2019-03-18
|\ \ \ \ | | | | | | | | | | output of port grouping in ps command added as example
| * | | | output of port grouping in ps command added as exampleKunal Kushwaha2019-03-18
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
* | | | | Merge pull request #2684 from giuseppe/fix-crash-pod-inspectOpenShift Merge Robot2019-03-18
|\ \ \ \ \ | |_|_|/ / |/| | | | pod: fix segfault when there are no arguments to inspect
| * | | | pod: fix segfault when there are no arguments to inspectGiuseppe Scrivano2019-03-18
| | |/ / | |/| | | | | | | | | | | | | | | | | | Closes: https://github.com/containers/libpod/issues/2681 Signed-off-by: Giuseppe Scrivano <gscrivan@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
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-20 02:35:31 +0000