summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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>
* | | | | Merge pull request #2522 from mheon/fix_timestamp_format_logsOpenShift Merge Robot2019-03-04
|\ \ \ \ \ | |_|_|_|/ |/| | | | Change timestamp format for podman logs
| * | | | Change timestamp format for podman logsMatthew Heon2019-03-04
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Golang standard library implementation of RFC3339Nano will trim trailing 0s from the nanoseconds portion of timestamps. This is undesirable for lining everything up nicely during terminal output. As the Golang developers have not seen fit to give us a better way, use the one that was proposed on the issue tracker but rejected. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | Merge pull request #2525 from mheon/release_notes_1.1.2OpenShift Merge Robot2019-03-04
|\ \ \ \ | | | | | | | | | | Update release notes for v1.1.2
| * | | | Update release notes for v1.1.2Matthew Heon2019-03-04
| | |/ / | |/| | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | | Merge pull request #2523 from jwhonce/bug/2521OpenShift Merge Robot2019-03-04
|\ \ \ \ | |/ / / |/| | | Fix #2521
| * | | Fix #2521Jhon Honce2019-03-04
| | |/ | |/| | | | | | | | | | | | | * Bad merge against podman stop, restored overwritten code Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | Merge pull request #2513 from mheon/log_timestamps_newlineOpenShift Merge Robot2019-03-04
|\ \ \ | |/ / |/| | Ensure that each log line is newline-terminated
| * | Add additional defense against 0-length log segfaultsMatthew Heon2019-03-03
| | | | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
| * | When logging with timestamps, append only until newlineMatthew Heon2019-03-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we log time timestamps, don't print a new timestamp for each input - instead, print one at the start of every line, and then wait until we hit a newline to print a new timestamp. This still doesn't exactly mirror the Docker behavior (they don't print until they receive an entire line, while we print any time the logs file is appended to - so you can see partial lines being typed in our system). Also, timestamps are recorded as the start of a line being typed, as opposed to when the enter key is pressed (on Docker). (Worth noting that, while characters are printed as they are typed, logs does respect the backspace key - so you'll also see them disappear as the person typing realizes they've made a mistake and retypes their command). This is the closest we can get to Docker without major surgery on the Kubernetes log-printing library, so I'm content to call this an adequate solution. Signed-off-by: Matthew Heon <mheon@redhat.com>
| * | Ensure that each log line is newline-terminatedMatthew Heon2019-03-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | When writing logs with timestamps to the terminal, ensure that each line is newline-terminated, so we don't end up with an unreadable mess with timestamps interspersed with the actual content being displayed. Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | Merge pull request #2511 from rhatdan/testOpenShift Merge Robot2019-03-04
|\ \ \ | | | | | | | | Add missing short flag -l for run/create
| * | | Add missing short flag -l for run/createDaniel J Walsh2019-03-03
| | | | | | | | | | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #2517 from QiWang19/i2509OpenShift Merge Robot2019-03-04
|\ \ \ \ | | | | | | | | | | Don't extract tar file in podman cp
| * | | | Don't extract tar file in podman cpQi Wang2019-03-04
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Qi Wang <qiwan@redhat.com>
* | | | | Merge pull request #2515 from giuseppe/fill_tmp_dir_for_confOpenShift Merge Robot2019-03-04
|\ \ \ \ \ | | | | | | | | | | | | runtime: fill a proper default tmpdir when --config is used
| * | | | | runtime: fill a proper default tmpdir when --config is usedGiuseppe Scrivano2019-03-04
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Closes: https://github.com/containers/libpod/issues/2408 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | Merge pull request #2512 from edsantiago/yet_more_usage_fixesOpenShift Merge Robot2019-03-04
|\ \ \ \ \ | |_|/ / / |/| | | | A few more usage-message tweaks
| * | | | A few more usage-message tweaksEd Santiago2019-03-03
| |/ / / | | | | | | | | | | | | | | | | | | | | Minor stuff, but it corrects some errors in usage messages. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | Merge pull request #2364 from jwhonce/wip/remote_stopOpenShift Merge Robot2019-03-04
|\ \ \ \ | |/ / / |/| | | Support podman-remote stop container
| * | | Support podman-remote stop container(s)Jhon Honce2019-03-02
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | * Clean up adapter code * Add GetContainersByContext to Varlink API * Add missing comments * Restore save command * Restore error type mapping when using varlink Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | Merge pull request #2477 from rhatdan/testOpenShift Merge Robot2019-03-03
|\ \ \ | |/ / |/| | Add tests to make sure podman container and podman image commands work
| * | Fix aliased commands to actually workDaniel J Walsh2019-03-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current aliased commands podman container list and podman image list podman image rm Do not work properly. The global storage options are broken. This patch fixes this issue. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
| * | Add tests to make sure podman container and podman image commands workDaniel J Walsh2019-03-02
|/ / | | | | | | | | | | | | | | | | We have little to no testing to make sure we don't break podman image and podman container commands that wrap traditional commands. This PR adds tests for each of the commands. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #2499 from mheon/bump-1.1.1OpenShift Merge Robot2019-03-01
|\ \ | | | | | | Bump to v1.1.1