summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #3401 from mheon/templating_is_dumbOpenShift Merge Robot2019-06-25
|\ | | | | Fix inspect --format '{{.Mounts}}.
| * Support aliases for .Src and .Dst in inspect .MountsMatthew Heon2019-06-24
| | | | | | | | | | | | | | | | | | | | This provides backwards compatability with 1.4.0-1.4.2 releases which name .Source and .Destination as .Src and .Dst - useful for not breaking toolbox. Also add a test. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * Fix gofmtMatthew Heon2019-06-21
| | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
| * Adjust names to match struct tags in InspectMatthew Heon2019-06-21
| | | | | | | | | | | | | | | | In Go templating, we use the names of fields, not the JSON struct tags. To ensure templating works are expected, we need the two to match. Signed-off-by: Matthew Heon <mheon@redhat.com>
| * Fix inspect --format '{{.Mounts}}.Matthew Heon2019-06-21
| | | | | | | | | | | | | | | | Go templating is incapable of dealing with pointers, so when we moved to Docker compatible mounts JSON, we broke it. The solution is to not use pointers in this part of inspect. Signed-off-by: Matthew Heon <mheon@redhat.com>
* | Merge pull request #3391 from QiWang19/cp_fileOpenShift Merge Robot2019-06-24
|\ \ | | | | | | fix bug creats directory copying file
| * | fix bug creats directory copying fileQi Wang2019-06-20
| | | | | | | | | | | | | | | | | | close #3384 Signed-off-by: Qi Wang <qiwan@redhat.com>
* | | Merge pull request #3412 from mheon/fix_ps_sync_segfaultOpenShift Merge Robot2019-06-24
|\ \ \ | | | | | | | | Fix a segfault in 'podman ps --sync'
| * | | Fix a segfault in 'podman ps --sync'Matthew Heon2019-06-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We weren't properly populating the container's OCI Runtime in Batch(), causing segfaults on attempting to access it. Add a test to make sure we actually catch cases like this in the future. Fixes #3411 Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | Merge pull request #3414 from vrothberg/go-modulesOpenShift Merge Robot2019-06-24
|\ \ \ \ | | | | | | | | | | Go modules
| * | | | migrate to go-modulesValentin Rothberg2019-06-24
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
| * | | | Makefile: add go-get functionValentin Rothberg2019-06-24
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Add a `go-get` function to the Makefile to wrap `go get -u` into a wrapper disabling go modules. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | Merge pull request #3398 from haircommander/conmon-hotfixOpenShift Merge Robot2019-06-24
|\ \ \ \ | | | | | | | | | | Update conmon to include attach socket unlink
| * | | | update cirrus imagePeter Hunt2019-06-21
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Peter Hunt <pehunt@redhat.com>
| * | | | Update conmon to include attach socket unlinkPeter Hunt2019-06-21
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Peter Hunt <pehunt@redhat.com>
* | | | | Merge pull request #3406 from giuseppe/slirp-entry-to-hostsOpenShift Merge Robot2019-06-24
|\ \ \ \ \ | |_|/ / / |/| | | | rootless: add an entry to /etc/hosts when using slirp4netns
| * | | | rootless: add an entry to /etc/hosts when using slirp4netnsGiuseppe Scrivano2019-06-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes: https://github.com/containers/libpod/issues/3405 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | Merge pull request #3404 from QazerLab/docs/rootless-tutorialOpenShift Merge Robot2019-06-23
|\ \ \ \ \ | | | | | | | | | | | | Fix configs location in rootless tutorial.
| * | | | | Fix configs location in rootless tutorial.Danila Kiver2019-06-22
| | |_|_|/ | |/| | | | | | | | | | | | | Signed-off-by: Danila Kiver <danila.kiver@mail.ru>
* | | | | Merge pull request #3409 from giuseppe/add-crunOpenShift Merge Robot2019-06-23
|\ \ \ \ \ | |_|/ / / |/| | | | libpod.conf: add runtime crun
| * | | | libpod.conf: add runtime crunGiuseppe Scrivano2019-06-22
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | now that crun is available as a Fedora package, we can add an entry to the default libpod.conf so that it is easier to use it just by using --runtime crun to Podman. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | Merge pull request #3399 from astronouth7303/patch-1OpenShift Merge Robot2019-06-22
|\ \ \ \ | | | | | | | | | | Add /usr/local/{s,}bin to conmon paths
| * | | | runtime.go: Add /usr/local/{s,}binJamie Bliss2019-06-21
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jamie Bliss <jamie@ivyleav.es>
| * | | | Add /usr/local/{s,}bin to conmon pathsJamie Bliss2019-06-21
| |/ / / | | | | | | | | | | | | | | | | | | | | This is one of the default installation paths in conmon Signed-off-by: Jamie Bliss <jamie@ivyleav.es>
* | | | Merge pull request #3400 from haircommander/install-hotfixOpenShift Merge Robot2019-06-22
|\ \ \ \ | | | | | | | | | | include make podman target in install instructions
| * | | | include make podman target in install instructionsPeter Hunt2019-06-21
| | |/ / | |/| | | | | | | | | | | | | | | | | | now that podman ships conmon >=0.3.0 Signed-off-by: Peter Hunt <pehunt@redhat.com>
* | | | Merge pull request #3403 from mheon/more_lock_debuggingOpenShift Merge Robot2019-06-22
|\ \ \ \ | |_|/ / |/| | | Add additional debugging when refreshing locks
| * | | Add additional debugging when refreshing locksMatthew Heon2019-06-21
|/ / / | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | 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
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-06 11:18:32 +0000