8617 Commits

Author SHA1 Message Date
ddc48f8ded Merge pull request #8937 from cevich/quiet_v2.0_branch
Quiet v2.0 branch
2021-01-11 13:36:43 -05:00
76d6c5ca2f Cirrus: Disable almost all testing
Signed-off-by: Chris Evich <cevich@redhat.com>
2021-01-11 10:57:46 -05:00
90b2e36c4e Cirrus: Disable IRC notifications
Signed-off-by: Chris Evich <cevich@redhat.com>
2021-01-11 10:51:30 -05:00
547464172c Merge pull request #7556 from vrothberg/2.0-images-panic
[2.0] make image parent check more robust
2020-09-08 10:14:52 -04:00
8f99530221 make image parent check more robust
Follow up on issue #7444 and make the parent checks more robust.
We can end up with an incoherent storage when, for instance, a
build has been killed.

Backport of commit a6f8586 and commit 238abf6.  Squashed for easier
tracking and referencing.

Fixes: #7444
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1876576

Signed-off-by: Brent Baude <bbaude@redhat.com>
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-09-08 10:37:54 +02:00
5b72534c92 Merge pull request #7549 from rhatdan/v2.0
[2.0] Vendor in containers/storage v1.20.4
2020-09-07 09:36:31 -04:00
54c5f6c010 Vendor in containers/storage v1.20.4
This will allow the passing down of the ignore_chown_errors flag from
/etc/containers/storage.conf for rootless containers.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-09-06 06:39:20 -04:00
421600be2e Merge pull request #7523 from mheon/bump_206_final
Bump to v2.0.6 Final
2020-09-01 12:46:13 -04:00
ce7b78a43a Bump to v2.0.7-dev
Signed-off-by: Matthew Heon <mheon@redhat.com>
2020-09-01 11:27:44 -04:00
27362ba1ad Bump to v2.0.6
Signed-off-by: Matthew Heon <mheon@redhat.com>
v2.0.6
2020-09-01 11:27:44 -04:00
5843e417c9 Update release notes for v2.0.6
Signed-off-by: Matthew Heon <mheon@redhat.com>
2020-09-01 11:27:41 -04:00
d34b1e7ad5 Ensure rootless containers without a passwd can start
We want to modify /etc/passwd to add an entry for the user in
question, but at the same time we don't want to require the
container provide a /etc/passwd (a container with a single,
statically linked binary and nothing else is perfectly fine and
should be allowed, for example). We could create the passwd file
if it does not exist, but if the container doesn't provide one,
it's probably better not to make one at all. Gate changes to
/etc/passwd behind a stat() of the file in the container
returning cleanly.

Fixes #7515

Signed-off-by: Matthew Heon <mheon@redhat.com>
2020-09-01 10:59:34 -04:00
9edf80d934 Preserve passwd on container restart
We added code to create a `/etc/passwd` file that we bind-mount
into the container in some cases (most notably,
`--userns=keep-id` containers). This, unfortunately, was not
persistent, so user-added users would be dropped on container
restart. Changing where we store the file should fix this.

Further, we want to ensure that lookups of users in the container
use the right /etc/passwd if we replaced it. There was already
logic to do this, but it only worked for user-added mounts; it's
easy enough to alter it to use our mounts as well.

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2020-09-01 10:59:26 -04:00
d87e26ec76 Merge pull request #7502 from Luap99/v2.0-remote
V2.0: Futher --remote flag backports
2020-08-30 13:02:41 -04:00
b64d29bdf2 Remove help/usage from --remote pre-check
--remote pre-check was providing usage context, which was also being
provided by the root podman command.

Fixes #7273

Signed-off-by: Jhon Honce <jhonce@redhat.com>
2020-08-30 15:39:01 +02:00
8b38d27ebd system tests: podman-remote, image tree
- new sanity checks for podman-remote:
  - first, confirm that when PODMAN is "-remote",
    we actually talk to a server (validated by
    presence of "Server:" string in "podman version").
  - second, add test for #7212, in which we run
    "podman --remote" (podman with --remote flag,
    not podman-remote command) and make sure --remote
    is allowed both as the first option and also
    with other flag options preceding.

- new test for "podman image tree" (piggybacking on
  top of a "podman build" test, because that gives
  us lots of layers).

- skip "podman exec - basic test" when remote. It is consistently
  causing CI failures, breaking all of CI, due to #7241.

