summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Add some missing periods to the readmeMatthew Heon2019-06-20
| | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
* Merge pull request #3197 from TomSweeneyRedHat/dev/tsweeney/rootlesstutorialOpenShift Merge Robot2019-06-20
|\ | | | | First pass rootless tutorial
| * First pass rootless tutorialTomSweeneyRedHat2019-06-17
| | | | | | | | | | | | | | First pass of the rootless tutorial. This may be come the basis for a User Guide of the same. Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
* | Merge pull request #3356 from giuseppe/system-migrate-add-docOpenShift Merge Robot2019-06-20
|\ \ | | | | | | docs: add note to system migrate
| * | docs: add note to system migrateGiuseppe Scrivano2019-06-19
| | | | | | | | | | | | | | | | | | | | | add a note explaining how it can be used to recreate the rootless user namespace. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | Merge pull request #3376 from mheon/fire_the_ciOpenShift Merge Robot2019-06-19
|\ \ \ | | | | | | | | Minor roadmap adjustment in README
| * | | Minor roadmap adjustment in READMEMatthew Heon2019-06-19
| | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | | Merge pull request #3375 from haircommander/json-file-hotfixOpenShift Merge Robot2019-06-19
|\ \ \ \ | | | | | | | | | | Spoof json-file logging support
| * | | | Fix documentation for log-driverPeter Hunt2019-06-19
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Peter Hunt <pehunt@redhat.com>
| * | | | Spoof json-file logging supportPeter Hunt2019-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For docker scripting compatibility, allow for json-file logging when creating args for conmon. That way, when json-file is supported, that case can be easily removed. Signed-off-by: Peter Hunt <pehunt@redhat.com>
* | | | | Merge pull request #3369 from mheon/add_cached_delegatedOpenShift Merge Robot2019-06-19
|\ \ \ \ \ | | | | | | | | | | | | Add support for cached, delegated mounts
| * | | | | Add tests for cached and delegated mountsMatthew Heon2019-06-19
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | | | | Allow (but ignore) Cached and Delegated volume optionsMatthew Heon2019-06-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are only used on OS X Docker, and ignored elsewhere - but since they are ignored, they're guaranteed to be safe everywhere, and people are using them. Fixes: #3340 Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | | | Merge pull request #3366 from edsantiago/test_typo_fixesOpenShift Merge Robot2019-06-19
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix broken healthcheck tests
| * | | | | | fix broken healthcheck testsEd Santiago2019-06-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Four of the healthcheck tests were completely broken. They were written with the option '--healthcheck-cmd' which is not an option (it should be '--healthcheck-command', with 'command' as a full word). The tests were merely checking exit code, not error message, so of course they failed. I have fixed the command line and added checks for the expected diagnostic. (Side note: do not write tests that check exit code but nothing else. This should not need to be said). One of the four tests was invalid: --healthcheck-interval 0.5s. Per Brent: initially i was going to restrict sub one-second intervals That test has been removed. It would probably be a good idea for a future PR to add some validation such as preventing negative values, but that's left as an exercise for later. Also: grammar fix in an error message. Caught by my ginkgo log greasemonkey script, which highlights 'Error' messages and grabbed my attention. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | | | Merge pull request #3372 from TomSweeneyRedHat/dev/tsweeney/testprivOpenShift Merge Robot2019-06-19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add RUN with priv'd command build test
| * | | | | | | Add RUN with priv'd command build testroot2019-06-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update build test to include test for RUN with a priv'd command. Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
* | | | | | | | Merge pull request #3364 from jwhonce/wip/logrusOpenShift Merge Robot2019-06-19
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | Vendor in logrus v1.4.2
| * | | | | | | Vendor in logrus v1.4.2Jhon Honce2019-06-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #3346 Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | | | | | | Merge pull request #3078 from cevich/cirrus_f30OpenShift Merge Robot2019-06-19
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | Cirrus F30
| * | | | | | | Cirrus: Fix F30 ssh guaranteeChris Evich2019-06-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original solution using --wait does not function on F30, waiting forever. Replace it with a simple 5-minute timeout loop. Signed-off-by: Chris Evich <cevich@redhat.com>
| * | | | | | | Cirrus: Add support for testing F30Chris Evich2019-06-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove disused `build_cache_images` task, and update relevant dockerfiles for F30. Fix problem of cloud-init failing to expand root-device on boot (/var/lib/cloud/instance left in improper state). Fix problem of cloud-init racing with google-network-daemon.service on boot (looking for cloudconfig metadata too early). Causing root-device to _sometimes_ fail to expand. Fix problem of hack/get_ci_vm.sh argument passing. Signed-off-by: Chris Evich <cevich@redhat.com>
| * | | | | | | Bump gate-container up to F30Chris Evich2019-06-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | | | | | Merge pull request #3365 from ↵OpenShift Merge Robot2019-06-19
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eriksjolund/documentation_fix_example_in_oci-hooks.5.md Fix example in oci-hooks.5.md
| * | | | | | | | Fix example in oci-hooks.5.mdErik Sjölund2019-06-18
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Erik Sjölund <erik.sjolund@gmail.com>
* | | | | | | | Merge pull request #3371 from mheon/bump-1.4.2OpenShift Merge Robot2019-06-19
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Bump to v1.4.2
| * | | | | | | Bump gitvalidation epochMatthew Heon2019-06-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
| * | | | | | | Bump to v1.4.3-devMatthew Heon2019-06-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
| * | | | | | | Bump to v1.4.2v1.4.2Matthew Heon2019-06-18
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | | | | | Merge pull request #3370 from mheon/release_notes_1.4.2OpenShift Merge Robot2019-06-19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Update release notes for Podman 1.4.2
| * | | | | | | Update release notes for Podman 1.4.2Matthew Heon2019-06-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | | | | | Merge pull request #3357 from mairin/masterOpenShift Merge Robot2019-06-18
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | replacing podman logo SVG and PNG files
| * | | | | | | | updating podman logo filesMáirín Duffy2019-06-18
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | converts text to paths so correct logo display doesn't require Montserrat font to be installed; also updates PNG to accurately reflect logo type design to match other container project logos. addresses #3350 Signed-off-by: Máirín Duffy <duffy@redhat.com>
* | | | | | | | Merge pull request #3361 from TomSweeneyRedHat/dev/tsweeney/vendorbuildah1.9OpenShift Merge Robot2019-06-18
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Bump Buildah to v1.9.0
| * | | | | | | | Bump Buildah to v1.9.0TomSweeneyRedHat2019-06-18
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
* | | | | | | | Merge pull request #3360 from baude/fixporttesttimingOpenShift Merge Robot2019-06-18
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | fix port -l timing with healthchecks
| * | | | | | | | fix port -l timing with healthchecksBrent Baude2019-06-18
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | many of the port tests use our nginx container image. in some cases, we have timing issues between when the nginx and the container are running and when the port -l command is run causing test flakes. we now use the container image's built in healthcheck to ensure that nginx is running (and subsequently the container itself) before running the port command. Fixes: #3309 Signed-off-by: Brent Baude <bbaude@redhat.com> Signed-off-by: baude <bbaude@redhat.com>
* | | | | | | | Merge pull request #3358 from mheon/use_disk_specOpenShift Merge Robot2019-06-18
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Swap to using the on-disk spec for inspect mounts
| * | | | | | | Swap to using the on-disk spec for inspect mountsMatthew Heon2019-06-18
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When available, using the on-disk spec will show full mount options in use when the container is running, which can differ from mount options provided in the original spec - on generating the final spec, for example, we ensure that some form of root propagation is set. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | | | | Merge pull request #3352 from mheon/inspect_config_to_libpodOpenShift Merge Robot2019-06-18
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Move the Config portion of Inspect into libpod
| * | | | | | Move the Config portion of Inspect into libpodMatthew Heon2019-06-17
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While we're at it, rewrite how we populate it. There were several potential segfaults in the optional spec.Process block, and a few fields not being populated correctly versus 'docker inspect'. Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | | | | Merge pull request #3354 from dankohn/patch-1OpenShift Merge Robot2019-06-18
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Replace podman.svg
| * | | | | Replace podman.svg; closes #3350Dan Kohn2019-06-18
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On a computer that doesn't have the font Montserrat installed, the old SVG won't render correctly. We converted the font text to be objects so that it renders correctly on all computers. See https://github.com/cncf/landscape#proper-svgs. Delete returns Signed-off-by: Dan Kohn <dan@dankohn.com>
* | | | | Merge pull request #3355 from giuseppe/fix-typosOpenShift Merge Robot2019-06-18
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | cmd, docs, test: fix some typos
| * | | cmd, docs, test: fix some typosGiuseppe Scrivano2019-06-18
|/ / / | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | Merge pull request #3338 from jwhonce/issue/3299OpenShift Merge Robot2019-06-18
|\ \ \ | | | | | | | | Add remote client log to file
| * | | Add remote client logging to a fileJhon Honce2019-06-17
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Logging messages from the dependency libraries should not log onto the screen when using the remote client. This patch writes logging to ~/.config/containers/podman-remote.log Fixes #3299 Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | Merge pull request #2947 from edsantiago/bats_in_cirrusOpenShift Merge Robot2019-06-17
|\ \ \ | | | | | | | | run BATS tests in Cirrus
| * | | run BATS tests in CirrusEd Santiago2019-06-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm running the BATS tests manually once in a while, and catching several problems each week that make it past the rest of CI. Since the BATS tests run at RPM gating time, we need to catch problems earlier. Try running the tests from Cirrus. Tests will be skipped on Ubuntu due to a too-ancient version of coreutils (8.28; the 'timeout -v' we use requires 8.29). Tests are run *after* integration tests, even though these take three minutes and would be nice to have fail quickly, because running before causes bizarre CI failures. Shrug. UPDATE: also fix run test, broken by #3311. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | Merge pull request #3257 from weirdwiz/loadOpenShift Merge Robot2019-06-17
|\ \ \ \ | |/ / / |/| | | Add warning while untagging an image podman-load