summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Revert "Exec: use ErrorConmonRead"Matthew Heon2020-03-09
| | | | | | | | | This reverts commit d3d97a25e8c87cf741b2e24ac01ef84962137106. This does not resolve the issues we expected it would, and has some unexpected side effects with the upcoming exec rework. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* Revert "exec: fix error code when conmon fails"Matthew Heon2020-03-09
| | | | | | | | | This reverts commit 4632b81c81a73025a960e339f40bc805f8a6c70a. We are reverting #5373 as well, which lays the foundation for this commit, so it has to go as well. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* Merge pull request #5424 from vrothberg/homeOpenShift Merge Robot2020-03-09
|\ | | | | use c/storage instead of docker/docker
| * use storage/pkg/ioutilsValentin Rothberg2020-03-09
| | | | | | | | Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
| * use storage/pkg/homedirValentin Rothberg2020-03-09
|/ | | | Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* Merge pull request #5412 from rhatdan/tmpdirOpenShift Merge Robot2020-03-08
|\ | | | | Allow users to set TMPDIR environment
| * Allow users to set TMPDIR environmentDaniel J Walsh2020-03-06
| | | | | | | | | | | | | | Some users have small /var/tmp directories and need to be able to specify a different location for temporary files, which includes more space. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #5395 from cevich/fix_fedora_minimalOpenShift Merge Robot2020-03-08
|\ \ | | | | | | Cirrus: Fix fedora-minimal mirroring
| * | Cirrus: Fix fedora-minimal mirroringChris Evich2020-03-04
| | | | | | | | | | | | | | | | | | | | | Builds of this dockerfile fail on quay.io due to not being able to pull the base image. Use a fully-qualified FROM name to work around this. Signed-off-by: Chris Evich <cevich@redhat.com>
* | | Merge pull request #5407 from rhatdan/codespellOpenShift Merge Robot2020-03-07
|\ \ \ | | | | | | | | Fix spelling mistakes in code found by codespell
| * | | Fix spelling mistakes in code found by codespellDaniel J Walsh2020-03-07
|/ / / | | | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #5374 from baude/createOpenShift Merge Robot2020-03-07
|\ \ \ | | | | | | | | add default network for apiv2 create
| * | | add default network for apiv2 createBrent Baude2020-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | during container creation, if no network is provided, we need to add a default value so the container can be later started. use apiv2 container creation for RunTopContainer instead of an exec to the system podman. RunTopContainer now also returns the container id and an error. added a libpod commit endpoint. also, changed the use of the connections and bindings slightly to make it more convenient to write tests. Fixes: 5366 Signed-off-by: Brent Baude <bbaude@redhat.com>
* | | | Merge pull request #5359 from TomSweeneyRedHat/dev/tsweeney/fixquayOpenShift Merge Robot2020-03-07
|\ \ \ \ | | | | | | | | | | Fix upstream dockerfile and add 'by hand' ctrfile
| * | | | Fix upstream dockerfile and add 'by hand' ctrfileTomSweeneyRedHat2020-03-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The podmanimage/upstream/Dockerfile had two rpms in its build procedure that are no longer available. The atomic-registries has been removed and the md2man has been renamed. In addtion conmon was not being installed and I've added that. I've been using a Containerfile to build or rebuild a specific version of the podmanimage stored in the stable repository with a version tag. As the other Containerfiles have been updated by others, and in case anyone else needs to build it, I've added it to the repo and have also updated the readme.md. FWIW, the builds in the quay.io/podman/upstream have been failing for a while due to missing rpms. Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
* | | | | Merge pull request #5417 from mheon/bump-1.8.1-rc3OpenShift Merge Robot2020-03-06
|\ \ \ \ \ | | | | | | | | | | | | [CI:DOCS] Bump to v1.8.1-RC3
| * | | | | Bump to v1.8.1-devMatthew Heon2020-03-06
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | | | | Bump to v1.8.1-rc3v1.8.1-rc3Matthew Heon2020-03-06
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | | Merge pull request #5410 from st1971/api-fixesOpenShift Merge Robot2020-03-06
|\ \ \ \ \ | | | | | | | | | | | | APIv2: compatible api fixes
| * | | | | Removed extraneous comments and defaults plus amended variable declarationSteve Taylor2020-03-06
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Steve Taylor <steven@taylormuff.co.uk>
| * | | | | Removed the unnecessary codeSteve Taylor2020-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removed defaulting of query.Size amended types.LibpodToContainer, removed hard coded true from inspect call Signed-off-by: Steve Taylor <steven@taylormuff.co.uk>
| * | | | | Implemented size parameter on GetContainerSteve Taylor2020-03-05
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Steve Taylor <steven@taylormuff.co.uk>
| * | | | | Implement size parameter on ListContainersSteve Taylor2020-03-05
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Steve Taylor <steven@taylormuff.co.uk>
| * | | | | Map configured status to created to match docker API statesSteve Taylor2020-03-05
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Steve Taylor <steven@taylormuff.co.uk>
| * | | | | Fix to remove null entry from end of images jsonSteve Taylor2020-03-05
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Steve Taylor <steven@taylormuff.co.uk>
| * | | | | Register handlers without version to align with docker APISteve Taylor2020-03-05
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Steve Taylor <steven@taylormuff.co.uk>
* | | | | | Merge pull request #5415 from mheon/release_notes_181_rc3OpenShift Merge Robot2020-03-06
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | [CI:DOCS] Update release notes for v1.8.1-RC3
| * | | | | Update release notes for v1.8.1-RC3Matthew Heon2020-03-06
| | |_|_|/ | |/| | | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | | Merge pull request #5387 from edsantiago/try_renaming_long_cirrus_jobsOpenShift Merge Robot2020-03-06
|\ \ \ \ \ | | | | | | | | | | | | Rename long cirrus job names
| * | | | | Part 2: try to clean up the long image instance namesEd Santiago2020-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let's try to shorten up fedora-31-libpod-123456789etc to just fedora-31. While we're at it, shorten the window/darwin names too Many many thanks to @fkorotkov for the suggestion to use 'alias' Signed-off-by: Ed Santiago <santiago@redhat.com>
| * | | | | WIP: Try renaming long cirrus job namesEd Santiago2020-03-06
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Basically, add a 'name' tag (remote, local) to each incantation of TEST_REMOTE_CLIENT: true/false I have no idea if this will work or what results it'll produce. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | Merge pull request #5414 from dcbw/cni-0.7.2-snapshotOpenShift Merge Robot2020-03-06
|\ \ \ \ \ | |/ / / / |/| | | | vendor: update github.com/containernetworking/cni to v0.7.2-0.20200304161608-4fae32b84921
| * | | | vendor: update github.com/containernetworking/cni to ↵Dan Williams2020-03-06
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | v0.7.2-0.20200304161608-4fae32b84921 Specifically to get: https://github.com/containernetworking/cni/pull/735 6f29b0165883b2b52ccd4dcb937162ea4c86927b intercept netplugin std err But also pulls in some interface name validation and a compatibility fix for configurations that don't set a CNI version. Signed-off-by: Dan Williams <dcbw@redhat.com>
* | | | Merge pull request #5408 from vrothberg/goimportsOpenShift Merge Robot2020-03-06
|\ \ \ \ | |/ / / |/| | | golangci: enable goimports
| * | | golangci: enable goimportsValentin Rothberg2020-03-05
|/ / / | | | | | | | | | | | | | | | Enable the goimports linter and fix reports. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | Merge pull request #5039 from cevich/fix_gobin_exit_bugOpenShift Merge Robot2020-03-05
|\ \ \ | | | | | | | | Cirrus: Fix gate image & false-positive exits
| * | | Cirrus: Fix gate image & false-positive exitsChris Evich2020-03-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A number of scripts relating to tooling used and the gate container image were not exiting upon errors as intended. Coupled with external service unavailability (i.e. downloading golangci-lint) was observed to cause difficult to debug failures. This change corrects the scripts inside/out of the gate container as well as fixes many golang related path consistency problems vs other CI jobs. After this change, all jobs use consistent path names reducing the number of special-case overrides needed. Lastly, I also made a documentation-pass, updating/correcting as needed, including documenting a likely local validation-failure mode, related to `$EPOCH_TEST_COMMIT`. This is dependent on the developers git environment, so documentation is the only possible "fix". Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | Merge pull request #5400 from vrothberg/systemd-gen-cleanupOpenShift Merge Robot2020-03-05
|\ \ \ \ | |_|/ / |/| | | generate systemd: remove leading slashes
| * | | generate systemd: remove leading slashesValentin Rothberg2020-03-05
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | Remove leading slashes from the run-dir paths. It was meant to make it explicit that we're dealing with an absolute path but user feedback has shown that most are aware. It also cleans up the path in the systemctl status output. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | Merge pull request #5382 from vrothberg/systemd-networkOpenShift Merge Robot2020-03-05
|\ \ \ | | | | | | | | generate systemd: add network dependencies
| * | | generate systemd: add network dependenciesValentin Rothberg2020-03-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add network dependencies to generated systemd services to allow for enabling them at system startup and have a working network if needed. Fixes: #4130 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | Merge pull request #5397 from rhatdan/vendorOpenShift Merge Robot2020-03-05
|\ \ \ \ | | | | | | | | | | Vendor buildah 1.14.2
| * | | | Vendor buildah 1.14.2Daniel J Walsh2020-03-04
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #5396 from haircommander/fix_exec_errorOpenShift Merge Robot2020-03-04
|\ \ \ \ | | | | | | | | | | exec: fix error code when conmon fails
| * | | | exec: fix error code when conmon failsPeter Hunt2020-03-04
| |/ / / | | | | | | | | | | | | | | | | | | | | this is a cosmetic change that makes sure podman returns a sane error code when conmon dies underneath it Signed-off-by: Peter Hunt <pehunt@redhat.com>
* | | | Merge pull request #5389 from openSUSE/fix-image-sign-helpOpenShift Merge Robot2020-03-04
|\ \ \ \ | |/ / / |/| | | Fix podman image sign help output
| * | | Fix podman image sign help outputSascha Grunert2020-03-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust the help output to mention `podman image sign` instead of just `podman sign`. Signed-off-by: Sascha Grunert <sgrunert@suse.com>
* | | | Merge pull request #5381 from vrothberg/ENVFIXOpenShift Merge Robot2020-03-04
|\ \ \ \ | | | | | | | | | | env: set "container" to current binary
| * | | | env: don't set "container" envValentin Rothberg2020-03-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Leave setting the "container" variable to consumers of pkg/env. Podman is now hard-setting it to "podman" while "libpod" will set it internally to "libpod" if it's unset. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | | Merge pull request #5370 from TomSweeneyRedHat/dev/tsweeney/b1141OpenShift Merge Robot2020-03-04
|\ \ \ \ \ | | | | | | | | | | | | Bump to Buildah v1.14.1