Commit graph

4349 commits

Author SHA1 Message Date
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
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
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
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
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
OpenShift Merge Robot e639a8fa3b
Merge pull request #2947 from edsantiago/bats_in_cirrus
run BATS tests in Cirrus
2019-06-17 22:51:23 +02:00
OpenShift Merge Robot 6ee0f3e99f
Merge pull request #3257 from weirdwiz/load
Add warning while untagging an image podman-load
2019-06-17 22:14:26 +02:00
Ed Santiago d6f436204f run BATS tests in Cirrus
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>
2019-06-17 13:41:14 -06:00
OpenShift Merge Robot 058c93f850
Merge pull request #3308 from cevich/always_collect_logs
Cirrus: Simplify log collection commands
2019-06-17 21:38:25 +02:00
Matthew Heon 33b71944c0 Move the Config portion of Inspect into libpod
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>
2019-06-17 15:36:55 -04:00
OpenShift Merge Robot bce4a93575
Merge pull request #3297 from rhatdan/systemd
Accidently removed /run/lock from systemd mounts
2019-06-17 21:26:33 +02:00
OpenShift Merge Robot 7d0e77de94
Merge pull request #3296 from arkamar/typos
Fix some typos in few *.md files
2019-06-17 21:26:25 +02:00
Jhon Honce 0003be1e0e Add remote client logging to a file
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>
2019-06-17 08:01:39 -07:00
OpenShift Merge Robot 54b9c95005
Merge pull request #3349 from sshnaidm/master
Fix subgidname option in docs for podman run
2019-06-17 16:03:12 +02:00
OpenShift Merge Robot 877c7aae75
Merge pull request #3347 from giuseppe/add-test-for-logs-f
test: add test for logs -f
2019-06-17 15:47:52 +02:00
OpenShift Merge Robot 29be1764b4
Merge pull request #3348 from vrothberg/kill-error
kill: print ID and state for non-running containers
2019-06-17 15:31:51 +02:00
Sagi Shnaidman 0d341170d5 Fix subgidname option in docs for podman run
Signed-off-by: Sagi Shnaidman <sshnaidm@redhat.com>
2019-06-17 15:48:29 +03:00
Valentin Rothberg 04858a218f stop/kill: inproper state errors: s/in state/is in state/
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2019-06-17 14:31:55 +02:00
Giuseppe Scrivano 6b7649e4ba
test: add test for logs -f
discussion here:
https://github.com/containers/libpod/issues/3325#issuecomment-502214492

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2019-06-17 11:04:34 +02:00
Valentin Rothberg 0f75410e1c kill: print ID and state for non-running containers
Extend kill's error message to include the container's ID and state.
This address cases where error messages caused by other containers
may confuse users.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2019-06-17 10:55:54 +02:00
Petr Vaněk 3db5cd67d4 API.md: fix few typos
Appropriate changes were applied to the file
cmd/podman/varlink/io.podman.varlink, in order to make changes in API.md
persistent.

Signed-off-by: Petr Vaněk <arkamar@atlas.cz>
2019-06-15 23:07:46 +02:00
Petr Vaněk 7ae56aab46 docs/podamn.1.md: fix typo: remove double the
Signed-off-by: Petr Vaněk <arkamar@atlas.cz>
2019-06-15 23:07:12 +02:00
Petr Vaněk d1326a89a8 CONTRIBUTING.md: fix typo
Signed-off-by: Petr Vaněk <arkamar@atlas.cz>
2019-06-15 23:05:02 +02:00
OpenShift Merge Robot 670fc03088
Merge pull request #3094 from QiWang19/cpvol
podman copy  files to the volume with a container
2019-06-15 12:48:54 +02:00
OpenShift Merge Robot b82c4e9384
Merge pull request #3278 from llchan/improve-prefix-handling
Improve DESTDIR/PREFIX/ETCDIR handling
2019-06-15 12:37:54 +02:00
OpenShift Merge Robot 878be6d505
Merge pull request #3336 from TomSweeneyRedHat/dev/tsweeney/fixdoc
Change container command to contained
2019-06-15 11:53:54 +02:00
Lawrence Chan 7baa6b6266 Remove unnecessary var type to fix lint warning
Signed-off-by: Lawrence Chan <element103@gmail.com>
2019-06-14 17:42:05 -05:00
Lawrence Chan 373048aaca Move installPrefix and etcDir into runtime.go
Signed-off-by: Lawrence Chan <element103@gmail.com>
2019-06-14 17:42:05 -05:00
Lawrence Chan 6ea12e3028 Improve DESTDIR/PREFIX/ETCDIR handling
- PREFIX is now passed saved in the binary at build-time so that default
  paths match installation paths.
- ETCDIR is also overridable in a similar way.
- DESTDIR is now applied on top of PREFIX for install/uninstall steps.
  Previously, a DESTDIR=/foo PREFIX=/bar make would install into /bar,
  rather than /foo/bar.

Signed-off-by: Lawrence Chan <element103@gmail.com>
2019-06-14 17:42:05 -05:00
Matthew Heon 185b413e3d
Merge pull request #3339 from mheon/bump-1.4.1
Bump to v1.4.1
2019-06-14 18:20:30 -04:00
Matthew Heon 0cc87f28ec Bump gitvalidation epoch
Signed-off-by: Matthew Heon <mheon@redhat.com>
2019-06-14 18:19:30 -04:00
Matthew Heon e0db4690aa Bump to v1.4.2-dev
Signed-off-by: Matthew Heon <mheon@redhat.com>
2019-06-14 18:19:30 -04:00