summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #3392 from mheon/missing_periodsOpenShift Merge Robot2019-06-21
|\ | | | | Add some missing periods to the readme
| * Add some missing periods to the readmeMatthew Heon2019-06-20
| | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
* | Merge pull request #3395 from adrianreber/diffOpenShift Merge Robot2019-06-21
|\ \ | | | | | | Add --latest, -l to 'podman diff'
| * | Add --latest, -l to 'podman diff'Adrian Reber2019-06-21
| | | | | | | | | | | | | | | | | | | | | | | | The man page of 'podman diff' claims that the diff sub-command knows about --latest, -l. This adds support, as described in the man-page, to the diff sub-command for --latest, -l. Signed-off-by: Adrian Reber <areber@redhat.com>
* | | Merge pull request #3378 from mheon/multiple_runtimesOpenShift Merge Robot2019-06-21
|\ \ \ | | | | | | | | Begin adding support for multiple OCI runtimes
| * | | Properly initialize container OCI runtimeMatthew Heon2019-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use name of the default runtime, instead of the OCIRuntime config option, which may include a full path. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | | Handle containers whose OCIRuntime fields are pathsMatthew Heon2019-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Try and locate the right runtime by using the basename of the path. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | | Properly handle OCI runtime being set to a pathMatthew Heon2019-06-20
| | | | | | | | | | | | | | | | | | | | | | | | This is done by the --runtime flag, and as such, by all our CI. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | | Print container's OCI runtime in `inspect`Matthew Heon2019-06-19
| | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | | Make a missing OCI runtime nonfatalMatthew Heon2019-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We may want to ship configurations including more than one runtime configuration - for example, crun and runc and kata, all configured. However, we don't want to make these extra runtimes hard requirements, so let's not fatally error when we can't find their executables. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | | Begin adding support for multiple OCI runtimesMatthew Heon2019-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow Podman containers to request to use a specific OCI runtime if multiple runtimes are configured. This is the first step to properly supporting containers in a multi-runtime environment. The biggest changes are that all OCI runtimes are now initialized when Podman creates its runtime, and containers now use the runtime requested in their configuration (instead of always the default runtime). Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | Merge pull request #3386 from baude/windowsbridgeOpenShift Merge Robot2019-06-21
|\ \ \ \ | | | | | | | | | | add windows bridge format
| * | | | add windows bridge formatbaude2019-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when using podman-remote on windows, the bridge format must account for how windows deals with escape quoting. in this case, it does not need any. also, reduced duplicated code around generating the bridge endpoint for the unix and windows platforms. Signed-off-by: baude <bbaude@redhat.com>
* | | | | Merge pull request #3393 from openSUSE/werrorOpenShift Merge Robot2019-06-21
|\ \ \ \ \ | |_|_|/ / |/| | | | Build cgo files with -Wall and -Werror
| * | | | Build cgo files with -Wall -WerrorSascha Grunert2019-06-21
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | To avoid unnecessary warnings and errors in the future I'd like to propose building all cgo related sources with `-Wall -Werror`. This commit fixes some warnings which came up in `shm_lock.c`, too. Signed-off-by: Sascha Grunert <sgrunert@suse.com>
* | | | Merge pull request #3379 from openSUSE/rootless-fixOpenShift Merge Robot2019-06-21
|\ \ \ \ | | | | | | | | | | Fix format specifiers in rootless_linux.c
| * | | | Fix format specifiers in rootless_linux.cSascha Grunert2019-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Format `%d` expects argument of type `int`, but the argument has a type of `long int`. Signed-off-by: Sascha Grunert <sgrunert@suse.com>
* | | | | Merge pull request #3385 from mheon/read_only_validateOpenShift Merge Robot2019-06-20
|\ \ \ \ \ | | | | | | | | | | | | Make configuration validation not require a DB commit
| * | | | | Make configuration validation not require a DB commitMatthew Heon2019-06-20
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | If there are missing fields, we still require a commit, but that should not happen often. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | | Merge pull request #3388 from baude/openstackcsOpenShift Merge Robot2019-06-20
|\ \ \ \ \ | | | | | | | | | | | | vendor containers/storage v1.12.11
| * | | | | vendor containers/storage v1.12.11baude2019-06-20
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vendor cs with overlay caching cs also carries a dep on github.com/DataDog/zstd Signed-off-by: baude <bbaude@redhat.com>
* | | | | Merge pull request #3390 from Foxboron/morten/reprobuildsOpenShift Merge Robot2019-06-20
|\ \ \ \ \ | | | | | | | | | | | | Support reproducible builds in the Makefile
| * | | | | Support Reproducible Builds by removing build pathMorten Linderud2019-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An issue for achieving reproducible builds is build artifacts where build paths are embedded. We remove them by passing the current working directory to -gcflags and -asmflags which prefix trims the paths. Note: Go 1.13 includes `-trimpath` https://reproducible-builds.org/docs/build-path/ Signed-off-by: Morten Linderud <morten@linderud.pw>
| * | | | | Support SOURCE_DATE_EPOCHMorten Linderud2019-06-20
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build artifacts embeds the current date of the build into the artifact. If anyone want to reproduce the software at a later date there is no way to pass a recorded date or fake it in the build system at a later point. https://reproducible-builds.org/docs/source-date-epoch/ Signed-off-by: Morten Linderud <morten@linderud.pw>
* | | | | Merge pull request #3380 from openSUSE/asprintf-fixOpenShift Merge Robot2019-06-20
|\ \ \ \ \ | | | | | | | | | | | | Handle possible asprintf failure in rootless_linux.c
| * | | | | Handle possible asprintf failure in rootless_linux.cSascha Grunert2019-06-20
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | If `asprintf` fails we early exit now. Signed-off-by: Sascha Grunert <sgrunert@suse.com>
* | | | | Merge pull request #3382 from openSUSE/execlp-fixOpenShift Merge Robot2019-06-20
|\ \ \ \ \ | |_|/ / / |/| | | | Fix execvp uage in rootless_linux.c
| * | | | Fix execvp uage in rootless_linux.cSascha Grunert2019-06-20
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | The second argument of `execlp` should be of type `char *`, so we need to add an additional argument there. Signed-off-by: Sascha Grunert <sgrunert@suse.com>
* | | | Merge pull request #3383 from mheon/avoid_commiOpenShift Merge Robot2019-06-20
|\ \ \ \ | |_|_|/ |/| | | Avoid a read-write transaction on DB init
| * | | Avoid a read-write transaction on DB initMatthew Heon2019-06-20
|/ / / | | | | | | | | | | | | | | | | | | | | | Instead, use a less expensive read-only transaction to see if the DB is ready for use (it probably is), and only fire the expensive RW transaction if absolutely necessary. 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>