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
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
Matthew Heon
c4b52f47ba
Bump to v1.4.1
...
Signed-off-by: Matthew Heon <mheon@redhat.com>
2019-06-14 18:19:25 -04:00
OpenShift Merge Robot
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
OpenShift Merge Robot
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
OpenShift Merge Robot
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
Matthew Heon
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
Matthew Heon
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
OpenShift Merge Robot
4a450d55d9
Merge pull request #3334 from vrothberg/fix-3331
...
pkg/apparmor: fix when AA is disabled
2019-06-14 21:24:53 +02:00
Matthew Heon
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
TomSweeneyRedHat
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
OpenShift Merge Robot
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
OpenShift Merge Robot
1ac8307ae4
Merge pull request #3306 from rhatdan/exit
...
Document exit codes for podman exec
2019-06-14 18:05:56 +02:00
OpenShift Merge Robot
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
Valentin Rothberg
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
Jordan Webb
d2d57517d7
Fix ENV parsing on `podman import`
...
Signed-off-by: Jordan Webb <jordemort@github.com>
2019-06-14 09:43:36 -05:00
Matthew Heon
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
Miloslav Trmač
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
Miloslav Trmač
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
OpenShift Merge Robot
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
OpenShift Merge Robot
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
Daniel J Walsh
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
OpenShift Merge Robot
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
OpenShift Merge Robot
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
Matthew Heon
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
Matthew Heon
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
Peter Hunt
ef9e0ec6cb
Bump cirrus images
...
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2019-06-13 13:21:09 -04:00
Matthew Heon
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
Matthew Heon
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
OpenShift Merge Robot
2784cf3ca3
Merge pull request #3312 from mheon/podman_inspect_fixes_cont
...
Further fixes for podman inspect
2019-06-13 18:28:33 +02:00
OpenShift Merge Robot
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
Peter Hunt
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