Commit graph

13122 commits

Author SHA1 Message Date
Matthew Heon
accda2482e
Add container GID to additional groups
Mitigates a potential permissions issue. Mirrors Buildah PR #4200
and CRI-O PR #6159.

Signed-off-by: Matthew Heon <mheon@redhat.com>
(cherry picked from commit d82a41687e)
2022-09-22 17:52:48 +02:00
OpenShift Merge Robot
f122c54a6a
Merge pull request #15860 from edsantiago/fix_build_v34
[v3.4] fix build
2022-09-19 22:33:20 +02:00
Ed Santiago
1011a9a85e [v3.4] fix build
install.tools target broke a few weeks ago because it was fetching
something @latest.

We can't use 'go install' nor 'got get ...@version' on this branch,
so just delete the .gitvalidation steps entirely.

Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-09-19 11:25:43 -06:00
Daniel J Walsh
4ad9628989
Merge pull request #15805 from thediveo/rootless-musl
fix building pkg/rootless on musl
2022-09-14 14:20:06 -04:00
Harald Albrecht
32a96a774e fix building pkg/rootless on musl
Signed-off-by: Harald Albrecht <harald.albrecht@gmx.net>
2022-09-14 17:17:12 +02:00
OpenShift Merge Robot
0648084570
Merge pull request #15609 from edsantiago/disable_swagger_34
[v3.4] CI: disable swagger step
2022-09-02 13:00:20 +02:00
Ed Santiago
60fcbe1500 CI: disable swagger step
On this branch, /usr/local/bin/swagger is fetched on each run
(vs, on current 2022-08 main, installed at VM-setup time).
Something changed, and the new binary is very strict about
bugs in our swagger comments, of which there seem to be many.

Possible solution: fix our code. Doesn't seem worth the bother
for an old branch like this one.

Possible solution: re-fetch an old version of swagger tool.
Ditto.

This solution: just skip the swagger test. It seems unlikely
that anyone will make significant API changes on this branch.

Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-09-01 18:13:07 -06:00
OpenShift Merge Robot
3b48388f32
Merge pull request #15237 from dcermak/patch-2
[v3.4] Bump required go version to 1.15
2022-08-09 07:15:29 +00:00
Valentin Rothberg
28207391aa
fix e2e sign tests
The key used in the tests has expired.  Remove the expiration date to
turn CI happy and green.

Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
(cherry picked from commit de3d34b701)
2022-08-08 16:37:36 +02:00
Valentin Rothberg
b384f9f0bc
e2e: pull_test: speed up --all-tags
Pulling the K8s pause image seems unnecessarily expensive to me. Let's
use the testgitest_v2s2 one which is under our control and weighs only a
couple of KB.

This cut the execution time in less than half on my machine.  Since it's
network bound and I am running on fibre, I expect more significant speed
ups in slower networks.

Also fixes CI since the K8s pause image changed and broke the test.

Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
(cherry picked from commit 09ce748ee8)
2022-08-08 16:37:36 +02:00
Dan Čermák
88e250eff7
Bump required go version to 1.15
Podman fails to build with go 1.13 with:
```
vendor/golang.org/x/net/http2/transport.go:417:45: undefined: os.ErrDeadlineExceeded
```
Updating go to 1.15 fixes this issue.
[NO NEW TESTS NEEDED]

Signed-off-by: Dan Čermák <dcermak@suse.com>
2022-08-08 13:25:21 +02:00
OpenShift Merge Robot
795ff8e7ad
Merge pull request #15078 from cevich/v3.4_latest_imgts
[v3.4] [CI:DOCS] Cirrus: Use the latest imgts container
2022-07-26 21:48:25 +02:00
Chris Evich
8c9c928476
[CI:DOCS] Cirrus: Use the latest imgts container
Contains important updates re: preserving release-branch CI VM images.
Ref: https://github.com/containers/automation_images/pull/157

Signed-off-by: Chris Evich <cevich@redhat.com>
2022-07-26 15:12:34 -04:00
openshift-ci[bot]
297275db85
Merge pull request #14649 from cevich/v3.4_reduce_testing
[v3.4] Cirrus: Prune testing tasks for long-term reliability
2022-07-05 13:15:42 +00:00
Chris Evich
ed2f598b55
CI: Skip 'podman search no-trunc flag' test
This test has a sorted history on `main` to cope with behavior changes
in both podman and results from the registry.  Since this is a long-term
release branch, the benefit of having this test (against a modern
registry) outweighs the cost of flakes and maintenance.  Simply disable
it.