Signed-off-by: Ed Santiago <santiago@redhat.com>
2020-08-30 12:11:19 +02:00
33cf7aec51 Refactor parsing to not require --remote to be first
Use cobra.Command.FParseErrWhitelist to no longer require --remote to be
the first argument in flags when using CLI

Signed-off-by: Jhon Honce <jhonce@redhat.com>
2020-08-30 12:11:19 +02:00
3ae1cd806c Merge pull request #7491 from Luap99/2.0-remoteflag
Enable --remote flag v2.0
2020-08-28 15:34:30 -04:00
e17cd49a78 Enable --remote flag
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-08-28 18:24:09 +02:00
145a366d0f Merge pull request #7488 from mheon/206_rc1
Bump to v2.0.6-rc1
2020-08-28 12:10:47 -04:00
dc006c1640 Bump to v2.0.6-dev
Signed-off-by: Matthew Heon <mheon@redhat.com>
2020-08-28 11:07:02 -04:00
f27d00f13e Bump to v2.0.6-rc1
Signed-off-by: Matthew Heon <mheon@redhat.com>
v2.0.6-rc1
2020-08-28 11:06:43 -04:00
d6e948aaf6 Update release notes for v2.0.6
Signed-off-by: Matthew Heon <mheon@redhat.com>
2020-08-28 11:04:28 -04:00
538273e696 Merge pull request #7478 from ashley-cui/2.0docs
[CI:DOCS] remote doc fixes
2020-08-28 05:44:18 -04:00
d1593e6a85 Merge pull request #7483 from TomSweeneyRedHat/dev/tsweeney/bumpcommonv2
Bump c/common to v0.14.10 and c/conmon to v2.0.20
2020-08-27 20:12:37 -04:00
023c4fadf5 Bump c/common to v0.14.10 and c/conmon to v2.0.20
As the title says.

Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
2020-08-27 16:38:44 -04:00
2e5c620a29 [CI:DOCS] Update podman-remote docs
Add support for multi level subcommands.
e.g. podman system connection.

Update the flags and add note for containers.conf.

Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
2020-08-27 15:00:42 -04:00
b0d4f08743 [CI:DOCS] Making docs build on mac
sed syntax on mac is different

Signed-off-by: Ashley Cui <acui@redhat.com>
2020-08-27 15:00:35 -04:00
9c8e0a0f25 Merge pull request #7475 from baude/v2triminit
abi: trim init command
2020-08-27 13:40:29 -04:00
4da3677e3f abi: trim init command
without it the systemd detection fails.

Closes: https://github.com/containers/podman/issues/7441

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2020-08-27 10:38:56 -05:00
679da6c61b Merge pull request #7450 from baude/v2msiremotestuff
podman-remote fixes for msi and client
2020-08-26 05:14:24 -04:00
31180fa2b1 podman-remote fixes for msi and client
correct small typo that sets the path on windows via the msi xml.

in the remote client, prompt for SSH password when no identity or alternate means of authentication are provided.

Signed-off-by: Brent Baude <bbaude@redhat.com>
2020-08-25 15:20:27 -05:00
374b2c65cf Merge pull request #7443 from mheon/undo_our_hacks
Undo v2.0 branch hacks
2020-08-25 14:37:03 -04:00
c02fe7e9d6 Merge pull request #7439 from edsantiago/fix_failing_userns_test
run test: use explicit uid/gid
2020-08-25 13:15:22 -04:00
b7828b7ce4 Update c/storage to v1.20.3
This includes an important patch to fix a CI issue where the
cleanup process's unmount of a container was not being
registered by `podman system service`.

Signed-off-by: Matthew Heon <mheon@redhat.com>
2020-08-25 13:06:00 -04:00
ab4283c5a6 Revert "HACK: Disable build-each-commit"
This reverts commit 44e5d0c1e8272f92d0fa6d41075a0127b241f003. We
temporarily disabled this for the last few backports for 2.0.5,
given how painful the libpod->podman move made things. We do not
want to keep this around long-term, each commit should be
required to build.

Signed-off-by: Matthew Heon <mheon@redhat.com>
2020-08-25 13:04:36 -04:00
c1a6e67183 Revert "HACK: Manually include c/storage #698"
This reverts commit ae2ee65eff71c5780e4484f1316dbbdd87bf1760.
This was a horrible hack that we did for time reasons, to get
2.0.5 out on schedule; now that it has been merged into c/storage
properly we no longer need or want it.

