summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #2573 from giuseppe/exec-extra-filesOpenShift Merge Robot2019-03-07
|\ | | | | oci: make explicit the extra files to the exec
| * oci: make explicit the extra files to the execGiuseppe Scrivano2019-03-07
| | | | | | | | | | | | | | | | | | In the previous version I forgot to add the fds to preserve into AdditionalFiles. It doesn't make a difference as the files were still preserved, but this seems to be the correct way of making it explicit. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | Merge pull request #2550 from wking/language-dot-splitOpenShift Merge Robot2019-03-07
|\ \ | | | | | | libpod/container_internal: Split locale at the first dot, etc.
| * | libpod/container_internal: Split locale at the first dot, etc.W. Trevor King2019-03-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're going to feed this into Go's BCP 47 language parser. Language tags have the form [1]: language ["-" script] ["-" region] *("-" variant) *("-" extension) ["-" privateuse] and locales have the form [2]: [language[_territory][.codeset][@modifier]] The modifier is useful for collation, but Go's language-based API [3] does not provide a way for us to supply it. This code converts our locale to a BCP 47 language by stripping the dot and later and replacing the first underscore, if any, with a hyphen. This will avoid errors like [4]: WARN[0000] failed to parse language "en_US.UTF-8": language: tag is not well-formed when feeding language.Parse(...). [1]: https://tools.ietf.org/html/bcp47#section-2.1 [2]: http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_02 [3]: https://github.com/golang/go/issues/25340 [4]: https://github.com/containers/libpod/issues/2494 Signed-off-by: W. Trevor King <wking@tremily.us>
* | | Merge pull request #2565 from edsantiago/healthcheck_run_usage_fixOpenShift Merge Robot2019-03-07
|\ \ \ | |_|/ |/| | Yet another seemingly minor tweak to usage message
| * | Yet another seemingly minor tweak to usage messageEd Santiago2019-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add explicit [flags] to podman healthcheck run Use message. Reason: Cobra checks for the string '[flags]' in the Use text. If absent, and command has options, Cobra appends it. This is misleading to humans, because the --help output looks like: podman healthcheck run CONTAINER [flags] ...when of course that won't work. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | Merge pull request #2563 from mheon/lookup_double_match_always_returns_nameOpenShift Merge Robot2019-03-07
|\ \ \ | | | | | | | | Change LookupContainer logic to match Docker
| * | | Change LookupContainer logic to match DockerMatthew Heon2019-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When looking up a container or pod by from user input, we handle collisions between names and IDs differently than Docker at present. In Docker, when there is a container with an ID starting with "c1" and a container named "c1", commands on "c1" will always act on the container named "c1". For the same scenario in podman, we throw an error about name collision. Change Podman to follow Docker, by returning the named container or pod instead of erroring. This should also have a positive effect on performance in the lookup-by-full-name case, which no longer needs to fully traverse the list of all pods or containers. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | Merge pull request #2534 from jwhonce/wip/remote_waitOpenShift Merge Robot2019-03-06
|\ \ \ \ | |_|/ / |/| | | Implement podman-remote wait command and container subcommand
| * | | Implement podman-remote wait command and container subcommandJhon Honce2019-03-06
| | | | | | | | | | | | | | | | Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | | Merge pull request #2442 from baude/remotepodtopOpenShift Merge Robot2019-03-06
|\ \ \ \ | | | | | | | | | | podman-remote pod top|stats
| * | | | podman-remote pod top|statsbaude2019-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this is the final enablement for the pod subcommand. it includes the ability to run podman-remote pod top and stats. Signed-off-by: baude <bbaude@redhat.com>
* | | | | Merge pull request #2412 from QiWang19/iss2380OpenShift Merge Robot2019-03-06
|\ \ \ \ \ | | | | | | | | | | | | Enable specifying directory as device on container with --device
| * | | | | fix bug --device enable specifying directory as deviceQi Wang2019-03-06
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Qi Wang <qiwan@redhat.com>
* | | | | Merge pull request #2545 from haircommander/weird_pod_bugOpenShift Merge Robot2019-03-06
|\ \ \ \ \ | | | | | | | | | | | | Fix pod create failure
| * | | | | Fix incorrect pod create failurePeter Hunt2019-03-06
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Before, a pod create would fail if it was set to share no namespaces, but had an infra container. While inefficient (you add a container for no reason), it shouldn't be a fatal failure. Fix this by only failing if the pod was set to share namespaces, but had no infra container, and writing a warning if vice versa. Signed-off-by: Peter Hunt <pehunt@redhat.com>
* | | | | Merge pull request #2532 from QiWang19/i2520OpenShift Merge Robot2019-03-06
|\ \ \ \ \ | |_|/ / / |/| | | | add flag --extract tar file in podman cp
| * | | | add flag --extract tar file in podman cpQi Wang2019-03-06
| |/ / / | | | | | | | | | | | | Signed-off-by: Qi Wang <qiwan@redhat.com>
* | | | Merge pull request #2491 from baude/healtcheckphase1OpenShift Merge Robot2019-03-06
|\ \ \ \ | | | | | | | | | | podman healthcheck run (phase 1)
| * | | | podman healthcheck run (phase 1)baude2019-03-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the ability to manually run a container's healthcheck command. This is only the first phase of implementing the healthcheck. Subsequent pull requests will deal with the exposing the results and history of healthchecks as well as the scheduling. Signed-off-by: baude <bbaude@redhat.com>
* | | | | Merge pull request #2547 from haircommander/pod_volume_mountOpenShift Merge Robot2019-03-06
|\ \ \ \ \ | |_|/ / / |/| | | | Add volume mounting to podman play kube
| * | | | Add volume mounting to podman play kubePeter Hunt2019-03-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before, podman play kube ignored HostPath and VolumeMounts fields in a k8s yaml file. Add this functionality, allowing for a user to create a volume mount from a .yaml file Signed-off-by: Peter Hunt <pehunt@redhat.com>
* | | | | Merge pull request #2543 from giuseppe/fix-rootless-s390x-crisOpenShift Merge Robot2019-03-06
|\ \ \ \ \ | | | | | | | | | | | | rootless: fix clone syscall on s390 and cris archs
| * | | | | rootless: fix clone syscall on s390 and cris archsGiuseppe Scrivano2019-03-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from the clone man page: On the cris and s390 architectures, the order of the first two arguments is reversed: long clone(void *child_stack, unsigned long flags, int *ptid, int *ctid, unsigned long newtls); Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1672714 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | | Merge pull request #2430 from QiWang19/issfiltetOpenShift Merge Robot2019-03-06
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Support filter image by reference to the image name
| * | | | | Support filter image by reference to the repo nameQi Wang2019-03-04
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Qi Wang <qiwan@redhat.com>
* | | | | | Merge pull request #2518 from haircommander/pod_hostOpenShift Merge Robot2019-03-05
|\ \ \ \ \ \ | | | | | | | | | | | | | | Append hosts to dependency container's /etc/hosts file
| * | | | | | Append hosts to dependency container's /etc/hosts filePeter Hunt2019-03-05
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Before, any container with a netNS dependency simply used its dependency container's hosts file, and didn't abide its configuration (mainly --add-host). Fix this by always appending to the dependency container's hosts file, creating one if necessary. Signed-off-by: Peter Hunt <pehunt@redhat.com>
* | | | | | Merge pull request #2519 from jwhonce/wip/remote_killOpenShift Merge Robot2019-03-05
|\ \ \ \ \ \ | | | | | | | | | | | | | | Support podman-remote kill container(s)
| * | | | | | Support podman-remote kill container(s)Jhon Honce2019-03-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | | | | | Merge pull request #2529 from cevich/use_vendor_ginkgoOpenShift Merge Robot2019-03-05
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | cirrus: Drop ginkgo, gomega, easyjson install
| * | | | | | cirrus: Drop ginkgo, gomega, easyjson installChris Evich2019-03-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is potentially harmful, since ginkgo and it's dependencies are now vendored and installed by `make .install.ginkgo`, and may not agree with installed 'go get' code under `$GOPATH`. Prune this (and easyjson install) from automation scripts. Signed-off-by: Chris Evich <cevich@redhat.com>
| * | | | | | Cirrus: Stop testing on RHELChris Evich2019-03-04
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was found that after updating the cache-image for RHEL 7.6, unpredictable integration tests start failing with 'permission denied' errors. Much effort was spent trying to diagnose this, as all other platforms pass. Since running the latest/greatest podman on RHEL, will never be officially supported (by Red Hat - must use RPM podman) this matrix-item is of questionable value. Therefor, this commit disables RHEL testing. Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | | | Merge pull request #2537 from giuseppe/rootless-storage-configOpenShift Merge Robot2019-03-05
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | rootless: fill in correct storage conf default
| * | | | | rootless: fill in correct storage conf defaultGiuseppe Scrivano2019-03-05
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the configuration file is specified, be sure to fill rootless compatible values in the default configuration. Closes: https://github.com/containers/libpod/issues/2510 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | Merge pull request #2435 from cevich/add_batsOpenShift Merge Robot2019-03-05
|\ \ \ \ \ | |_|_|_|/ |/| | | | Cirrus: Add BATS package for all platforms
| * | | | Cirrus: Stop testing on RHELChris Evich2019-03-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was found that after updating the cache-image for RHEL 7.6, unpredictable integration tests start failing with 'permission denied' errors. Much effort was spent trying to diagnose this, as all other platforms pass. Since running the latest/greatest podman on RHEL, will never be officially supported (by Red Hat - must use RPM podman) this matrix-item is of questionable value. Therefor, this commit disables RHEL testing. Signed-off-by: Chris Evich <cevich@redhat.com>
| * | | | Globally increase test timeout to 90-minutesChris Evich2019-03-04
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Chris Evich <cevich@redhat.com>
| * | | | cirrus: Drop ginkgo, gomega, easyjson installChris Evich2019-03-04
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Chris Evich <cevich@redhat.com>
| * | | | Cirrus: Add BATS package for all platformsChris Evich2019-03-04
| |/ / / | | | | | | | | | | | | Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | Merge pull request #2528 from cevich/more_timeOpenShift Merge Robot2019-03-05
|\ \ \ \ | | | | | | | | | | Globally increase test timeout to 90-minutes
| * | | | Globally increase test timeout to 90-minutesChris Evich2019-03-04
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | | Merge pull request #2540 from giuseppe/rm-error-1-if-no-ctrOpenShift Merge Robot2019-03-05
|\ \ \ \ \ | | | | | | | | | | | | rm: set exit code to 1 if a specified container is not found
| * | | | | rm: set exit code to 1 if a specified container is not foundGiuseppe Scrivano2019-03-05
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Closes: https://github.com/containers/libpod/issues/2539 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | Merge pull request #2535 from mheon/bump-1.1.2OpenShift Merge Robot2019-03-05
|\ \ \ \ \ | | | | | | | | | | | | Bump to v1.1.2
| * | | | | Bump gitvalidation epochMatthew Heon2019-03-04
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | | | | Bump to v1.2.0-devMatthew Heon2019-03-04
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | | | | Bump to v1.1.2v1.1.2Matthew Heon2019-03-04
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | | Merge pull request #2426 from giuseppe/exec-preserve-fdsOpenShift Merge Robot2019-03-05
|\ \ \ \ \ | |/ / / / |/| | | | exec: support --preserve-fds
| * | | | exec: support --preserve-fdsGiuseppe Scrivano2019-03-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to pass additional FDs to the process being executed. Closes: https://github.com/containers/libpod/issues/2372 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>