Commit Graph

8344 Commits

Author SHA1 Message Date
OpenShift Merge Robot
bbaba9fb86 Merge pull request #6679 from edsantiago/bats
system tests: new rm, build tests
2020-06-23 12:21:49 +02:00
OpenShift Merge Robot
fc2c2ad174 Merge pull request #6712 from mheon/readd_userns_envvar
Re-add PODMAN_USERNS environment variable
2020-06-23 12:19:01 +02:00
OpenShift Merge Robot
3c51ff92ca Merge pull request #6710 from vrothberg/fix-6413
libpod/containers/json: alias last -> limit
2020-06-23 12:16:15 +02:00
OpenShift Merge Robot
9e37fd43e4 Merge pull request #6625 from QiWang19/fd
Add --preservefds to podman run
2020-06-23 10:00:21 +02:00
OpenShift Merge Robot
22a7d60f18 Merge pull request #6715 from mheon/fix_security_exclusive
Fix conflicts between privileged and other flags
2020-06-23 00:18:52 +02:00
Ed Santiago
d4504e6f53 system tests: new rm, build tests
- rm: confirm 'rm' and 'rm -f' on running container

 - build: shotgun test of workdir, cmd, env, labels

The new build test cd's to a temporary directory, which broke
test invocations using a relative path (./bin/podman). Added
code to detect relative paths and convert them to absolute.

Signed-off-by: Ed Santiago <santiago@redhat.com>
2020-06-22 15:57:18 -06:00
Matthew Heon
13cfdb0742 Fix conflicts between privileged and other flags
The `--privileged` flag does not conflict with `--group-add`
(this one was breaking Toolbox) and does not conflict with most
parts of `--security-opt` (this was breaking Openstack).

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2020-06-22 16:08:09 -04:00
Matthew Heon
f329e2ad67 Re-add PODMAN_USERNS environment variable
This was lost during the Podman 2.0 migration. Turns out to be a
very easy fix, fortunately - we want to use the environment var
if not explicitly overridden.

Fixes #6705

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2020-06-22 14:11:30 -04:00
OpenShift Merge Robot
22942e392d Merge pull request #6709 from rhafer/go-version
Bump required go version to 1.13
2020-06-22 19:05:04 +02:00
OpenShift Merge Robot
11dd5f51b6 Merge pull request #6702 from jgallucci32/follow-logs-poll
Stop following logs using timers
2020-06-22 18:10:06 +02:00
OpenShift Merge Robot
78b205c8c9 Merge pull request #6700 from gavincampbell/typo-fix
Typo fix
2020-06-22 17:10:33 +02:00
OpenShift Merge Robot
277732b9bc Merge pull request #6707 from lsm5/custom-GO_BUILD
Makefile: allow customizable GO_BUILD
2020-06-22 17:04:51 +02:00
Valentin Rothberg
2abcd4f1de libpod/containers/json: alias last -> limit
Support both `last` and `limit` for in the containers listing endpoint.
We intended to use `limit` which is also mentioned in the docs, but the
implementation ended up using `last` as the http parameter; likely being
caused by the CLI using `--last`.  To avoid any regression, we decided
for supporting both and aliasing `last`.

Fixes: #6413
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-06-22 16:55:48 +02:00
Ralf Haferkamp
f52dd4fb1c Bump required go version to 1.13
Recent versions of libpod use features from github.com/pkg/errors
that are only available when building with go 1.13 or newer.

Closes #6708

Signed-off-by: Ralf Haferkamp <rhafer@suse.com>
2020-06-22 16:53:33 +02:00
Lokesh Mandvekar
78bd0e0a63 Makefile: allow customizable GO_BUILD
This will let me use a customizable GO_BUILD so that I can run build
targets for deb packages

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2020-06-22 09:59:30 -04:00
jgallucci32
173d086374 Add explicit command to alpine container in test case.
Signed-off-by: jgallucci32 <john.gallucci.iv@gmail.com>
2020-06-22 06:38:53 -07:00
OpenShift Merge Robot
4afdbcd6da Merge pull request #6703 from dougsland/msg
rootless_linux: improve error message
2020-06-22 15:23:27 +02:00
Gavin Campbell
d2d4523be0 "pod" was being truncated to "po" in the names of the generated systemd unit files.
s/po/pod