Signed-off-by: Chris Evich <cevich@redhat.com>
2022-06-21 15:25:55 -04:00
Pascal Bourdier
fbf8e96c09
CI: fix golangci-lint installation
avoid this warn:
```
golangci/golangci-lint info installed ./bin/golangci-lint
golangci/golangci-lint err this script is deprecated, please do not use it anymore. check https://github.com/goreleaser/godownloader/issues/207
```

Signed-off-by: Pascal Bourdier <pascal.bourdier@gmail.com>
Signed-off-by: Chris Evich <cevich@redhat.com>
2022-06-17 12:24:29 -04:00
Chris Evich
42f39bcbe4
Cirrus: Prune testing tasks for long-term reliability
As release branches age, it becomes less valuable to execute
comprehensive CI testing.  Further given occasional flakes, it becomes
more burdensome to maintain.  Trim back some non-essential testing tasks
for improved long-term reliability and reduced maintenance.

Signed-off-by: Chris Evich <cevich@redhat.com>
2022-06-17 12:10:35 -04:00
OpenShift Merge Robot
ebcdf2b586
Merge pull request #13933 from mheon/bump_347
Bump to v3.4.7
2022-04-20 15:38:28 -04:00
Matthew Heon
cd1d1ad15d Bump to v3.4.8-dev
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2022-04-20 13:42:37 -04:00
Matthew Heon
74d67f5d43
Bump to v3.4.7
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2022-04-20 13:42:17 -04:00
Matthew Heon
bc14bc51bd Update release notes for v3.4.7
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2022-04-20 13:41:56 -04:00
OpenShift Merge Robot
507224f4bd
Merge pull request #13875 from vrothberg/3.4-backports
[v3.4] fix CVE-2022-1227
2022-04-14 15:29:21 -04:00
Valentin Rothberg
f7bb8c4495 fix CVE-2022-1227
Vendor in the backports for psgo.  Note that we cannot use psgo v1.7.1+
as v1.7.2 bumped too many dependencies.

Hence psgo has a v1.7.1-fedora branch that will be used for Podman v3.4.x
for Fedora.  The v3.4.2-rhel branch uses c/storage v1.36.x so we need a
separate branches in psgo for Fedora and RHEL.

Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
2022-04-14 15:27:58 +02:00
OpenShift Merge Robot
2bad02d494
Merge pull request #13858 from mheon/bump_346
[CI:DOCS] Bump to v3.4.6
2022-04-13 12:03:39 -04:00
Matthew Heon
7c7020ba16 Update readme version
Signed-off-by: Matthew Heon <mheon@redhat.com>
2022-04-13 11:24:12 -04:00
Matthew Heon
013f946edd Bump to v3.4.7-dev
Signed-off-by: Matthew Heon <mheon@redhat.com>
2022-04-13 10:33:55 -04:00
Matthew Heon
fb659cb530
Bump to v3.4.6
Signed-off-by: Matthew Heon <mheon@redhat.com>
2022-04-13 10:33:35 -04:00
Matthew Heon
4abb7137f2 Add release notes for v3.4.6
Signed-off-by: Matthew Heon <mheon@redhat.com>
2022-04-13 10:33:14 -04:00
OpenShift Merge Robot
f83adcc57e
Merge pull request #13850 from mheon/bump_345
Bump to v3.4.5
2022-04-12 17:17:40 -04:00
OpenShift Merge Robot
16f7a75033
Merge pull request #13848 from lsm5/v3.4-cve-2022-27191-backport
[v3.4 backport] Bump golang.org/x/crypto to 7b82a4e
2022-04-12 16:57:38 -04:00
Lokesh Mandvekar
c02d993f6a
Bump golang.org/x/crypto to 7b82a4e
Resolves: GHSA-8c26-wmh5-6g9v - CVE-2022-27191

Podman doesn't seem to be directly affected as the logic in question
is not called.

golang.org/x/crypto@1baeb1ce contains the actual CVE fix. Using the
latest upstream commit to also include support for SHA-2.

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2022-04-12 15:23:26 -04:00
Matthew Heon
19b9f4cb5d Bump to v3.4.6-dev
Signed-off-by: Matthew Heon <mheon@redhat.com>
2022-04-12 14:28:27 -04:00
Matthew Heon
f8d2853259 Bump to v3.4.5
Signed-off-by: Matthew Heon <mheon@redhat.com>
2022-04-12 14:28:08 -04:00
Giuseppe Scrivano
6ebfaa0381 test: fix podman run test as rootless
aafa80918a introduced the regression.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
(cherry picked from commit 640c2d53a8)
2022-04-12 14:27:49 -04:00
Giuseppe Scrivano
8292fc0a44 do not set the inheritable capabilities
The kernel never sets the inheritable capabilities for a process, they
are only set by userspace.  Emulate the same behavior.