Signed-off-by: Matthew Heon <mheon@redhat.com>
2020-08-25 13:03:01 -04:00
a60b4cc1d8 run test: use explicit uid/gid
Fixes Fedora gating test failure: if the host tests are running
under UID 1000, --userns=keep-id will (of course) add current
user as 1000, and the in-container 'adduser' will assign 1001.
To prevent that, assign UID 4242 (and hope that that's not
our calling user's UID).

Signed-off-by: Ed Santiago <santiago@redhat.com>
2020-08-25 07:26:23 -06:00
024f47068a Merge pull request #7402 from mheon/last_pr_before_205_really_this_time
Final v2.0.5 backports
2020-08-24 18:35:59 -04:00
13d5b2d661 Bump to v2.0.6-dev
Signed-off-by: Matthew Heon <mheon@redhat.com>
2020-08-24 15:19:20 -04:00
776abc5210 Bump to v2.0.5
Signed-off-by: Matthew Heon <mheon@redhat.com>
v2.0.5
2020-08-24 15:18:09 -04:00
ae2ee65eff HACK: Manually include c/storage #698
We need this release out by end of day, so we don't have time to
do this right. Disable the vendor task and manually add c/storage
PR #698 to the vendored copy of c/storage to make the tests pass.

Once #698 merges into c/storage, we need to remove this commit
and backport it to the v1.20 stable branch, then cut a release
there.

Signed-off-by: Matthew Heon <mheon@redhat.com>
2020-08-24 15:10:53 -04:00
884355c681 Final release notes update for v2.0.5.
Really. I promise. No more after this.

Signed-off-by: Matthew Heon <mheon@redhat.com>
2020-08-24 11:31:37 -04:00
c5723785b7 Clean up pods before returning from Pod Stop API call
This should help alleviate races where the pod is not fully
cleaned up before subsequent API calls happen.

Signed-off-by: Matthew Heon <mheon@redhat.com>
2020-08-24 11:31:37 -04:00
484bd0af1d Ensure pod infra containers have an exit command
Most Libpod containers are made via `pkg/specgen/generate` which
includes code to generate an appropriate exit command which will
handle unmounting the container's storage, cleaning up the
container's network, etc. There is one notable exception: pod
infra containers, which are made entirely within Libpod and do
not touch pkg/specgen. As such, no cleanup process, network never
cleaned up, bad things can happen.

There is good news, though - it's not that difficult to add this,
and it's done in this PR. Generally speaking, we don't allow
passing options directly to the infra container at create time,
but we do (optionally) proxy a pre-approved set of options into
it when we create it. Add ExitCommand to these options, and set
it at time of pod creation using the same code we use to generate
exit commands for normal containers.

Fixes #7103

Signed-off-by: Matthew Heon <mheon@redhat.com>

<MH: Fixed cherry-pick conflicts>

Signed-off-by: Matthew Heon <mheon@redhat.com>
2020-08-24 11:31:37 -04:00
23251149ab error when adding container to pod with network information
because a pod's network information is dictated by the infra container at creation, a container cannot be created with network attributes.  this has been difficult for users to understand.  we now return an error when a container is being created inside a pod and passes any of the following attributes:

* static IP (v4 and v6)
* static mac
* ports -p (i.e. -p 8080:80)
* exposed ports (i.e. 222-225)
* publish ports from image -P

Signed-off-by: Brent Baude <bbaude@redhat.com>

<MH: Fixed cherry pick conflicts and compile>

Signed-off-by: Matthew Heon <mheon@redhat.com>
2020-08-24 11:31:37 -04:00
c78c6b44ce Merge pull request #7410 from rhatdan/v2.0
Vendor in containers/common v0.14.9
2020-08-24 08:59:22 -04:00
6505322c51 Vendor in containers/common v0.14.9
This will fix the localions of the containers.conf file
on Windows and MacOS Boxes.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-08-23 06:41:37 -04:00
e06cb25e81 Merge pull request #7399 from rhatdan/v2.0
In podman 1.* regression on --cap-add
2020-08-21 19:22:22 +02:00
7ed653804c In podman 1.* regression on --cap-add
In podman 1.0 if  you executed a command like:

podman run --user dwalsh --cap-add net_bind_service alpine nc -l 80

It would work, and the user dwalsh would get the capability,  in
podman 2.0, only root and the binding set gets the capability.

This change restores us back to the way podman 1.0 worked.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-08-21 10:55:22 -04:00