Signed-off-by: Gavin Campbell <gavin@gavincampbell.dev>
2020-06-21 18:19:19 +01:00
jgallucci32
8926e1f03b Use POLL_DURATION for timer
Signed-off-by: jgallucci32 <john.gallucci.iv@gmail.com>
2020-06-21 09:31:22 -07:00
Douglas Schilling Landgraf
11e237bc3a rootless_linux: improve error message
Improve the error message for rootless mode.

Git-Url: https://github.com/containers/libpod/issues/6572
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
2020-06-21 06:35:25 -04:00
OpenShift Merge Robot
0e4b73456d Merge pull request #6683 from rhatdan/hostname
Add container name to the /etc/hosts within the container
2020-06-21 12:23:49 +02:00
OpenShift Merge Robot
4a1dd9f9a4 Merge pull request #6671 from rhatdan/build
Fix podman build handling of --http-proxy flag
2020-06-21 11:38:54 +02:00
OpenShift Merge Robot
bc256d9319 Merge pull request #6698 from mheon/bump_master_version
[CI:DOCS] Bump master version
2020-06-20 13:33:26 -04:00
jgallucci32
78dd4f2ecb Stop following logs using timers
This incorporates code from PR #6591 and #6614 but does not use
event channels to detect container state and rather uses timers
with a defined wait duration before calling t.StopAtEOF() to
ensure the last log entry is output before a container exits.

The polling interval is set to 250 milliseconds based on polling
interval defined in hpcloud/tail here:
https://github.com/hpcloud/tail/blob/v1.0.0/watch/polling.go#L117

Co-authored-by: Qi Wang <qiwan@redhat.com>
Signed-off-by: jgallucci32 <john.gallucci.iv@gmail.com>
2020-06-20 09:48:55 -07:00
Daniel J Walsh
5b3503c0a1 Add container name to the /etc/hosts within the container
This will allow containers that connect to the network namespace be
able to use the container name directly.

For example you can do something like

podman run -ti --name foobar fedora ping foobar

While we can do this with hostname now, this seems more natural.

Also if another container connects on the network to this container it
can do

podman run --network container:foobar fedora ping foobar

And connect to the original container,without having to discover the name.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-06-20 06:20:46 -04:00
OpenShift Merge Robot
f403aa3baa Merge pull request #6621 from vrothberg/bz-1846629
search: allow wildcards
2020-06-20 05:57:25 -04:00
OpenShift Merge Robot
60425c96d0 Merge pull request #6676 from lsm5/tag-correction
Account for non-default port number in image name
2020-06-20 05:51:57 -04:00
OpenShift Merge Robot
21f3bdf63d Merge pull request #6675 from yhchen0906/master
correct the absolute path of `rm` executable
2020-06-20 05:49:06 -04:00
Matthew Heon
08304a8ecc Update release notes for v2.0.0
Signed-off-by: Matthew Heon <mheon@redhat.com>
2020-06-19 15:56:45 -04:00
Matthew Heon
38b028710e Update README to reflect that v2.0.0 has been released
Signed-off-by: Matthew Heon <mheon@redhat.com>
2020-06-19 15:56:08 -04:00
Matthew Heon
bd858dd8dc Bump master to v2.1.0-dev following release of v2.0
Signed-off-by: Matthew Heon <mheon@redhat.com>
2020-06-19 15:55:42 -04:00
OpenShift Merge Robot
89dbd1a916 Merge pull request #6674 from jwhonce/issues/6670
Add support for image sorting for all options
2020-06-19 13:00:49 -04:00
OpenShift Merge Robot
ed91524ae4 Merge pull request #6637 from jwhonce/issues/6574
Correct logic for demux'ing channels
2020-06-19 12:57:57 -04:00
Jhon Honce
ea8e61e4eb Fixes #6670
* Sort images for -q option, removing duplicate id's
* Sort images for --format json

Signed-off-by: Jhon Honce <jhonce@redhat.com>
2020-06-19 08:57:12 -07:00
Jhon Honce
bda4a6982f Correct logic for demux'ing channels
* Move check for requesting output into case statement

