Commit graph

11866 commits

Author SHA1 Message Date
Valentin Rothberg
f2b3da5025 [v3.2] vendor containers/common@v0.38.7
* libimage: pull: turn image-lookup errors non-fatal

Prevents https://bugzilla.redhat.com/show_bug.cgi?id=1966872 from being
introduced with v3.2.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2021-06-09 15:37:56 +02:00
OpenShift Merge Robot
d22b54442e
Merge pull request #10605 from baude/3.2hvf
Correct qemu options for Intel macs
2021-06-09 11:09:52 +02:00
OpenShift Merge Robot
b0eeca695d
Merge pull request #10608 from vrothberg/v3.2-vendor-common
[v3.2] vendor containers/common@v0.38.6
2021-06-09 11:04:51 +02:00
Valentin Rothberg
78430ee1d4 [v3.2] vendor containers/common@v0.38.6
Fixes the seccomp-profile regression in v3.2

Fixes: #10556
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2021-06-09 09:22:01 +02:00
Brent Baude
b6ef7cf21d Correct qemu options for Intel macs
On intel macs, we need to accel=hvf to work correctly.

Fixes: #10555

[NO TESTS NEEDED]

Signed-off-by: Brent Baude <bbaude@redhat.com>
2021-06-08 13:45:07 -05:00
OpenShift Merge Robot
c7e96edfb2
Merge pull request #10552 from mheon/bump_320
Bump to v3.2.0
2021-06-03 22:00:47 +02:00
Matthew Heon
9647d88449 Ensure minimum API version is set correctly in tests
Signed-off-by: Matthew Heon <mheon@redhat.com>
2021-06-03 14:46:04 -04:00
Matthew Heon
72455ece42 Bump to v3.2.1-dev
Signed-off-by: Matthew Heon <mheon@redhat.com>
2021-06-03 14:10:39 -04:00
Matthew Heon
0281ef262d Bump to v3.2.0
Signed-off-by: Matthew Heon <mheon@redhat.com>
2021-06-03 14:10:39 -04:00
Paul Holzinger
cff73766fc Fix network create macvlan with subnet option
Creating a macvlan network with the subnet or ipRange option should set
the ipam plugin type to `host-local`. We also have to insert the default
route.

Fixes #10283

Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
2021-06-03 14:10:39 -04:00
Matthew Heon
8688f54eac Final release notes updates for v3.2.0
Signed-off-by: Matthew Heon <mheon@redhat.com>
2021-06-03 14:10:39 -04:00
Paul Holzinger
f62c6bf6ec add ipv6 nameservers only when the container has ipv6 enabled
The containers /etc/resolv.conf allways preserved the ipv6 nameserves
from the host even when the container did not supported ipv6. Check
if the cni result contains an ipv6 address or slirp4netns has ipv6
support enabled and only add the ipv6 nameservers when this is the case.

The test needs to have an ipv6 nameserver in the hosts /etc/hosts but we
should never mess with this file on the host. Therefore the test is
skipped when no ipv6 is detected.

Fixes #10158

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2021-06-03 13:56:48 -04:00
Matej Vasek
4b8ca63039 Use request context instead of background
This prevents goroutine leak:
If background context were used then push operation would continue even
if client aborted request by closing connection.

[NO TESTS NEEDED]

Signed-off-by: Matej Vasek <mvasek@redhat.com>
2021-06-03 13:54:57 -04:00
OpenShift Merge Robot
326c758bfd
Merge pull request #10534 from vrothberg/v3.2-fix-10507
[v.3.2] events: support disjunctive filters
2021-06-02 23:26:55 +02:00
Valentin Rothberg
ce5c3b5543 [v.3.2] events: support disjunctive filters
While different filters are applied in conjunction, the same filter (but
with different values) should be applied in disjunction.  This allows,
for instance, to query the events of two containers.

Fixes: #10507
Backport-of: commit 37f39eefee
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2021-06-02 16:38:54 +02:00
OpenShift Merge Robot
4b202ae29b
Merge pull request #10532 from edsantiago/mount_colon_z
[v3.2] System tests: add :Z to volume mounts
2021-06-02 10:29:59 -04:00
Ed Santiago
dd83f5c0cd System tests: add :Z to volume mounts
selinux-policy-34.9-1.fc34 breaks a behavior we've relied on
since (at least) January 2020:

   - Revert "Add permission open to files_read_inherited_tmp_files()
     interface"

That's probably the correct thing to do, but it breaks our
existing tests. Solution: add ':Z' where needed.

Tested on Ed's laptop, which has the offending selinux-policy
as of 2021-05-31. Tests pass root and rootless. (I mention
this because tests will obviously pass in CI, which has a
much older selinux-policy).

