summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* fix `podman -v` regressionValentin Rothberg2019-07-29
| | | | | | | Re-add the shortflag for --version and add e2e tests to avoid regressing in the future. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* Merge pull request #3641 from mheon/no_fuzzy_volume_lookupOpenShift Merge Robot2019-07-25
|\ | | | | When retrieving volumes, only use exact names
| * When retrieving volumes, only use exact namesMatthew Heon2019-07-24
|/ | | | | | | | | | We should not be fuzzy matching on volume names. Docker doesn't do it, and it doesn't make much sense. Everything requires exact matches for names - only IDs allow partial matches. Fixes #3635 Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* Merge pull request #3626 from mheon/fix_ps_segfaultOpenShift Merge Robot2019-07-24
|\ | | | | Fix a segfault on Podman no-store commands with refresh
| * Fix a segfault on Podman no-store commands with refreshMatthew Heon2019-07-23
| | | | | | | | | | | | | | | | | | | | | | | | | | When a command (like `ps`) requests no store be created, but also requires a refresh be performed, we have to ignore its request and initialize the store anyways to prevent segfaults. This work was done in #3532, but that missed one thing - initializing a storage service. Without the storage service, Podman will still segfault. Fix that oversight here. Fixes #3625 Signed-off-by: Matthew Heon <mheon@redhat.com>
* | Merge pull request #3615 from vrothberg/build-tagsOpenShift Merge Robot2019-07-24
|\ \ | | | | | | install.md: mention all build tags
| * | install.md: mention all build tagsValentin Rothberg2019-07-23
| | | | | | | | | | | | Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | Merge pull request #3624 from haircommander/conmon-exec-with-remote-execOpenShift Merge Robot2019-07-24
|\ \ \ | | | | | | | | Add remote exec
| * | | refactor to reduce duplicated error parsingPeter Hunt2019-07-23
| | | | | | | | | | | | | | | | Signed-off-by: Peter Hunt <pehunt@redhat.com>
| * | | remove debug printsPeter Hunt2019-07-23
| | | | | | | | | | | | | | | | Signed-off-by: Peter Hunt <pehunt@redhat.com>
| * | | always send generic error in case io failsPeter Hunt2019-07-23
| | | | | | | | | | | | | | | | Signed-off-by: Peter Hunt <pehunt@redhat.com>
| * | | only use stdin if specifiedPeter Hunt2019-07-23
| | | | | | | | | | | | | | | | Signed-off-by: Peter Hunt <pehunt@redhat.com>
| * | | buffer errChanPeter Hunt2019-07-23
| | | | | | | | | | | | | | | | Signed-off-by: Peter Hunt <pehunt@redhat.com>
| * | | move handleTerminalAttach to generic buildPeter Hunt2019-07-23
| | | | | | | | | | | | | | | | Signed-off-by: Peter Hunt <pehunt@redhat.com>
| * | | remove unnecessary conversionsPeter Hunt2019-07-23
| | | | | | | | | | | | | | | | Signed-off-by: Peter Hunt <pehunt@redhat.com>
| * | | add detach keys support for remotePeter Hunt2019-07-23
| | | | | | | | | | | | | | | | Signed-off-by: Peter Hunt <pehunt@redhat.com>
| * | | move editing of exitCode to runtimePeter Hunt2019-07-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no way to get the error if we successfully get an exit code (as it's just printed to stderr instead). instead of relying on the error to be passed to podman, and edit based on the error code, process it on the varlink side instead Also move error codes to define package Signed-off-by: Peter Hunt <pehunt@redhat.com>
| * | | Update e2e tests for remote execPeter Hunt2019-07-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | including changing -l to the container id and separating a case of setting the env that remote can't handle Signed-off-by: Peter Hunt <pehunt@redhat.com>
| * | | Finish up remote exec implementationPeter Hunt2019-07-23
| | |/ | |/| | | | | | | Signed-off-by: Peter Hunt <pehunt@redhat.com>
* | | Merge pull request #3633 from QiWang19/networkOpenShift Merge Robot2019-07-24
|\ \ \ | | | | | | | | fix build --network=container
| * | | fix build --network=containerQi Wang2019-07-23
| | | | | | | | | | | | | | | | Signed-off-by: Qi Wang <qiwan@redhat.com>
* | | | Merge pull request #3638 from hooksie1/issue-#3577OpenShift Merge Robot2019-07-24
|\ \ \ \ | | | | | | | | | | Fixes issue #3577.
| * | | | Fixes issue #3577.John Hooks2019-07-23
| |/ / / | | | | | | | | | | | | | | | | | | | | Fix punctuation and wording in some places. Signed-off-by: John Hooks <hooksie11@gmail.com>
* | | | Merge pull request #3634 from mheon/fix_32bitOpenShift Merge Robot2019-07-24
|\ \ \ \ | |/ / / |/| | | Re-add int64 casts for ctime to fix 32-bit build
| * | | Re-add int64 casts for ctimeMatthew Heon2019-07-23
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | The variables here are 64-bit on 64-bit builds, so the linter recommends stripping them. Unfortunately, they're 32-bit on 32-bit builds, so stripping them breaks that. Readd with a nolint to convince it to not break. Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | Merge pull request #3619 from cevich/workaround_missing_iamgeOpenShift Merge Robot2019-07-23
|\ \ \ | |/ / |/| | Cirrus: Temp. workaround missing imgprune image
| * | Cirrus: Temp. workaround missing imgprune imageChris Evich2019-07-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 'image_prune' task only runs on master, post-merge and is currently failing for all builds. This is because it references a non-existent image. The person with access to add/enable this image is on PTO. Fix this by temporarily using a hand-built image until an automatic build can be added. Signed-off-by: Chris Evich <cevich@redhat.com>
* | | Merge pull request #3630 from baude/golangcilint5OpenShift Merge Robot2019-07-23
|\ \ \ | | | | | | | | golangci-lint cleanup
| * | | golangci-lint cleanupbaude2019-07-23
|/ / / | | | | | | | | | | | | | | | | | | a PR slipped through without running the new linter. this cleans things up for the master branch. Signed-off-by: baude <bbaude@redhat.com>
* | | Merge pull request #3623 from TomSweeneyRedHat/dev/tsweeney/pimagereadmeOpenShift Merge Robot2019-07-23
|\ \ \ | | | | | | | | Change wait to sleep in podmanimage readme
| * | | Change wait to sleep in podmanimage readmeTomSweeneyRedHat2019-07-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change wait to sleep 100000 as we've had some reports of problems with wait: https://github.com/containers/buildah/issues/1665 Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
* | | | Merge pull request #3621 from baude/golangcilint4OpenShift Merge Robot2019-07-23
|\ \ \ \ | |_|_|/ |/| | | golangci-lint phase 4
| * | | golangci-lint phase 4baude2019-07-22
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | clean up some final linter issues and add a make target for golangci-lint. in addition, begin running the tests are part of the gating tasks in cirrus ci. we cannot fully shift over to the new linter until we fix the image on the openshift side. for short term, we will use both Signed-off-by: baude <bbaude@redhat.com>
* | | Merge pull request #3143 from haircommander/conmon-execOpenShift Merge Robot2019-07-22
|\ \ \ | |_|/ |/| | use conmon for exec
| * | bump cirrus images to get new conmonPeter Hunt2019-07-22
| | | | | | | | | | | | Signed-off-by: Peter Hunt <pehunt@redhat.com>
| * | Implement conmon execPeter Hunt2019-07-22
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This includes: Implement exec -i and fix some typos in description of -i docs pass failed runtime status to caller Add resize handling for a terminal connection Customize exec systemd-cgroup slice fix healthcheck fix top add --detach-keys Implement podman-remote exec (jhonce) * Cleanup some orphaned code (jhonce) adapt remote exec for conmon exec (pehunt) Fix healthcheck and exec to match docs Introduce two new OCIRuntime errors to more comprehensively describe situations in which the runtime can error Use these different errors in branching for exit code in healthcheck and exec Set conmon to use new api version Signed-off-by: Jhon Honce <jhonce@redhat.com> Signed-off-by: Peter Hunt <pehunt@redhat.com>
* | Merge pull request #3620 from haircommander/bump-conmonOpenShift Merge Robot2019-07-22
|\ \ | | | | | | use conmon v1.0.0-rc2
| * | bump conmon to 1.0.0-rc2Peter Hunt2019-07-22
| |/ | | | | | | Signed-off-by: Peter Hunt <pehunt@redhat.com>
* | Merge pull request #3598 from vrothberg/update-imageOpenShift Merge Robot2019-07-22
|\ \ | |/ |/| vendor github.com/containers/image@v2.0.1
| * vendor github.com/containers/image@v2.0.1Valentin Rothberg2019-07-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * progress bar: use spinners for unknown blob sizes * use 'containers_image_ostree' as build tag * ostree: default is no OStree support * Add "Env" to ImageInspectInfo * config.go: improve debug message * config.go: log where credentials come from * Fix typo in docs/containers-registries.conf.5.md * docker: delete: support all MIME types * Try harder in storageImageDestination.TryReusingBlob * docker: allow deleting OCI images * ostree: improve error message Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | Merge pull request #3605 from nc-ruth/patch-1OpenShift Merge Robot2019-07-22
|\ \ | | | | | | "mkdir -p /etc/cni/net.d" requires sudo
| * | mkdir -p /etc/cni/net.d requires sudoRubatharisan Thirumathyam2019-07-19
| | | | | | | | | | | | Signed-off-by: Rubatharisan Thirumathyam <ruth@netcompany.com>
* | | Merge pull request #3562 from baude/golangcilint3OpenShift Merge Robot2019-07-22
|\ \ \ | |_|/ |/| | golangci-lint round #3
| * | golangci-lint round #3baude2019-07-21
| | | | | | | | | | | | | | | | | | | | | this is the third round of preparing to use the golangci-lint on our code base. Signed-off-by: baude <bbaude@redhat.com>
* | | Merge pull request #3611 from rhatdan/danOpenShift Merge Robot2019-07-21
|\ \ \ | |/ / |/| | Remove debug message
| * | Remove debug messageDaniel J Walsh2019-07-20
| | | | | | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #3610 from rhatdan/pullmsgOpenShift Merge Robot2019-07-20
|\ \ \ | | | | | | | | Cleanup Pull Message
| * | | Cleanup Pull MessageDaniel J Walsh2019-07-20
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the pull message on failure is UGLY. This patch removes a lot of the noice when pulling an image from multiple registries to make the user experience better. Our current messages are way too verbose and need to be dampened down. Still has verbose mode if you turn on log-level=debug. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #3601 from cevich/fix_post_merge_build_each_commitOpenShift Merge Robot2019-07-20
|\ \ \ | |/ / |/| | Cirrus: Fix post-merge env. var. not set.
| * | Cirrus: Fix post-merge env. var. not set.Chris Evich2019-07-19
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cirrus-CI automatically sets `$CIRRUS_BASE_BRANCH` during PR testing. This is used for the `build_each_commit` task, in order to compute the commit-chain properly. However, prior to this commit and after a PR merges, the post-merge `build_each_commit` task would fail with something similar to: ``` make build-all-new-commits GIT_BASE_BRANCH=origin/$CIRRUS_BASE_BRANCH |& ${TIMESTAMP} [12:28:59] START - All [+xxxx] lines that follow are relative to right now. [+0000s] # Validate that all the commits build on top of origin/ [+0000s] git rebase origin/ -x make [+0000s] fatal: invalid upstream 'origin/' [+0000s] make: *** [Makefile:426: build-all-new-commits] Error 128 [12:28:59] END - [+0000s] total duration since START Exit status: 2 ``` This is because `$CIRRUS_BASE_BRANCH` is undefined when CI runs against a branch (by design). This commit fixes the problem by referring to `$DEST_BRANCH` instead. This variable must always point at the intended destination branch for testing, and so can be used in this context as well. Also updated a few comments to help steer understanding of the `$DEST_BRANCH` purpose. Signed-off-by: Chris Evich <cevich@redhat.com>