Commit graph

4381 commits

Author SHA1 Message Date
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
Chris Evich 4e9f5e5f2b
Cirrus: Simplify log collection commands
Signed-off-by: Chris Evich <cevich@redhat.com>
2019-06-14 08:49:18 -04: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
Chris Evich 8440656fd5
Cirrus: Guarantee ssh is running for rootless
Signed-off-by: Chris Evich <cevich@redhat.com>
2019-06-13 11:32:06 -04:00
Matthew Heon 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
Matthew Heon 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
Giuseppe Scrivano 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
OpenShift Merge Robot 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
Giuseppe Scrivano 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
Giuseppe Scrivano 97f4818ce1
storage: fix typo
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2019-06-13 11:29:07 +02:00
Giuseppe Scrivano 6e4ce54d33
oci: use json formatted errors from the runtime
request json formatted error messages from the OCI runtime so that we
can nicely print them.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2019-06-13 10:27:06 +02:00
Matthew Heon 4e7e5f5cbd Make Inspect's mounts struct accurate to Docker
We were formerly dumping spec.Mount structs, with no care as to
whether it was user-generated or not - a relic of the very early
days when we didn't know whether a user made a mount or not.

Now that we do, match our output to Docker's dedicated mount
struct.

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2019-06-12 17:14:21 -04:00
Matthew Heon 0084b04aca Provide OCI spec path in podman inspect output
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2019-06-12 15:53:41 -04:00
OpenShift Merge Robot 77d1cf0a32
Merge pull request #3305 from giuseppe/slirp-dns-first
rootless: use the slirp4netns builtin DNS first
2019-06-12 16:30:34 +02:00
OpenShift Merge Robot 9faff31421
Merge pull request #3307 from rhatdan/126
If container is not in correct state podman exec should exit with 126
2019-06-12 15:27:16 +02:00
Daniel J Walsh 3bbb692d80
If container is not in correct state podman exec should exit with 126
This way a tool can determine if the container exists or not, but is in the
wrong state.

Since 126 is documeted as:
**_126_** if the **_contained command_** cannot be invoked

It makes sense that the container would exit with this state.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2019-06-12 05:15:58 -04:00
Giuseppe Scrivano 0e34d9093e
rootless: use the slirp4netns builtin DNS first
When using slirp4netns, be sure the built-in DNS server is the first
one to be used.

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

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2019-06-12 10:29:57 +02:00
OpenShift Merge Robot d4681fafe5
Merge pull request #3298 from ashley-cui/username
Fix podman-remote to user default username
2019-06-12 08:49:12 +02:00
OpenShift Merge Robot f8a84fdcff
Merge pull request #3261 from cevich/no_buildah
Remove source-built buildah from CI
2019-06-11 21:40:30 +02:00
OpenShift Merge Robot c385f33cdf
Merge pull request #3290 from edsantiago/bats
BATS tests - get working again
2019-06-11 21:21:33 +02:00
OpenShift Merge Robot 130f6cba8c
Merge pull request #3293 from mheon/add_test_for_play_kube
Add a test for 'podman play kube' to prevent regression
2019-06-11 18:48:25 +02:00
Matthew Heon f909b745ec Add --filename option to generate kube
This allows writing output directly to a file, instead of STDOUT.
Makes things easier for some scripting tasks. Like the unit tests
for 'play kube'.

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2019-06-11 11:26:46 -04:00
Ashley Cui 91ce129eab Fix podman-remote to user default username
Currently, you have to specify the username every time, rather than default like SSH does.

Signed-off-by: Ashley Cui <ashleycui16@gmail.com>
2019-06-11 10:09:37 -04:00
Ed Santiago 9f49c1af46 Prohibit use of positional args with --import
I took the liberty of combining related checks together
so as to avoid a little duplication; if this is not a
Go best practice, I will revert. I also made a minor
wording adjustment to an error message for clarity.

Also: update wording of man page.

Signed-off-by: Ed Santiago <santiago@redhat.com>
2019-06-11 06:53:03 -06:00
Ed Santiago bd0582dd34 BATS tests - get working again
Various small fixes to get BATS tests working again.
Split from #2947 because that one keeps getting stalled,
and I'm hoping these separate changes get approved.

