Commit graph

9610 commits

Author SHA1 Message Date
Sascha Grunert
f63bbca4da
Fix ps port output
When defining multiple ports (same src/dst) like `-p 80:80 -p 443:443`
then podman will not show the complete output on `podman ps` (only
`0.0.0.0:80->80/tcp` in the example). This also applies to port ranges.

This patch refactors the port loop by pre-checking for ranges and
displaying them correctly to the end user.

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2020-10-20 17:00:23 +02:00
OpenShift Merge Robot
35b4cb1965
Merge pull request #8069 from matejvasek/fix-memswap
fix: neutral value for MemorySwappiness
2020-10-20 07:33:13 -04:00
OpenShift Merge Robot
cec0e57497
Merge pull request #8043 from saschagrunert/hostport-fix
Fix host to container port mapping for simple ranges
2020-10-20 07:29:46 -04:00
OpenShift Merge Robot
f9450300b7
Merge pull request #8061 from edsantiago/bats
System tests: remove some misleading 'run's
2020-10-20 07:25:35 -04:00
Matej Vasek
bacdbf6e20 fix: neutral value for MemorySwappiness
Signed-off-by: Matej Vasek <mvasek@redhat.com>
2020-10-20 03:13:56 +02:00
OpenShift Merge Robot
e944544271
Merge pull request #8056 from xordspar0/invalid-image
Make invalid image name error more specific
2020-10-19 15:49:11 -04:00
Jordan Christiansen
8cbf7700a5 Make invalid image name error more specific
Previously, using an invalid image name would produce an error like
this:

    Error: error encountered while bringing up pod test-pod-0: invalid reference format

This message didn't specify that there was an problem with an image
name, and it didn't specify which image name had a problem if there were
multiple. Now the error reads:

    Error: error encountered while bringing up pod test-pod-0: Failed to parse image "./myimage": invalid reference format

Signed-off-by: Jordan Christiansen <xordspar0@gmail.com>
2020-10-19 10:06:17 -05:00
Ed Santiago
b23d430516 System tests: remove some misleading 'run's
The BATS 'run' directive is really quite obnoxious; for the
most part we really don't want to use it. Remove some uses
that snuck in last week, and remove one test (exists) that
can more naturally be piggybacked into an rm test.

While we're at it: in setup(), look for and delete stray
external (buildah) containers. This will be important if
any of the external-container tests fails; this way we
don't leave behind a state that causes subsequent tests
to fail.

Signed-off-by: Ed Santiago <santiago@redhat.com>
2020-10-19 08:43:56 -06:00
Sascha Grunert
49424fc02a
Fix host to container port mapping for simple ranges
This fixes the issue that a simple port range should map to a random
port range from the host to the container, if no host port range is
specified. For example this fails without applying the patch:

```
> podman run -it -p 6000-6066 alpine
Error: cannot listen on the TCP port: listen tcp4 :53: bind: address already in use
```

The issue is that only the first port is randomly chosen and all
following in the range start by 0 and increment. This is now fixed by
tracking the ranges and then incrementing the random port if necessary.

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2020-10-19 11:19:12 +02:00
OpenShift Merge Robot
7ffcab0854
Merge pull request #7908 from rhatdan/diff
fix podman container exists and diff for storage containers
2020-10-19 02:49:27 -04:00
OpenShift Merge Robot
6ec96dc009
Merge pull request #8044 from Luap99/fix-8040
Always add the dnsname plugin to the config for rootless
2020-10-18 04:37:13 -04:00
Paul Holzinger
0fd5437904 Always add the dnsname plugin to the config for rootless
The rootless-cni-infra container always has the dnsname
plugin installed. It makes no sense to check if it is
present on the host.

Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
2020-10-17 15:25:58 +02:00
OpenShift Merge Robot
39f1bea46d
Merge pull request #8045 from andylibrian/podman-remote-cleanly-exit-on-detachkeyspressed
Update podman-remote run and start to handle detach keys
2020-10-17 07:18:37 -04:00
OpenShift Merge Robot
28d331d074
Merge pull request #8036 from xordspar0/heading-consistency
[CI:DOCS] Make man page headings more consistent
2020-10-16 17:58:54 -04:00
OpenShift Merge Robot
9d5f28ba9e
Merge pull request #8039 from zhangguanzhang/runlabel-panic
Fix panic when runlabel is missing
2020-10-16 16:10:02 -04:00
Jordan Christiansen
88bc133dac Make man page headings more consistent
Signed-off-by: Jordan Christiansen <xordspar0@gmail.com>
2020-10-16 15:06:33 -05:00
OpenShift Merge Robot
9f98b3447c
Merge pull request #7992 from containers/dependabot/go_modules/github.com/containers/common-0.25.0
Bump github.com/containers/common from 0.24.0 to 0.26.0
2020-10-16 09:27:44 -04:00
Andy Librian
eefa3cbf6e Update podman-remote start --attach to handle detach keys
fixes #7979

