Commit graph

10739 commits

Author SHA1 Message Date
Giuseppe Scrivano
4726eb2861
test: fix error message
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2020-01-10 10:38:47 +01:00
Giuseppe Scrivano
71341a1948
log: support --log-opt tag=
support a custom tag to add to each log for the container.

It is currently supported only by the journald backend.

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

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2020-01-10 10:35:19 +01:00
Chris Evich
eb0f79c337
Fix Makefile ref libseccomp branch as a commit
Commit a824186ac9 mistakenly updated LIBSECCOMP_COMMIT with a branch
name instead of a commit reference.  This breaks on Ubuntu's git with
the `--detach` option, causing it to throw this error:

```
fatal: '--detach' cannot be used with '-b/-B/--orphan'
```

Fix this by using the tag `v2.3.3` which at the time of this commit, is
the current HEAD of the release-2.3 branch.

Thanks to Ed Santiago <santiago@redhat.com> for helping figure
out the error and the fix.

Signed-off-by: Chris Evich <cevich@redhat.com>
2020-01-09 14:31:26 -05:00
Valentin Rothberg
f3f4c54f2a policy for seccomp-profile selection
Implement a policy for selecting a seccomp profile.  In addition to the
default behaviour (default profile unless --security-opt seccomp is set)
add a second policy doing a lookup in the image annotation.

If the image has the "io.containers.seccomp.profile" set its value will be
interpreted as a seccomp profile.  The policy can be selected via the
new --seccomp-policy CLI flag.

Once the containers.conf support is merged into libpod, we can add an
option there as well.

Note that this feature is marked as experimental and may change in the
future.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-01-09 17:57:58 +01:00
Valentin Rothberg
816e50ba02 podman-generate-systemd --new
Add a --new flag to podman-generate-systemd to create a new container
via podman-run instead of starting an existing container.

Creating a new container presents the challenge to find a reverse
mapping from a container to the CLI flags it can be created with.  We
are doing this via `(Container).Config.CreateCommand` field, which
includes a copy of the process' command from procFS at creating time.
This field may not be useful when the container was not created via the
Podman CLI (e.g., via a Python script).  Hence, we do not guarantee the
correctness of the generated files.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-01-09 16:12:12 +01:00
OpenShift Merge Robot
f57fdd038d
Merge pull request #4819 from TomSweeneyRedHat/dev/tsweeney/fixpodmanimage
Update podmanimage build process
2020-01-09 14:23:41 +01:00
OpenShift Merge Robot
154b5ca85d
Merge pull request #4818 from haircommander/piped-exec-fix
exec: fix pipes
2020-01-09 14:01:42 +01:00
OpenShift Merge Robot
fe49aa0f50
Merge pull request #4821 from AkihiroSuda/fix-rootlessport
rootlessport: remove state dir on exit + honor ctr.runtime.config.TmpDir
2020-01-09 13:50:49 +01:00
OpenShift Merge Robot
aaf94c84e7
Merge pull request #4820 from edsantiago/consistent_option_enumerations
Usage messages: show possible option values
2020-01-09 13:50:43 +01:00
Valentin Rothberg
7ccf412f70 shared/create.go: s/data/imageData/
Rename `data` to `imageData` to make it more obvious which kind of data
the variable refers to.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-01-09 11:09:23 +01:00
OpenShift Merge Robot
f3fc10feb4
Merge pull request #4802 from rhatdan/varlink
Fix podman-remote info to show registry data
2020-01-09 10:40:20 +01:00
Akihiro Suda
556cc1fadf rootlessport: honor ctr.runtime.config.TmpDir
Previously, rootlessport was using /var/tmp as the tmp dir.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-01-09 14:06:33 +09:00
Akihiro Suda
5990f0f142 rootlessport: remove state dir on exit
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-01-09 13:57:01 +09:00
Ed Santiago
3b2aa033c8 Usage messages: show possible option values
...in a consistent manner: ("a"|"b"|"c")

This makes it possible (and easy) for zsh completion to
pick those out of the --help messages and offer them
as values when user hits TAB.

I chose this format because it's an already-existing
convention in cmd/podman/common.go.

Also: removed two duplicate "default: x" messages (Cobra
displays those automatically where a non-null default
is specified).

