summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #2151 from QiWang19/cpOpenShift Merge Robot2019-02-14
|\ | | | | 'podman cp' copy between host and container
| * 'podman cp' copy between host and containerQi Wang2019-02-14
| | | | | | | | Signed-off-by: Qi Wang <qiwan@redhat.com>
* | Merge pull request #2298 from mtrmac/multiple-manifestsOpenShift Merge Robot2019-02-14
|\ \ | | | | | | Vendor in latest c/storage and c/image
| * | Vendor in latest c/storage and c/imageMiloslav Trmač2019-02-13
| | | | | | | | | | | | Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | | Merge pull request #2229 from rhatdan/volumesOpenShift Merge Robot2019-02-14
|\ \ \ | | | | | | | | Fix volume handling in podman
| * | | Fix volume handling in podmanDaniel J Walsh2019-02-14
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | iFix builtin volumes to work with podman volume Currently builtin volumes are not recored in podman volumes when they are created automatically. This patch fixes this. Remove container volumes when requested Currently the --volume option on podman remove does nothing. This will implement the changes needed to remove the volumes if the user requests it. When removing a volume make sure that no container uses the volume. Signed-off-by: Daniel J Walsh dwalsh@redhat.com Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #2336 from baude/addbuildtomainOpenShift Merge Robot2019-02-14
|\ \ \ | | | | | | | | add build to main and as subcommand to image
| * | | add build to main and as subcommand to imagebaude2019-02-14
|/ / / | | | | | | | | | | | | | | | | | | | | | add build as a local and remote-client command in the main podman menu. also ensure it is added to the image subcommands as well. Signed-off-by: baude <bbaude@redhat.com>
* | | Merge pull request #2321 from baude/remotebuildOpenShift Merge Robot2019-02-14
|\ \ \ | | | | | | | | podman-remote build
| * | | podman-remote buildbaude2019-02-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | add the ability to build images using files local to the remote-client but over a varlink interface to a "remote" server. Signed-off-by: baude <bbaude@redhat.com>
* | | | Merge pull request #2319 from mheon/unconditional_cleanupOpenShift Merge Robot2019-02-13
|\ \ \ \ | | | | | | | | | | Fix manual detach from containers to not wait for exit
| * | | | Try disabling --rm on notify_socket testMatthew Heon2019-02-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have a consistent CI failure with the notify_socket test that I can't reproduce locally. There's no reason for the test to have --rm, so try removing it. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | | | Remove a lot of '--rm' options from unit testsMatthew Heon2019-02-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, 'podman create --rm' did not work - it wouldn't error but it did nothing. It is now fixed, but unfortunately the unit tests used it a lot, in ways that just do not work when it actually functions. Begin the process of fixing now-failing tests. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | | | Address review comments on #2319Matthew Heon2019-02-12
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
| * | | | Retain a copy of container exit file on cleanupMatthew Heon2019-02-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When cleaning up containers, we presently remove the exit file created by Conmon, to ensure that if we restart the container, we won't have conflicts when Conmon tries writing a new exit file. Unfortunately, we need to retain that exit file (at least until we get a workable events system), so we can read it in cases where the container has been removed before 'podman run' can read its exit code. So instead of removing it, rename it, so there's no conflict with Conmon, and we can still read it later. Fixes: #1640 Signed-off-by: Matthew Heon <mheon@redhat.com>
| * | | | Fix manual detach from containers to not wait for exitMatthew Heon2019-02-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At present, when manually detaching from an attached container (using the detach hotkeys, default C-p C-q), Podman will still wait for the container to exit to obtain its exit code (so we can set Podman's exit code to match). This is correct in the case where attach finished because the container exited, but very wrong for the manual detach case. As a result of this, we can no longer guarantee that the cleanup and --rm functions will fire at the end of 'podman run' - we may be exiting before we get that far. Cleanup is easy enough - we swap to unconditionally using the cleanup processes we've used for detached and rootless containers all along. To duplicate --rm we need to also teach 'podman cleanup' to optionally remove containers instead of cleaning them up. (There is an argument for just using 'podman rm' instead of 'podman cleanup --rm', but cleanup does have different semantics given that we only ever expect it to run when the container has just exited. I think it might be useful to keep the two separate for things like 'podman events'...) Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | | | Merge pull request #2330 from baude/issue1842OpenShift Merge Robot2019-02-13
|\ \ \ \ \ | | | | | | | | | | | | build varlink without GOPATH
| * | | | | build varlink without GOPATHbaude2019-02-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when gopath was not explicitly set, make would fail due to the varlink generator. this symlink in the makefile addresses that. fixes: #1842 Signed-off-by: baude <bbaude@redhat.com>
* | | | | | Merge pull request #2329 from vrothberg/run-pod-completionOpenShift Merge Robot2019-02-13
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | completions: add --pod to run/create
| * | | | | completions: add --pod to run/createValentin Rothberg2019-02-13
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | | | Merge pull request #2331 from baude/issue846OpenShift Merge Robot2019-02-13
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | show container ports of network namespace
| * | | | | show container ports of network namespacebaude2019-02-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in cases where a container is part of a network namespace, we should show the network namespace's ports when dealing with ports. this impacts ps, kube, and port. fixes: #846 Signed-off-by: baude <bbaude@redhat.com>
* | | | | | Merge pull request #2316 from baude/remotevolumeinspectOpenShift Merge Robot2019-02-13
|\ \ \ \ \ \ | |/ / / / / |/| | | | | podman-remote volume inspect|ls
| * | | | | podman-remote volume inspect|lsbaude2019-02-13
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add the ability to list and inspect volumes using the remote client and varlink Signed-off-by: baude <bbaude@redhat.com>
* | | | | Merge pull request #2327 from baude/issue2175OpenShift Merge Robot2019-02-13
|\ \ \ \ \ | |/ / / / |/| | | | Parse fq name correctly for images
| * | | | Parse fq name correctly for imagesbaude2019-02-13
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When parsing a string name for repo and tag (for images output), we should be using parsenormalizedname and reference.Canonical to get the proper output. Resolves: #2175 Signed-off-by: baude <bbaude@redhat.com>
* | | | Merge pull request #2322 from baude/remotepushOpenShift Merge Robot2019-02-13
|\ \ \ \ | | | | | | | | | | podman-remote push
| * | | | podman-remote pushbaude2019-02-13
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enable podman-remote push so that users can push images from a remote client. change in push API to deal with the need to see output over the varlink connection. Signed-off-by: baude <bbaude@redhat.com>
* | | | Merge pull request #2326 from edsantiago/esm/nosudoOpenShift Merge Robot2019-02-13
|\ \ \ \ | | | | | | | | | | get_ci_vm : allow running without sudo
| * | | | get_ci_vm : allow running without sudoEd Santiago2019-02-13
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More complicated than one would think. The first problem is that, on certain (but not all) Fedora systems, podman cannot mount volumes read-only (issue #2312). This is baffling, and since it's not easily reproducible it's likely that the dev team will not spend much effort on it. Workaround: instead of bind- mounting /tmp read-only, bind-mount a *tempdir* (subdirectory) read-write. This is actually cleaner in some ways but it leads to complications with the paths we use and with cleanup. Next, allow overriding the default image and allow asking for no sudo: export GCLOUD_IMAGE=quay.io/edsantiago/gcloud_centos:latest export GCLOUD_SUDO= (yes, that's an equal-sign and EOL. Just an empty string). The third part, unfortunately, requires a custom image because the as_dollar_user.sh script (the one that runs gcloud in a container) is hardwired in a cevich image and needs tweaks in order to detect rootless and avoid sudo. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | Merge pull request #2323 from baude/varlinkconditionalOpenShift Merge Robot2019-02-13
|\ \ \ \ | |_|/ / |/| | | Only build varlink when buildtag is available
| * | | Only build varlink when buildtag is availablebaude2019-02-12
|/ / / | | | | | | | | | | | | | | | | | | | | | Correct mistake that broke things like dlv where we should only try to add the varlink command to podman when the 'varlink' build tag is present. Signed-off-by: baude <bbaude@redhat.com>
* | | Merge pull request #2264 from larskarlitski/varlink-apiOpenShift Merge Robot2019-02-12
|\ \ \ | |/ / |/| | Make varlink API more idiomatic
| * | varlink: Rename `SearchImage` to `SearchImages`Lars Karlitski2019-02-12
| | | | | | | | | | | | | | | | | | | | | Also rename image result struct to `ImageSearchResult` and make `limit` parameter optional. Signed-off-by: Lars Karlitski <lars@karlitski.net>
| * | varlink: Rename `ContainerInList` to `Container`Lars Karlitski2019-02-12
| | | | | | | | | | | | | | | | | | Container more clearly describes what the type represents. Signed-off-by: Lars Karlitski <lars@karlitski.net>
| * | varlink: Rename `ImageInList` to `Image`Lars Karlitski2019-02-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | Image more clearly describes what the type represents. Also, only include the image name in the `ImageNotFound` error returned by `GetImage()`, not the full error message. Signed-off-by: Lars Karlitski <lars@karlitski.net>
| * | varlink: Simplify GetVersion() callLars Karlitski2019-02-12
| | | | | | | | | | | | | | | | | | | | | Not having the `Version` wrapper type makes it easier for clients to work with the returned data. Signed-off-by: Lars Karlitski <lars@karlitski.net>
| * | varlink: Return all times in RFC 3339 formatLars Karlitski2019-02-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | This is more consistent and eaiser to parse than the format that golang's time.String() returns. Fixes #2260 Signed-off-by: Lars Karlitski <lars@karlitski.net>
| * | Makefile: Don't include quotes around GIT_COMMITLars Karlitski2019-02-12
| | | | | | | | | | | | | | | | | | These quotes were included in the varlink `GetVersion()` call. Signed-off-by: Lars Karlitski <lars@karlitski.net>
| * | varlink: Remove the Ping() methodLars Karlitski2019-02-12
| | | | | | | | | | | | | | | | | | | | | | | | There are other ways for developers to "ensure their varlink setup is working", for example by calling `GetVersion()` or any call on the org.varlink.service interface. Signed-off-by: Lars Karlitski <lars@karlitski.net>
| * | podman: Show error when creating varlink listener failedLars Karlitski2019-02-12
| | | | | | | | | | | | Signed-off-by: Lars Karlitski <lars@karlitski.net>
| * | varlink: Remove `NotImplemented` typeLars Karlitski2019-02-12
| | | | | | | | | | | | | | | | | | | | | | | | Remove the `NotImplemented` type and comment out the methods that use it. This way we can keep track of the methods that still need to be implemented without committing them to stable API. Signed-off-by: Lars Karlitski <lars@karlitski.net>
* | | Merge pull request #2309 from rhatdan/helpOpenShift Merge Robot2019-02-12
|\ \ \ | |/ / |/| | Don't show global flags except for podman command
| * | Don't show global flags except for podman commandDaniel J Walsh2019-02-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | Subcommands should not be showing the global flags. This causes the important information to scroll off the screen. Also fixed a typo on runCommmand (Too many 'm's) Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #2315 from baude/remotevolumermOpenShift Merge Robot2019-02-12
|\ \ \ | | | | | | | | podman-remote volume rm
| * | | podman-remote volume rmbaude2019-02-11
| |/ / | | | | | | | | | | | | | | | | | | add the ability to remove/delete volumes with the podman remote client. Signed-off-by: baude <bbaude@redhat.com>
* | | Merge pull request #2300 from baude/cleanupurfaveOpenShift Merge Robot2019-02-12
|\ \ \ | |/ / |/| | Remove urfave/cli from libpod
| * | Remove urfave/cli from libpodbaude2019-02-11
| | | | | | | | | | | | | | | | | | | | | This is the final cleanup to remove urfave/sli from libpod. Removed old, disabled tests that have not been run in over a year. Signed-off-by: baude <bbaude@redhat.com>
* | | Merge pull request #2313 from baude/remotevolumecreateOpenShift Merge Robot2019-02-12
|\ \ \ | |/ / |/| | podman-remote volume create
| * | podman-remote volume createbaude2019-02-11
| | | | | | | | | | | | | | | | | | create a volume using the remote client over varlink Signed-off-by: baude <bbaude@redhat.com>