Commit graph

4431 commits

Author SHA1 Message Date
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
Matthew Heon 30f24bb760 Add tests for cached and delegated mounts
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2019-06-19 09:57:33 -04:00
OpenShift Merge Robot 589b12dbc9
Merge pull request #3365 from eriksjolund/documentation_fix_example_in_oci-hooks.5.md
Fix example in oci-hooks.5.md
2019-06-19 13:53:38 +02:00
Jhon Honce d0d9a4c9b1 Vendor in logrus v1.4.2
Fixes #3346

Signed-off-by: Jhon Honce <jhonce@redhat.com>
2019-06-18 17:37:53 -07:00
OpenShift Merge Robot 240b84620e
Merge pull request #3371 from mheon/bump-1.4.2
Bump to v1.4.2
2019-06-19 02:26:27 +02:00
root 7eda299e91 Add RUN with priv'd command build test
Update build test to include test for RUN with a priv'd command.

Signed-off-by: TomSweeneyRedHat  <tsweeney@redhat.com>
2019-06-18 19:34:14 -04:00
Matthew Heon 6a9d2c0991 Bump gitvalidation epoch
Signed-off-by: Matthew Heon <mheon@redhat.com>
2019-06-18 19:27:19 -04:00
Matthew Heon c225934726 Bump to v1.4.3-dev
Signed-off-by: Matthew Heon <mheon@redhat.com>
2019-06-18 19:27:19 -04:00
Matthew Heon 9b6a98cfd7 Bump to v1.4.2
Signed-off-by: Matthew Heon <mheon@redhat.com>
2019-06-18 19:27:15 -04:00
OpenShift Merge Robot 5df8178c99
Merge pull request #3370 from mheon/release_notes_1.4.2
Update release notes for Podman 1.4.2
2019-06-19 01:13:29 +02:00
OpenShift Merge Robot df9e3aa3dc
Merge pull request #3357 from mairin/master
replacing podman logo SVG and PNG files
2019-06-18 23:49:02 +02:00
OpenShift Merge Robot af0a64ba8b
Merge pull request #3361 from TomSweeneyRedHat/dev/tsweeney/vendorbuildah1.9
Bump Buildah to v1.9.0
2019-06-18 23:37:07 +02:00
OpenShift Merge Robot f9bb91268d
Merge pull request #3360 from baude/fixporttesttiming
fix port -l timing with healthchecks
2019-06-18 23:21:03 +02:00
Matthew Heon 8eb7888868 Update release notes for Podman 1.4.2
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2019-06-18 17:14:29 -04:00
OpenShift Merge Robot 9dd9705c2f
Merge pull request #3358 from mheon/use_disk_spec
Swap to using the on-disk spec for inspect mounts
2019-06-18 23:10:06 +02:00
Ed Santiago 40eb0453ad fix broken healthcheck tests
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>
2019-06-18 15:07:53 -06:00
Matthew Heon 8e5b294ac3 Allow (but ignore) Cached and Delegated volume options
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>
2019-06-18 17:02:20 -04:00
OpenShift Merge Robot 3cabd81045
Merge pull request #3352 from mheon/inspect_config_to_libpod
Move the Config portion of Inspect into libpod
2019-06-18 20:34:30 +02:00
Máirín Duffy 1eb3466afa updating podman logo files
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>
2019-06-18 13:02:53 -04:00
Erik Sjölund 5c5262a24c
Fix example in oci-hooks.5.md
Signed-off-by: Erik Sjölund <erik.sjolund@gmail.com>
2019-06-18 18:43:21 +02:00
OpenShift Merge Robot 1c6e4dc6bb
Merge pull request #3354 from dankohn/patch-1
Replace podman.svg
2019-06-18 17:47:53 +02:00
Brent Baude d87cb1a5f9 fix port -l timing with healthchecks
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>
2019-06-18 10:43:53 -05:00
TomSweeneyRedHat e22f91bd28 Bump Buildah to v1.9.0
Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
2019-06-18 11:27:18 -04:00
Matthew Heon dc4d20b573 Swap to using the on-disk spec for inspect mounts
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>
2019-06-18 09:38:01 -04:00
OpenShift Merge Robot 265d55edbf
Merge pull request #3355 from giuseppe/fix-typos
cmd, docs, test: fix some typos
2019-06-18 15:32:07 +02:00
Dan Kohn a828a0d134 Replace podman.svg; closes #3350
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>
2019-06-18 06:53:04 -04:00
Giuseppe Scrivano 292a48cab4
cmd, docs, test: fix some typos
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2019-06-18 10:52:19 +02:00
OpenShift Merge Robot 8bcfd24397
Merge pull request #3338 from jwhonce/issue/3299
Add remote client log to file
2019-06-18 01:03:38 +02:00