Commit graph

4407 commits

Author SHA1 Message Date
OpenShift Merge Robot 5787f88042
Merge pull request #3399 from astronouth7303/patch-1
Add /usr/local/{s,}bin to conmon paths
2019-06-22 12:18:06 +02:00
OpenShift Merge Robot ddba0e6964
Merge pull request #3400 from haircommander/install-hotfix
include make podman target in install instructions
2019-06-22 12:08:06 +02:00
OpenShift Merge Robot d9bdd3c1e0
Merge pull request #3403 from mheon/more_lock_debugging
Add additional debugging when refreshing locks
2019-06-22 04:24:11 +02:00
Matthew Heon c233a12772 Add additional debugging when refreshing locks
Signed-off-by: Matthew Heon <mheon@redhat.com>
2019-06-21 16:00:39 -04:00
Jamie Bliss e2b0587c21 runtime.go: Add /usr/local/{s,}bin
Signed-off-by: Jamie Bliss <jamie@ivyleav.es>
2019-06-21 14:38:29 -04:00
Peter Hunt 3a0d9516ba include make podman target in install instructions
now that podman ships conmon >=0.3.0

Signed-off-by: Peter Hunt <pehunt@redhat.com>
2019-06-21 14:38:25 -04:00
Jamie Bliss 00a7d2067e Add /usr/local/{s,}bin to conmon paths
This is one of the default installation paths in conmon

Signed-off-by: Jamie Bliss <jamie@ivyleav.es>
2019-06-21 14:00:02 -04:00
OpenShift Merge Robot aa21ec158a
Merge pull request #3392 from mheon/missing_periods
Add some missing periods to the readme
2019-06-21 17:11:12 +02:00
OpenShift Merge Robot c0bc768ff1
Merge pull request #3395 from adrianreber/diff
Add --latest, -l to 'podman diff'
2019-06-21 16:15:00 +02:00
OpenShift Merge Robot 7d8aba9248
Merge pull request #3378 from mheon/multiple_runtimes
Begin adding support for multiple OCI runtimes
2019-06-21 14:46:54 +02:00
OpenShift Merge Robot 54920601ae
Merge pull request #3386 from baude/windowsbridge
add windows bridge format
2019-06-21 14:36:55 +02:00
Adrian Reber 1e706a021d
Add --latest, -l to 'podman diff'
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>
2019-06-21 13:37:04 +02:00
OpenShift Merge Robot c3b75b2328
Merge pull request #3393 from openSUSE/werror
Build cgo files with -Wall and -Werror
2019-06-21 12:59:00 +02:00
Sascha Grunert 4bfbc355de
Build cgo files with -Wall -Werror
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>
2019-06-21 10:14:19 +02:00
OpenShift Merge Robot f446ccf0b0
Merge pull request #3379 from openSUSE/rootless-fix
Fix format specifiers in rootless_linux.c
2019-06-21 00:18:24 -07:00
OpenShift Merge Robot 39fdf91ba6
Merge pull request #3385 from mheon/read_only_validate
Make configuration validation not require a DB commit
2019-06-20 18:06:43 -07:00
OpenShift Merge Robot 86826629f7
Merge pull request #3388 from baude/openstackcs
vendor containers/storage v1.12.11
2019-06-20 17:52:57 -07:00
OpenShift Merge Robot 39d6a86195
Merge pull request #3390 from Foxboron/morten/reprobuilds
Support reproducible builds in the Makefile
2019-06-20 17:39:40 -07:00
Matthew Heon 9aeba12d61 Add some missing periods to the readme
Signed-off-by: Matthew Heon <mheon@redhat.com>
2019-06-20 19:56:57 -04:00
Morten Linderud 156ebcbdf9
Support Reproducible Builds by removing build path
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>
2019-06-20 23:25:44 +02:00
Morten Linderud 8f7255657a
Support SOURCE_DATE_EPOCH
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>
2019-06-20 23:25:21 +02:00
Matthew Heon 2ee2404683 Properly initialize container OCI runtime
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>
2019-06-20 16:19:49 -04:00
baude 7e4d75eb8b vendor containers/storage v1.12.11
vendor cs with overlay caching

cs also carries a dep on github.com/DataDog/zstd