Signed-off-by: Andy Librian <andylibrian@gmail.com>
2020-10-16 19:44:29 +07:00
Andy Librian
480cb2db5e Update podman-remote run to handle detach keys
addresses #7979

Signed-off-by: Andy Librian <andylibrian@gmail.com>
2020-10-16 19:44:29 +07:00
OpenShift Merge Robot
fe1b6ccc85
Merge pull request #8029 from Luap99/image-trust-show-raw
Fix podman image trust show --raw output
2020-10-16 05:49:49 -04:00
Daniel J Walsh
711d4ba027
Bump github.com/containers/common from 0.24.0 to 0.26.0
Bumps [github.com/containers/common](https://github.com/containers/common) from 0.24.0 to 0.26.0.
- [Release notes](https://github.com/containers/common/releases)
- [Commits](https://github.com/containers/common/compare/v0.24.0...v0.26.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-10-16 04:38:06 -04:00
zhangguanzhang
97fec29212 Fix panic when runlabel is missing
Signed-off-by: zhangguanzhang <zhangguanzhang@qq.com>
2020-10-16 11:09:21 +08:00
Daniel J Walsh
c3ecdd09ed
Merge pull request #8035 from xordspar0/fix-doc-heading
Fix podman-run man page heading
2020-10-15 14:24:02 -04:00
Paul Holzinger
a261819183 Fix podman image trust show --raw output
Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
2020-10-15 19:04:57 +02:00
Jordan Christiansen
579a10157d Fix podman-run man page heading
Sharing IPC is meant to be an example under the Examples heading, not a
new section.

Signed-off-by: Jordan Christiansen <xordspar0@gmail.com>
2020-10-15 09:51:25 -05:00
Daniel J Walsh
571ae9db72
Fix sorting issues in completions
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-10-15 10:17:52 -04:00
OpenShift Merge Robot
a82d60db0f
Merge pull request #8030 from Luap99/fix-restore-panic
Fix possible panic in libpod container restore
2020-10-15 10:09:40 -04:00
Daniel J Walsh
db23e12611
Add support for external container
External containers are containers created outside of Podman.
For example Buildah and CRI-O Containers.

$ buildah from alpine
alpine-working-container
$ buildah run alpine-working-container touch /test
$ podman container exists --external alpine-working-container

$ podman container diff alpine-working-container
C /etc
A /test

Added --external flag to refer to external containers, rather then --storage.

Added --external for podman container exists and modified podman ps to use
--external rather then --storage.  It was felt that --storage would confuse
the user into thinking about changing the storage driver or options.

--storage is still supported through the use of aliases.

Finally podman contianer diff, does not require the --external flag, since it
there is little change of users making the mistake, and would just be a pain
for the user to remember the flag.

podman container exists --external is required because it could fool scripts
that rely on the existance of a Podman container, and there is a potential
for a partial deletion of a container, which could mess up existing users.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-10-15 09:51:31 -04:00
Daniel J Walsh
22c8270135
fix podman container exists and diff for storage containers
Current these commands only check if a container exists in libpod. With
this fix, the commands will also check if they are in containers/storage.

This allows users to look at differences within a buildah or CRI-O container.

Currently buildah diff does not exists, so this helps out in that situation
as well as in CRI-O since the cri does not implement a diff command.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-10-15 09:51:15 -04:00
OpenShift Merge Robot
a1d5a518d3
Merge pull request #8028 from containers/dependabot/go_modules/github.com/spf13/cobra-1.1.0
Bump github.com/spf13/cobra from 1.0.0 to 1.1.0
2020-10-15 09:32:50 -04:00
OpenShift Merge Robot
d7a1e3fe2a
Merge pull request #8003 from containers/dependabot/go_modules/github.com/onsi/gomega-1.10.3
Bump github.com/onsi/gomega from 1.10.2 to 1.10.3
2020-10-15 07:35:23 -04:00
OpenShift Merge Robot
ef7f584acf
Merge pull request #8025 from edsantiago/bats
System test additions
2020-10-15 06:19:07 -04:00
Paul Holzinger
2e65497dea Fix possible panic in libpod container restore
We need to do a length check before we can access the
networkStatus slice by index to prevent a runtime panic.

Fixes #8026

Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
2020-10-15 11:50:29 +02:00
OpenShift Merge Robot
41eda417fe
Merge pull request #8013 from rhatdan/homedir
Setup HOME environment when using --userns=keep-id
2020-10-15 05:09:40 -04:00
dependabot-preview[bot]
e6d3c492a0
Bump github.com/spf13/cobra from 1.0.0 to 1.1.0
Bumps [github.com/spf13/cobra](https://github.com/spf13/cobra) from 1.0.0 to 1.1.0.
- [Release notes](https://github.com/spf13/cobra/releases)
- [Changelog](https://github.com/spf13/cobra/blob/master/CHANGELOG.md)
- [Commits](https://github.com/spf13/cobra/compare/v1.0.0...v1.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-10-15 04:46:01 -04:00
Ed Santiago
1646da834c System test additions
- run --userns=keep-id: confirm that $HOME gets set (#8013)

 - inspect: confirm that JSON output is a sane number of
   lines (10 or more), not an unreadable one-liner (#8011
   and #8021). Do so with image, pod, network, volume
   because the code paths might be different.

 - cgroups: confirm that 'run' preserves cgroup manager (#7970)

 - sdnotify: reenable tests, and hope CI doesn't hang. This
   test was disabled on August 18 because CI jobs were hanging
   and timing out. My suspicion was that it was #7316, which
   in turn seems to have hinged on conmon #182. The latter
   was merged on Sep 16, so let's cross our fingers and see
   what happens.

Also: remove inaccurate warning from a networking test.

And, wow, fix is_cgroupsv2(), it has never actually worked.

Signed-off-by: Ed Santiago <santiago@redhat.com>
2020-10-14 15:32:02 -06:00
Daniel J Walsh
1814bac92e Setup HOME environment when using --userns=keep-id
Currently the HOME environment is set to /root if
the user does not override it.

Also walk the parent directories of users homedir
to see if it is volume mounted into the container,
if yes, then set it correctly.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-10-14 15:31:56 -06:00
Daniel J Walsh
6ca8067956
Setup HOME environment when using --userns=keep-id
Currently the HOME environment is set to /root if
the user does not override it.

Also walk the parent directories of users homedir
to see if it is volume mounted into the container,
if yes, then set it correctly.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-10-14 16:45:24 -04:00
OpenShift Merge Robot
e4f6a1afae
Merge pull request #8021 from mheon/fix_pod_inspect_indent
Fix indentation for `podman pod inspect`
2020-10-14 16:29:05 -04:00
OpenShift Merge Robot
3e8e2a5035
Merge pull request #8018 from cevich/docker_py_vm
Cirrus: Execute docker-py tests on a VM
2020-10-14 14:51:44 -04:00
Matthew Heon
bddd5580ab Fix indentation for podman pod inspect
Signed-off-by: Matthew Heon <mheon@redhat.com>
2020-10-14 13:55:16 -04:00
OpenShift Merge Robot
e3eb6fd0e4
Merge pull request #7987 from jwhonce/jira/run-898-5
Restore --format table support
2020-10-14 13:07:11 -04:00
Chris Evich
c921e3b9da
Cirrus: Execute docker-py tests on a VM
Signed-off-by: Chris Evich <cevich@redhat.com>
2020-10-14 11:39:27 -04:00
OpenShift Merge Robot
d30b4b7aa5
Merge pull request #8011 from mheon/fix_inspect_json
Restore indent on JSON from `podman inspect`
2020-10-14 10:55:27 +02:00
Jhon Honce
eb4a746efc Restore --format table support
* system df
* events
  * fix error handling from go routine
  * update tests to use gomega matchers for better error messages
* system info
* version
* volume inspect

Signed-off-by: Jhon Honce <jhonce@redhat.com>
2020-10-13 17:28:45 -07:00
dependabot-preview[bot]
9066292ee4
Bump github.com/onsi/gomega from 1.10.2 to 1.10.3
Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.10.2 to 1.10.3.
- [Release notes](https://github.com/onsi/gomega/releases)
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md)
- [Commits](https://github.com/onsi/gomega/compare/v1.10.2...v1.10.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-13 16:22:29 -04:00
OpenShift Merge Robot
d1ba9ce555
Merge pull request #8009 from baude/nosuchimage
alter compat no such image message
2020-10-13 21:53:05 +02:00
OpenShift Merge Robot
98708b1268
Merge pull request #7967 from cevich/restore_apiv2_test
Cirrus: Restore APIv2 Testing
2020-10-13 21:11:02 +02:00
Matthew Heon
915591b832 Restore indent on JSON from podman inspect
I don't know when this was disabled, but it's very hard to read
without it.

Signed-off-by: Matthew Heon <mheon@redhat.com>
2020-10-13 14:52:33 -04:00
OpenShift Merge Robot
8fef35a2ff
Merge pull request #7998 from cevich/add_ci_docs
[CI:DOCS] Cirrus: Ability to skip most tests for docs updates
2020-10-13 20:47:41 +02:00