Closes: CVE-2022-27649

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
(cherry picked from commit aafa80918a)
2022-04-12 14:27:41 -04:00
Matthew Heon
02bd13031e Release notes for v3.4.5
Signed-off-by: Matthew Heon <mheon@redhat.com>
2022-04-12 14:27:13 -04:00
OpenShift Merge Robot
62d4f75923
Merge pull request #13591 from dcermak/backport-storage-autodetect-mount_program
Backport of https://github.com/containers/podman/pull/13536 to 3.4
2022-03-29 13:56:02 +02:00
Dan Čermák
efe943f669
Backport of https://github.com/containers/podman/pull/13536 to 3.4
Signed-off-by: Dan Čermák <dcermak@suse.com>
2022-03-28 18:06:31 +02:00
OpenShift Merge Robot
599d785b9e
Merge pull request #13652 from lsm5/v3.4-cve-2022-21698
Bump github.com/prometheus/client_golang to v1.11.1
2022-03-24 19:55:44 +01:00
Lokesh Mandvekar
a22a75d5fc
Bump github.com/prometheus/client_golang to v1.11.1
Resolves: CVE-2022-21698

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2022-03-24 13:35:08 -04:00
OpenShift Merge Robot
b51ce669a1
Merge pull request #13501 from vrothberg/v3.4-backports
[v.3.4] vendor containers/common@v0.44.5
2022-03-14 10:30:26 -04:00
Valentin Rothberg
5b952cb45d [v.3.4] vendor containers/common@v0.44.5
Backports for github.com/containers/podman/issues/11997
to fix a performance regression when listing images.

Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
2022-03-14 10:52:06 +01:00
OpenShift Merge Robot
f1d510b682
Merge pull request #13290 from cevich/v3.4_since_after_tests
Fix AssertionError: 'alpine' not found in 'docker.io/docker/desktop-kubernetes'
2022-02-21 16:51:37 -05:00
Chris Evich
4fa7a2e3ae
Disable search-images test
Found images being returned which do have "Alpine" in the description.
However, test fails because podman truncates the field.  Disabling test
since this is a long-term maintenance branch.

Signed-off-by: Chris Evich <cevich@redhat.com>
2022-02-21 10:54:04 -05:00
Ed Santiago
e906e9cd37
[CI:DOCS] logformatter: handle python logs
We've got some python tests running in CI, and they're really hard
to troubleshoot. This PR:

  1) colorizes python unittest lines (ok / skipped / fail), and
  2) links to source files

The color is nice for skimming, but it's the linking that might
make it much easier to diagnose future failures.

(Context: failure today in test/python/docker/compat/test_images.py)

Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-02-18 12:00:15 -05:00
Brent Baude
2fd1ff9d1e
Changes of docker descriptions
It looks like some descriptions have changed on the docker registry
where we had been searching for images that include 'alpine'.  We are
now seeing an image in the initial list that has 'alpine' in its
description.

Signed-off-by: Brent Baude <bbaude@redhat.com>
2022-02-18 11:52:02 -05:00
Brent Baude
ce5359f54c
Fix images since/after tests
For the since and after imagve filter tests, instead of using the
read-only cache of images, we just use the empty r/w store.  We then
build three images that are strictly predictable.

Signed-off-by: Brent Baude <bbaude@redhat.com>
2022-02-18 11:51:46 -05:00
OpenShift Merge Robot
a54320a793
Merge pull request #13020 from zeha/12975-fix-12327
Makefile: fix darwin detection
2022-01-26 17:12:17 +01:00
Chris Hofstaedtler
daeade5421 Makefile: fix darwin detection
NATIVE_GOOS does not exist in the 3.4 branch, only on main.
Fixes my backport #12327. Verified to fix #12975 (again) for me.

Signed-off-by: Chris Hofstaedtler <chris.hofstaedtler@deduktiva.com>
2022-01-26 14:16:31 +01:00
OpenShift Merge Robot
63134a1ef8
Merge pull request #12831 from edsantiago/emergency_buildah_skips
[v3.4] buildah bud tests: skip failing tests
2022-01-12 20:30:19 +01:00