Signed-off-by: Ed Santiago <santiago@redhat.com>
2021-06-02 05:19:20 -06:00
OpenShift Merge Robot
96c0aa688b
Merge pull request #10509 from vrothberg/v3.2-cherry-pick-53072184192e9952daa3a84bc6f55c15e9ea352e
[v3.2] generate systemd: make mounts portable
2021-06-01 19:00:48 +02:00
Valentin Rothberg
32927f5d66 generate systemd: make mounts portable
Commit 748826fc88 fixed a bug where slow mounting of the runroot was
causing issues when the units are started at boot.  The fix was to add
the container's runroot to the required mounts; the graph root has been
added as well.

Hard-coding the run- and graphroot to the required mounts, however,
breaks the portability of units generated with --now.  Those units are
intended to be running on any machine as, theoreticaly, any user.

Make the mounts portable by using the `%t` macro for the run root.
Since the graphroot's location varies across root and ordinary users,
drop it from the list of required mounts.  The graphroot was not causing
issues.

Fixes: #10493
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2021-05-31 14:56:45 +02:00
OpenShift Merge Robot
ba1dac7405
Merge pull request #10505 from vrothberg/v3.2-vendor-storage
vendor containers/storage@v1.31.3
2021-05-31 13:51:33 +02:00
Valentin Rothberg
abb57e5cf4 vendor containers/storage@v1.31.3
* store: ReloadIfChanged propagates errors from Modified()
* store: load additional image stores once
* store: fix graphLock reload

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2021-05-31 09:56:56 +02:00
Daniel J Walsh
6f28b151b6
Merge pull request #10484 from vrothberg/3.2-vendor-common
vendor containers/common@v0.38.5
2021-05-27 13:00:08 -04:00
Valentin Rothberg
1e45631829 vendor containers/common@v0.38.5
* pull: don't resolve short names on explicit docker:// reference

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2021-05-27 15:35:37 +02:00
OpenShift Merge Robot
06db724d03
Merge pull request #10473 from mheon/bump_320_rc3
[CI:DOCS] Bump to v3.2.0-RC3
2021-05-26 17:29:21 +02:00
Matthew Heon
fbf8b78a39 Bump to v3.2.0-dev
Signed-off-by: Matthew Heon <mheon@redhat.com>
2021-05-26 11:04:03 -04:00
Matthew Heon
6847294827
Bump to v3.2.0-RC3
Signed-off-by: Matthew Heon <mheon@redhat.com>
2021-05-26 11:03:21 -04:00
OpenShift Merge Robot
a5a2416b35
Merge pull request #10461 from mheon/rc3_backports
Backports for v3.2.0-RC3
2021-05-26 16:51:21 +02:00
Matthew Heon
f49023031d Update release notes for v3.2.0-RC3
Signed-off-by: Matthew Heon <mheon@redhat.com>
2021-05-25 15:28:10 -04:00
Daniel J Walsh
ee5dd06035 Fix race on podman start --all
Make sure all containers exit after start

