4310 Commits

Author SHA1 Message Date
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
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
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
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
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
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
b82c4e9384 Merge pull request #3278 from llchan/improve-prefix-handling
Improve DESTDIR/PREFIX/ETCDIR handling
2019-06-15 12:37:54 +02:00
878be6d505 Merge pull request #3336 from TomSweeneyRedHat/dev/tsweeney/fixdoc
Change container command to contained
2019-06-15 11:53:54 +02:00
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
373048aaca Move installPrefix and etcDir into runtime.go
Signed-off-by: Lawrence Chan <element103@gmail.com>
2019-06-14 17:42:05 -05:00
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
185b413e3d Merge pull request #3339 from mheon/bump-1.4.1
Bump to v1.4.1
2019-06-14 18:20:30 -04:00
0cc87f28ec Bump gitvalidation epoch
Signed-off-by: Matthew Heon <mheon@redhat.com>
2019-06-14 18:19:30 -04:00
e0db4690aa Bump to v1.4.2-dev
Signed-off-by: Matthew Heon <mheon@redhat.com>
2019-06-14 18:19:30 -04:00
c4b52f47ba Bump to v1.4.1
Signed-off-by: Matthew Heon <mheon@redhat.com>
v1.4.1
2019-06-14 18:19:25 -04:00
90e3c9002b Merge pull request #3328 from mheon/storage_opts_for_cleanup
When creating exit command, pass storage options on
2019-06-15 00:18:53 +02:00
cba622b609 Merge pull request #3337 from mheon/release_notes_1.4.1
Update release notes for 1.4.1
2019-06-14 23:21:54 +02:00
aa2992dec6 Merge pull request #3330 from mheon/remote_storage
Add --storage flag to 'podman rm' (local only)
2019-06-14 22:54:56 +02:00
c866e441d0 Completely disable global options test
We need to cut a release. We can investigate further next week.

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2019-06-14 16:33:22 -04:00
5b429ecda6 Update release notes for 1.4.1
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2019-06-14 15:53:37 -04:00
4a450d55d9 Merge pull request #3334 from vrothberg/fix-3331
pkg/apparmor: fix when AA is disabled
2019-06-14 21:24:53 +02:00
2abde1059c Skip runlabel global options test for podman-in-podman
This is failing 100% on CI. No time to debug why properly before
we need to cut a release, but is probably related to the change
from a slice to an array.

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2019-06-14 15:21:46 -04:00
b7cbf93336 Change container command to contained
A quick follow up to #3306 to touch up two more
'container command' to 'contained command' to match the
rest of the doc suite.

Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
2019-06-14 13:51:17 -04:00
4c849a79ea Merge pull request #3333 from jordemort/podman-commit-env-fix
Fix ENV parsing on `podman import`
2019-06-14 19:31:02 +02:00
1ac8307ae4 Merge pull request #3306 from rhatdan/exit
Document exit codes for podman exec
2019-06-14 18:05:56 +02:00
5341ce802e Merge pull request #3252 from mtrmac/registries.conf-mirrors
Update containers/image to v2.0.0, and buildah to v1.8.4
2019-06-14 17:42:55 +02:00
e611176760 pkg/apparmor: fix when AA is disabled
Do not try to load the default profile when AppArmor is disabled on the
host.

Fixes: #3331
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2019-06-14 17:37:16 +02:00
d2d57517d7 Fix ENV parsing on podman import
Signed-off-by: Jordan Webb <jordemort@github.com>
2019-06-14 09:43:36 -05:00
74691738aa Fix storage-opts type in Cobra
StringSliceVar was distorting options. StringArrayVar seems to
not mangle them, so use that instead.

Thanks to Giuseppe for finding this one.

Signed-off-by: Matthew Heon <mheon@redhat.com>
2019-06-14 09:46:19 -04:00
2be01ea4fb Use the logical registry location instead of the physical one in (podman info)
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2019-06-14 15:46:17 +02:00
5fde3361da Update containers/image to v2.0.0, and buildah to v1.8.4
In c/image, this adds the the mirror-by-digest-only option to mirrors, and
moves the search order to an independent list.