I consider these changes urgent because RHEL8 gating
tests are failing, and will fail even more if/when #2272
gets picked up and packaged for RHEL8, and I consider
it important to have clean passing tests for RHEL8.

  * info test: 'insecure registries' is gone. A recent
    commit (d1a7378aa) changed the format of 'podman info',
    removing the 'insecure registries' key. Deal with it.

  * info test: remove check for .host.{Conmon,OCIRuntime}.package;
    the value on f28 and f29 is 'Unknown' (instead of an NVR).
    We can live without this check.

  * 'load' test: skip when running in CI, because stdin
    is not a tty.

  * container restore: fix arg processing. #2272 broke argument
    processing: 'podman container restore', with no args, should
    exit with 'argument required' error. Root cause is that the
    new --import option takes the place of an argument, so the
    checkAllAndLatest() call had to be changed to not exit on error.
    Workaround is (sigh) to copy/paste the skipped checkAllAndLatest()
    code, with minor tweaks to accommodate --import.

Signed-off-by: Ed Santiago <santiago@redhat.com>
2019-06-11 06:53:03 -06:00
Daniel J Walsh 805d1d96fa
Accidently removed /run/lock from systemd mounts
This is blowing up systemd containers on Ubuntu.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2019-06-11 07:54:55 -04:00
Matthew Heon 53435d4d47 Add a test for 'podman play kube' to prevent regression
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2019-06-10 18:57:29 -04:00
OpenShift Merge Robot c93b8d6b02
Merge pull request #3240 from rhatdan/storageopts
When you change the storage driver we ignore the storage-options
2019-06-10 20:33:46 +02:00
OpenShift Merge Robot a89d013b12
Merge pull request #3283 from haircommander/logging-play-kube-hotfix
Set a default log driver if none is specified
2019-06-10 20:19:33 +02:00
OpenShift Merge Robot 013b897ace
Merge pull request #3254 from ashley-cui/standarddoc
Standardize Documentation
2019-06-10 19:45:31 +02:00
OpenShift Merge Robot 75a3c22486
Merge pull request #3237 from cevich/ci_contrib_doc
docs: Add CI section and links
2019-06-10 18:57:24 +02:00
Chris Evich 8baa897356
Cirrus: New images w/o buildah
Signed-off-by: Chris Evich <cevich@redhat.com>
2019-06-10 12:56:12 -04:00
Chris Evich 1a9accb379
Remove source-built buildah from CI
Signed-off-by: Chris Evich <cevich@redhat.com>
2019-06-10 12:54:42 -04:00
Ashley Cui 19e0928037 standardize documentation formatting
Signed-off-by: Ashley Cui <ashleycui16@gmail.com>
2019-06-10 11:48:02 -04:00
OpenShift Merge Robot 901ac2cdd3
Merge pull request #3287 from TomSweeneyRedHat/dev/tsweeney/podmanimage3
Touchup upstream Dockerfile
2019-06-10 17:38:36 +02:00
OpenShift Merge Robot fcb7c14c5b
Merge pull request #3285 from CameronNemo/musl
Fix cgo includes for musl
2019-06-09 08:18:56 +02:00
TomSweeneyRedHat cdffb69493 Touchup upstream Dockerfile
The upstream/Dockerfile had a few issues that this
cleans up.  A few files were misplaced, wrong installs
and removes.  This corrects those issues.

Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
2019-06-08 21:31:46 -04:00
Peter Hunt 9313556591 only set log driver if it isn't empty
Now, not setting a log driver in a create config correctly takes the default (k8s-logging)

Signed-off-by: Peter Hunt <pehunt@redhat.com>
2019-06-08 17:46:17 -04:00
Cameron Nemo 8d2c7c269d
Fix cgo includes for musl
closes #3284

Signed-off-by: Cameron Nemo <cnemo@tutanota.com>
2019-06-08 14:15:03 -07:00
OpenShift Merge Robot 39f5ea4c04
Merge pull request #3180 from mheon/inspect_volumes
Begin to break up pkg/inspect
2019-06-08 14:45:24 +02:00