Signed-off-by: Ed Santiago <santiago@redhat.com>
2020-01-08 14:24:43 -07:00
TomSweeneyRedHat
77994c4957 Update podmanimage build process
(Stealing from: @rhatdan 's https://github.com/containers/buildah/pull/2038 )

1 We need to update all packages in the podman image to make sure they are
up2date.
2 reinstall shadow-utils. For some reason the fedora base image does not
include the file capabilities assigned to /usr/bin/newuidmap and
/usr/bin/newgidmap. Reinstalling shadow-utils, brings them back.
3 Add a default user build to the system. This will create the
/etc/subuid and /etc/subgid maps get created correctly.

Once we have this we should be able to build a container starting with a non
privileged user

podman run -ti --user build --device=/dev/fuse -v ./Dockerfile:/Dockerfile:z quay.io/podman/stable podman buildd /

Addresses: #4741

Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
2020-01-08 14:21:21 -05:00
OpenShift Merge Robot
c99b413abb
Merge pull request #4758 from rhatdan/validate
Don't show PASS on success for gitvalidate
2020-01-08 18:46:05 +01:00
Peter Hunt
776eb64ab2 exec: fix pipes
In a largely anticlimatic solution to the saga of piped input from conmon, we come to this solution.

When we pass the Stdin stream to the exec.Command structure, it's immediately consumed and lost, instead of being consumed through CopyDetachable().

When we don't pass -i in, conmon is not told to create a masterfd_stdin, and won't pass anything to the container.

With both, we can do

echo hi | podman exec -til cat

and get the expected hi

Signed-off-by: Peter Hunt <pehunt@redhat.com>
2020-01-08 11:09:08 -05:00
OpenShift Merge Robot
c6ad42a176
Merge pull request #4816 from vrothberg/lint
Fix golint errors
2020-01-08 16:58:50 +01:00
Valentin Rothberg
bcf5753276 fix lint - pkg/varlinkapi/virtwriter
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-01-08 15:44:30 +01:00
Valentin Rothberg
2311e5ff8a fix lint - pkg/util: func comment
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-01-08 15:44:30 +01:00
Valentin Rothberg
1d1519b08b fix lint - pkg/spec
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-01-08 15:44:30 +01:00
Valentin Rothberg
83764b84ec fix lint in pkg/rootless
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-01-08 15:44:30 +01:00
Valentin Rothberg
88369acfca fix lint - pkg/network: comment exported types
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-01-08 15:44:30 +01:00
Valentin Rothberg
18c702d053 fix lint - pkg/adapter: comment exported API
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-01-08 15:44:30 +01:00
Valentin Rothberg
583ff5320f fix lint - ignore image.ImageDeleteResponse definition
Golint claims that image.Image stutters but renaming the type would be a
breaking change which isn't worth the consequences.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-01-08 15:44:30 +01:00
Valentin Rothberg
0b53ff2902 fix lint - drop else block
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-01-08 15:44:21 +01:00
OpenShift Merge Robot
27caffbb24
Merge pull request #4712 from openSUSE/untag-command
Add `untag` sub-command
2020-01-08 15:05:06 +01:00
Valentin Rothberg
baba52c6b5 fix lint: add comment for NameRegex and error
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-01-08 13:55:14 +01:00
Valentin Rothberg
8ae672632b fix lint: correct func identifier in comment
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-01-08 13:52:52 +01:00
Valentin Rothberg
aaec8b2408 fix lint: "guarantess" is a misspelling of "guarantees"
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-01-08 13:51:13 +01:00
Daniel J Walsh
0b9dd1a1a0
Merge pull request #4810 from TomSweeneyRedHat/dev/tsweeney/updateinspectcommands
Update demo for the inspect command
2020-01-08 07:47:17 -05:00
OpenShift Merge Robot
a8a766853e
Merge pull request #4795 from ssbarnea/master
packaging: validate installed rpms
2020-01-08 13:44:24 +01:00
OpenShift Merge Robot
b33c774c15
Merge pull request #4592 from AkihiroSuda/rootlesskit-port-forwarder
rootless: use RootlessKit port forwarder
2020-01-08 13:16:22 +01:00
Akihiro Suda
da7595a69f rootless: use RootlessKit port forwarder
RootlessKit port forwarder has a lot of advantages over the slirp4netns port forwarder:

* Very high throughput.
  Benchmark result on Travis: socat: 5.2 Gbps, slirp4netns: 8.3 Gbps, RootlessKit: 27.3 Gbps
  (https://travis-ci.org/rootless-containers/rootlesskit/builds/597056377)

* Connections from the host are treated as 127.0.0.1 rather than 10.0.2.2 in the namespace.
  No UDP issue (#4586)

* No tcp_rmem issue (#4537)

* Probably works with IPv6. Even if not, it is trivial to support IPv6.  (#4311)

* Easily extensible for future support of SCTP

* Easily extensible for future support of `lxc-user-nic` SUID network

RootlessKit port forwarder has been already adopted as the default port forwarder by Rootless Docker/Moby,
and no issue has been reported AFAIK.

As the port forwarder is imported as a Go package, no `rootlesskit` binary is required for Podman.

Fix #4586
May-fix #4559
Fix #4537
May-fix #4311

See https://github.com/rootless-containers/rootlesskit/blob/v0.7.0/pkg/port/builtin/builtin.go

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-01-08 19:35:17 +09:00
Sascha Grunert
40b74e02b7
Add untag sub-command
Podman now supports untagging images via the `untag` sub-command for the
root and `image` commands. Testing and documentation has been added as
well.

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2020-01-08 10:06:10 +01:00
TomSweeneyRedHat
9ea34f8ffa Update demo for the inspect command
Updates the inspect command demo with an up to date
variant and adds a link to script that ran it.

Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
2020-01-07 19:42:54 -05:00
Daniel J Walsh
d52a4dc2d4
Fix podman-remote info to show registry data
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-01-07 19:38:46 -05:00
OpenShift Merge Robot
c41fd09a8d
Merge pull request #4781 from haircommander/seccomp-profile-root
play kube: make seccomp handling better conform to k8s
2020-01-07 22:13:03 +01:00
Sorin Sbarnea
da0319fecd packaging: validate installed rpms
Previously we builded RPMs that contained an outdated conmon which was
not compatible. From now on `make-install` will also call
`podman version` and `podman info` in order to perform a minimal
sanity check of the installation.

Fixes: #4665
Signed-off-by: Sorin Sbarnea <ssbarnea@redhat.com>
2020-01-07 20:06:27 +00:00
OpenShift Merge Robot
bd3d8f4e28
Merge pull request #4788 from vrothberg/stale
github stale workflow: rephrase and bump close time
2020-01-07 18:57:54 +01:00
OpenShift Merge Robot
f85b3a01f0
Merge pull request #4774 from QiWang19/cp_src_path
fix bug copy from container directory
2020-01-07 16:10:05 +01:00
Valentin Rothberg
8094ee89ba github stale workflow: rephrase and bump close time
Rephrase the stale message to be friendlier and bump the closing time to
365 days.  The docs of the stale workflow do not indicate whether we can
not close, so a limit of 365 days seems fair.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-01-07 11:04:37 +01:00
Daniel J Walsh
b061bb276d
Don't show PASS on success for gitvalidate
Make test logs less verbose so that failures are easier to spot.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-01-06 17:18:18 -05:00
OpenShift Merge Robot
e362220971
Merge pull request #4800 from mheon/bump-1.7.0
Bump to v1.7.0
2020-01-06 22:54:11 +01:00
Matthew Heon
8e4a489e1b Bump gitvalidation epoch
Signed-off-by: Matthew Heon <mheon@redhat.com>
2020-01-06 15:16:38 -05:00
Matthew Heon
08849db4b0 Bump to v1.7.1-dev
Signed-off-by: Matthew Heon <mheon@redhat.com>
2020-01-06 15:16:38 -05:00
Matthew Heon
b7ce1157b0 Bump to v1.7.0
Signed-off-by: Matthew Heon <mheon@redhat.com>
2020-01-06 15:16:35 -05:00
OpenShift Merge Robot
2d8f1c8fda
Merge pull request #4762 from NevilleC/nc-issue4367
Generate binaries only if there are changes in src code.
2020-01-06 19:27:03 +01:00
OpenShift Merge Robot
2e0157a2d5
Merge pull request #4797 from edsantiago/policy_json_manpage
(minor) fix broken links to container-policy.json.5
2020-01-06 17:24:40 +01:00
Ed Santiago
6808ab34ea (minor) fix broken links to container-policy.json.5
Two man pages had incorrect references to a nonexistent
policy.conf(5) or policy-conf(5) [dot vs dash]. Fix them.

Also checked for other broken references via:

   $ for i in registries.conf storage.conf policy.json ; do grep -R $i.5 docs/source | grep -v containers-$i;done

(No further results found. That's not a guarantee that there
aren't other broken links though).

Signed-off-by: Ed Santiago <santiago@redhat.com>
2020-01-06 08:34:56 -07:00