A synchronized buildah update is necessary to deal with the c/image API change.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2019-06-14 15:45:41 +02:00
1322b41aa0 Merge pull request #3320 from cevich/fix_ssh_race
Cirrus: Guarantee ssh is running for rootless
2019-06-14 15:44:58 +02:00
0ea95da7b9 Merge pull request #3315 from giuseppe/support-bind-nonrecursive
storage: support --mount type=bind,bind-nonrecursive
2019-06-14 15:44:44 +02:00
c7ee7f868d Document exit codes for podman exec
Also fix podman run exit codes to show real messages when failures
happen.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2019-06-13 23:38:10 -04:00
d5f04e920b Merge pull request #3321 from haircommander/conmon-0.3.0
bump conmon to 0.3.0
2019-06-14 05:34:39 +02:00
56957db468 Merge pull request #3322 from mheon/fix_release_notes
Update 1.4.0 release notes with ID -> Id in inspect
2019-06-14 05:24:39 +02:00
49e696642d Add --storage flag to 'podman rm' (local only)
This flag switches to removing containers directly from c/storage
and is mostly used to remove orphan containers.

It's a superior solution to our former one, which attempted
removal from storage under certain circumstances and could, under
some conditions, not trigger.

Also contains the beginning of support for storage in `ps` but
wiring that in is going to be a much bigger pain.

Fixes #3329.

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2019-06-13 17:02:20 -04:00
b2bdbf331e When creating exit command, pass storage options on
We made changes earlier that empty storage options when setting
storage driver explicitly. Unfortunately, this breaks rootless
cleanup commands, as they lose the fuse-overlayfs mount program
path.

Fix this by passing along the storage options to the cleanup
process.

Also, fix --syslog, which was broken a while ago (probably when
we broke up main to add main_remote).

Fixes #3326

Signed-off-by: Matthew Heon <mheon@redhat.com>
2019-06-13 15:19:17 -04:00
ef9e0ec6cb Bump cirrus images
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2019-06-13 13:21:09 -04:00
a5995e0473 Mention the new Podman mailing list in contributing.md
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2019-06-13 12:51:39 -04:00
861a3b84a3 Update 1.4.0 release notes with ID -> Id in inspect
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2019-06-13 12:47:57 -04:00
2784cf3ca3 Merge pull request #3312 from mheon/podman_inspect_fixes_cont
Further fixes for podman inspect
2019-06-13 18:28:33 +02:00
031280cfe4 Merge pull request #3319 from mheon/purge_easyjson
Purge all use of easyjson and ffjson in libpod
2019-06-13 18:12:40 +02:00
a3ed16416f Bump conmon to 0.3.0
This enables cgroup v2 OOM

Signed-off-by: Peter Hunt <pehunt@redhat.com>
2019-06-13 12:03:57 -04:00
8440656fd5 Cirrus: Guarantee ssh is running for rootless
Signed-off-by: Chris Evich <cevich@redhat.com>
2019-06-13 11:32:06 -04:00
7b7853d8c7 Purge all use of easyjson and ffjson in libpod
We're no longer using either of these JSON libraries, dropped
them in favor of jsoniter. We can't completely remove ffjson as
c/storage uses it and can't easily migrate, but we can make sure
that libpod itself isn't doing anything with them anymore.

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2019-06-13 11:03:20 -04:00
bcd95f9ddc Split mount options in inspect further
Docker only uses Mode for :z/:Z, so move other options out into a
new field.

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2019-06-13 09:34:56 -04:00
23efe4cb81 storage: support --mount type=bind,bind-nonrecursive
add support for not recursive bind mounts.

Closes: https://github.com/containers/libpod/issues/3314

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2019-06-13 15:32:45 +02:00
f628a97be5 Merge pull request #3311 from giuseppe/oci-errors
oci: use json formatted errors from the runtime
2019-06-13 15:25:23 +02:00
13e1afdb02 oci: allow to specify what runtimes support JSON
add a new configuration `runtime_supports_json` to list what OCI
runtimes support the --log-format=json option.  If the runtime is not
listed here, libpod will redirect stdout/stderr from the runtime
process.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2019-06-13 14:21:13 +02:00