Signed-off-by: Jhon Honce <jhonce@redhat.com>
2020-06-19 08:35:15 -07:00
OpenShift Merge Robot
1a2eb3e615 Merge pull request #6677 from baude/pollOnEvents
Poll on events for file reading
2020-06-19 11:15:33 -04:00
Lokesh Mandvekar
71f6dd47dd Account for non-default port number in image name
Previously, if an image was tagged with the format
$REGISTRY:$PORT/$REPO:$TAG,
then `podman images` would display $PORT/$REPO:$TAG under the "TAG"
field.

This commit correctly displays $REGISTRY:$PORT/$REPO under the
"REPOSITORY" field while the "TAG" field only displays $TAG.

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>

Fixes: gh#6665
2020-06-19 10:48:15 -04:00
OpenShift Merge Robot
33a6027613 Merge pull request #6690 from vrothberg/fix-6687
podman images --format json: pretty print
2020-06-19 10:44:54 -04:00
Yuan-Hao Chen
f18d2751f6 correct the absolute path of rm executable
Signed-off-by: Yuan-Hao Chen <yhchen0906@gmail.com>
2020-06-19 22:23:35 +08:00
Brent Baude
f46664546a Poll on events for file reading
When multiple connections are monitoring events via the remote API, the inotify in the hpcloud library seems unable to consistently send events.  Switching from inotify to poll seems to clear this up.

Fixes: #6664

Signed-off-by: Brent Baude <bbaude@redhat.com>
2020-06-19 09:00:03 -05:00
Qi Wang
f61a7f25a8 Add --preservefds to podman run
Add --preservefds to podman run. close https://github.com/containers/libpod/issues/6458

Signed-off-by: Qi Wang <qiwan@redhat.com>
2020-06-19 09:40:13 -04:00
Valentin Rothberg
bba433ed92 podman images --format json: pretty print
Pretty print the JSON output when listing images.  We regressed on that
during v2 development. The indentation is now identical to the one of
Podman v1.9.3.

Fixes: #6687
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-06-19 15:30:32 +02:00
Daniel J Walsh
3556bfed09 Fix podman build handling of --http-proxy flag
Also fixed a todo for handling of cgroup manager while I was in there.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-06-19 08:54:38 -04:00
Valentin Rothberg
b05888a97d search: allow wildcards
Allow wildcards in the search term.  Note that not all registries
support wildcards and it may only work with v1 registries.

Note that searching implies figuring out if the specified search term
includes a registry.  If there's not registry detected, the search term
will be used against all configured "unqualified-serach-registries" in
the registries.conf.  The parsing logic considers a registry to be the
substring before the first slash `/`.

With these changes we now not only support wildcards but arbitrary
input; ultimately it's up to the registries to decide whether they
support given input or not.

Fixes: bugzilla.redhat.com/show_bug.cgi?id=1846629
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-06-19 14:47:36 +02:00
OpenShift Merge Robot
5ec29f8d4e Merge pull request #6684 from vrothberg/fix-ci
CI: force registry:2.6
2020-06-19 08:39:37 -04:00
Valentin Rothberg
334d3b1ef3 CI: force registry:2.6
For using the `registry:2.6` image. 2.7 and beyond dropped the
`htpasswd` binary from the rootfs which parts of our CI depends
on.

While this is not a sustainable solution (assuming `htpasswd` is gone
for ever), it unblocks the CI for now.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-06-19 12:58:02 +02:00
OpenShift Merge Robot
a2661b1c25 Merge pull request #6673 from ashley-cui/master
[CI:DOCS] Fix remote docs
2020-06-18 14:43:46 -04:00
Ashley Cui
4dc934080b Fix remote docs
Fix renaming bug in remote-docs.sh
Remove mentions of 'remote' in windows and mac dos
Remove podman-remote.conf.5

Signed-off-by: Ashley Cui <acui@redhat.com>
2020-06-18 12:13:46 -04:00
OpenShift Merge Robot
e6b9b3ab22 Merge pull request #6656 from mheon/recursive_init
Allow recursive dependency start with Init()
2020-06-18 11:20:19 -04:00
OpenShift Merge Robot
2e621aece0 Merge pull request #6662 from containers/dependabot/go_modules/k8s.io/apimachinery-0.18.4
Bump k8s.io/apimachinery from 0.18.3 to 0.18.4
2020-06-18 11:17:10 -04:00