There is a race condition in that container could still be running when
we attempt to remove them.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2021-05-25 15:28:03 -04:00
Daniel J Walsh
6c9de93823 Fix race condition in running ls container in a pod
All of the tests has an assumption that RunLsContainer and RunLsContainerInPod completes
the container before returning.  But since the container is running
in back ground mode, the container could be still running before tools
attempt to remove it. Removing the "-d" from the command fixes the
container to match the assumption.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2021-05-25 15:27:57 -04:00
Valentin Rothberg
69bae4774b docs: --cert-dir: point to containers-certs.d(5)
Point to containers-certs.d(5) for details on the default paths, the
lookup logic and the structure of these directories.  Previously, the
man pages stated that the default path would be in `/etc/containers/...`
which is not entirely and a red herring for users (see #10116).

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2021-05-25 15:27:38 -04:00
Daniel J Walsh
934f36df5e Handle hard links in different directories
Fixes: https://github.com/containers/podman/issues/10444

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2021-05-25 15:27:22 -04:00
Daniel J Walsh
5eecc2761b Improve OCI Runtime error
ErrOCIRuntimeNotFound error is misleading. Try to make it more
understandable to the user that the OCI Runtime IE crun or runc is not
missing, but the command they attempted to run within the container is
missing.

[NO TESTS NEEDED] Regular tests should handle this.

Fixes: https://github.com/containers/podman/issues/10432

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2021-05-25 15:27:04 -04:00
Daniel J Walsh
ba884865c5 Handle hard links in remote builds
Fixes: https://github.com/containers/podman/issues/9893

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2021-05-25 15:25:02 -04:00
flouthoc
c53638e9f6 Podman info add support for status of cgroup controllers
Signed-off-by: flouthoc <flouthoc.git@gmail.com>
2021-05-25 15:19:03 -04:00
Daniel J Walsh
ac8b7ddd8d Drop container does not exist on removal to debugf
We have race conditions where a container can be removed
by two different processes when running podman --remove rm.

It can be cleaned up in the API or by the conmon executing
podman container cleanup.

When we fail to remove a container that does not exists we should
not be printing errors or warnings, we should just debug the fact.

[NO TESTS NEEDED] Since this is a race condition it is difficult to
test.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2021-05-25 15:17:35 -04:00
Jhon Honce
18e917cdc3 Downgrade API service routing table logging
[NO TESTS NEEDED]

* Log the routing table output at Trace vs. Debug level. Reduce noise
  in debugging output.
* Tweak SDNotify message to report Warn when it fails. Previously
  failures were silent.

Signed-off-by: Jhon Honce <jhonce@redhat.com>
2021-05-25 15:15:50 -04:00
Valentin Rothberg
efa15b96c5 add libimage events
libimage now supports events which `libpod.Runtime` now uses for image
events.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>

<MH: Removed vendor bits, kept other changes>

Signed-off-by: Matthew Heon <mheon@redhat.com>
2021-05-25 15:15:41 -04:00
Valentin Rothberg
a9108ab258 docs: generate systemd: XDG_RUNTIME_DIR
A conversation on the customer portal suggests that to add an extra note
about the requirement of XDG_RUNTIME_DIR to be set.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2021-05-25 15:11:16 -04:00
Daniel J Walsh
bb589bec24 Fix problem copying files when container is in host pid namespace
When attempting to copy files into and out of running containers
within the host pidnamespace, the code was attempting to join the
host pidns again, and getting an error. This was causing the podman
cp command to fail. Since we are already in the host pid namespace,
we should not be attempting to join.  This PR adds a check to see if
the container is in NOT host pid namespace, and only then attempts to
join.

Fixes: https://github.com/containers/podman/issues/9985

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2021-05-25 14:44:20 -04:00
OpenShift Merge Robot
b909bcaed6
Merge pull request #10418 from mheon/bump_320_rc2
[CI:DOCS] Bump to v3.2.0-RC2
2021-05-20 16:43:17 -04:00
Matthew Heon
67055365c2 Bump to v3.2.0-dev
Signed-off-by: Matthew Heon <mheon@redhat.com>
2021-05-20 16:15:52 -04:00
Matthew Heon
e849ba2013 Bump to v3.2.0-RC2
Signed-off-by: Matthew Heon <mheon@redhat.com>
2021-05-20 16:15:40 -04:00
OpenShift Merge Robot
5d1e39b456
Merge pull request #10415 from mheon/32_vendor
[v3.2] Update vendors of container projects
2021-05-20 16:13:18 -04:00
Valentin Rothberg
32dd933a7e update c/common
Update containers common to the latest HEAD.  Some bug fixes in libimage
forced us to have a clearer separation between ordinary images and
manifest lists.  Hence, when looking up manifest lists without recursing
into any of their instances, we need to use `LookupManifestList()`.

Also account for some other changes in c/common (e.g., the changed order
in the security labels).

Further vendor the latest HEAD from Buildah which is required to get the
bud tests to pass.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>

<MH: Stripped out vendor bits - just left remaining changes>

Signed-off-by: Matthew Heon <mheon@redhat.com>
2021-05-20 14:47:51 -04:00
Matthew Heon
0649552f2b Update Cirrus DEST_BRANCH to v3.2
Signed-off-by: Matthew Heon <mheon@redhat.com>
2021-05-20 13:54:18 -04:00
Matthew Heon
902507513c Updated vendors of c/image, c/storage, Buildah
Last PR before 3.2.0-RC2

Signed-off-by: Matthew Heon <mheon@redhat.com>
2021-05-20 13:30:25 -04:00
OpenShift Merge Robot
fe0595683a
Merge pull request #10388 from mheon/release_notes_320rc2
[CI:DOCS] Release notes for v3.2.0-RC2
2021-05-20 06:00:21 -04:00
Matthew Heon
38ec00c24a Initial release notes for v3.2.0-RC2
Missing the updated vendor bits, but the vendor dance is not yet
done.

Signed-off-by: Matthew Heon <mheon@redhat.com>
2021-05-19 10:22:21 -04:00
Matthew Heon
f88de46b26 Add script for identifying commits in release branches
One of the worst parts of a Podman release is writing the release
notes. It requires manually going through all merged commits
since the last release, figuring out what was actually done, and
writing a small blurb about what was fixed. The worst part of
this is the difficulty in finding the commits that were actually
included in previous releases - our extensive backports to prior
releases mean that there are usually dozens of commits that were
included in a prior release, but do not have a matching SHA (as
the original author did not do the backport, and often the commit
required massaging to cherry-pick in).

This script automates the job of finding commits in one release
branch that are not in another, with filtering to remove most
cherry-picked commits. It makes my life a lot easier during
releases, so I figured I'd include it in hack/ so anyone else
stuck with the enjoyable task of writing release notes can have a
slightly easier life.

The script is written in absolutely terrible Ruby and its
performance is absolutely terrible, but you only need to run it
once per major release and a 30-second wait to generate the list
of commits to include isn't bad.

Signed-off-by: Matthew Heon <mheon@redhat.com>
2021-05-18 09:42:07 -04:00