Signed-off-by: baude <bbaude@redhat.com>
2019-06-20 15:14:09 -05:00
OpenShift Merge Robot f65ddc0991
Merge pull request #3380 from openSUSE/asprintf-fix
Handle possible asprintf failure in rootless_linux.c
2019-06-20 12:30:27 -07:00
OpenShift Merge Robot afc461c9bd
Merge pull request #3382 from openSUSE/execlp-fix
Fix execvp uage in rootless_linux.c
2019-06-20 12:16:29 -07:00
Matthew Heon df43bfe53d Handle containers whose OCIRuntime fields are paths
Try and locate the right runtime by using the basename of the
path.

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2019-06-20 15:14:28 -04:00
Matthew Heon 7377870641 Properly handle OCI runtime being set to a path
This is done by the --runtime flag, and as such, by all our CI.

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2019-06-20 15:07:46 -04:00
baude 484b4a7c4b add windows bridge format
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>
2019-06-20 13:32:26 -05:00
Matthew Heon a3bcfac461 Make configuration validation not require a DB commit
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>
2019-06-20 14:04:16 -04:00
OpenShift Merge Robot 1fad6b74f2
Merge pull request #3383 from mheon/avoid_commi
Avoid a read-write transaction on DB init
2019-06-20 17:11:09 +02:00
Matthew Heon 0106acbf7e Avoid a read-write transaction on DB init
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>
2019-06-20 10:17:38 -04:00
Sascha Grunert 6e318a01a0
Fix execvp uage in rootless_linux.c
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>
2019-06-20 15:07:01 +02:00
Sascha Grunert fa1b0a2d89
Handle possible asprintf failure in rootless_linux.c
If `asprintf` fails we early exit now.

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2019-06-20 14:52:32 +02:00
OpenShift Merge Robot a1a70ff5e0
Merge pull request #3197 from TomSweeneyRedHat/dev/tsweeney/rootlesstutorial
First pass rootless tutorial
2019-06-20 13:20:29 +02:00
OpenShift Merge Robot 00f266393e
Merge pull request #3356 from giuseppe/system-migrate-add-doc
docs: add note to system migrate
2019-06-20 12:30:23 +02:00
Sascha Grunert 3cf3ccbd77
Fix format specifiers in rootless_linux.c
Format `%d` expects argument of type `int`, but the argument has a type
of `long int`.

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2019-06-20 12:03:04 +02:00
Matthew Heon 3d78085d52 Print container's OCI runtime in inspect
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2019-06-19 17:19:29 -04:00
Matthew Heon fa0e48f21a Make a missing OCI runtime nonfatal
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>
2019-06-19 17:14:15 -04:00
Matthew Heon 92bae8d308 Begin adding support for multiple OCI runtimes
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>
2019-06-19 17:08:43 -04:00
Giuseppe Scrivano 300025359e
docs: add note to system migrate
add a note explaining how it can be used to recreate the rootless user
namespace.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2019-06-19 22:58:37 +02:00
OpenShift Merge Robot b4f9bc868e
Merge pull request #3376 from mheon/fire_the_ci
Minor roadmap adjustment in README
2019-06-19 20:48:11 +02:00
OpenShift Merge Robot e90d769af3
Merge pull request #3375 from haircommander/json-file-hotfix
Spoof json-file logging support
2019-06-19 20:33:00 +02:00
OpenShift Merge Robot 4d470c73ca
Merge pull request #3369 from mheon/add_cached_delegated
Add support for cached, delegated mounts
2019-06-19 20:16:08 +02:00
OpenShift Merge Robot 360adac374
Merge pull request #3366 from edsantiago/test_typo_fixes
fix broken healthcheck tests
2019-06-19 19:34:00 +02:00
OpenShift Merge Robot c60d7ca5d6
Merge pull request #3372 from TomSweeneyRedHat/dev/tsweeney/testpriv
Add RUN with priv'd command build test
2019-06-19 18:51:47 +02:00
Peter Hunt 47e2ad8ec3 Fix documentation for log-driver
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2019-06-19 12:50:05 -04:00
OpenShift Merge Robot c211b3ff6a
Merge pull request #3364 from jwhonce/wip/logrus
Vendor in logrus v1.4.2
2019-06-19 17:36:55 +02:00
Matthew Heon b015c9560a Minor roadmap adjustment in README
Signed-off-by: Matthew Heon <mheon@redhat.com>
2019-06-19 10:42:42 -04:00
OpenShift Merge Robot 7be87f5551
Merge pull request #3078 from cevich/cirrus_f30
Cirrus F30
2019-06-19 16:13:47 +02:00
Peter Hunt 11fbd20f5d Spoof json-file logging support
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>
2019-06-19 10:13:41 -04:00