Commit graph

15967 commits

Author SHA1 Message Date
openshift-merge-bot[bot]
62527ab229
Merge pull request #25542 from Luap99/v4.2.0-rhel-crypto
[v4.2.0-rhel] CVE-2025-22869: bump to golang.org/x/crypto@v0.36.0
2025-03-12 08:47:17 +00:00
Paul Holzinger
d845f861d7
cirrus: remove pre/postbuild
This branch is so old it doesn't use these scripts.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2025-03-11 19:42:06 +01:00
Paul Holzinger
f34c2726fc
vendor: bump to golang.org/x/crypto@v0.36.0
Fixes: CVE-2025-22869
Fixes: https://issues.redhat.com/browse/RHEL-81320
Fixes: https://issues.redhat.com/browse/RHEL-81301
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2025-03-11 19:18:53 +01:00
Paul Holzinger
2b3867e8c1
cirrus: only run single build
Update cirrus.yml to the latest image based of 5.4-rhel, then disable
validate as there no point for it when we do backports. And only
perform a single build on the f41.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2025-03-11 19:18:48 +01:00
openshift-merge-bot[bot]
cc09cb8145
Merge pull request #25173 from dashea/dshea-v4.2.0-rhel-cve-2024-11218
[v4.2.0-rhel] Update buildah for CVE-2024-11218
2025-02-03 08:04:01 +00:00
David Shea
0b3d8b4c24 Remove windows tests from Cirrus config
Signed-off-by: David Shea <dshea@redhat.com>
2025-01-31 10:15:16 -05:00
David Shea
50295e5e5d [v4.2.0-rhel] Update buildah for CVE-2024-11218
Addresses:
https://issues.redhat.com/browse/RHEL-67598

[NO NEW TESTS NEEDED]

Signed-off-by: David Shea <dshea@redhat.com>
2025-01-30 15:30:22 -05:00
openshift-merge-bot[bot]
488c579481
Merge pull request #24371 from dashea/4.2.0-revendor
[v4.2.0-rhel] Update buildah for CVE-2024-9675
2024-10-28 11:23:29 +00:00
David Shea
c1d643e387 [v4.2.0-rhel] Update buildah for CVE-2024-9675
Addresses:
https://issues.redhat.com/browse/RHEL-62376
https://issues.redhat.com/browse/RHEL-62385

[NO NEW TESTS NEEDED]

Signed-off-by: David Shea <dshea@redhat.com>
2024-10-25 11:18:07 -04:00
openshift-merge-bot[bot]
df142d64d6
Merge pull request #23186 from mheon/fix_cve_2024_37298_420rhel
[v4.2.0-rhel] Update gorilla/schema to v1.4.1 to fix CVE-2024-37298
2024-07-18 18:32:34 +00:00
Matt Heon
e331f5cd8d Update gorilla/schema to v1.4.1 to fix CVE-2024-37298
Ref: RHEL-45919

Signed-off-by: Matt Heon <mheon@redhat.com>
2024-07-03 14:41:51 -04:00
Paul Holzinger
4ea3ea3535
Merge pull request #22306 from edsantiago/gating-fixes
[v4.2.0-rhel] Gating-test fixes
2024-04-09 17:43:41 +02:00
Ed Santiago
a1be9a4c0d RHEL gating tests: skip some tests under runc
Manual cherrypick of (portions of) #14972, for tests that
don't work under runc.

Signed-off-by: Ed Santiago <santiago@redhat.com>
2024-04-08 10:45:53 -06:00
Toshiki Sonoda
11edb39d63 system tests: fix noexistent labels test in the remote
In the remote environment, this test will be failed,
because an error message is different from the local environment.

Signed-off-by: Toshiki Sonoda <sonoda.toshiki@fujitsu.com>
2024-04-08 10:45:53 -06:00
Ed Santiago
0b309439f3 system tests: health-on-failure: fix broken logic
Basically, in the timeout loop where we checked for new CID
on the restarted container, we were running 'podman inspect'
(not 'inspect --format ID'), and comparing full hundred-line
output against single-line CID string.

While I'm in here, add 'c_' prefix to container to make it
easier for my old eyes to recognize "oh, that's a container name"
vs "is that a name? a SHA? a woozle?"

Signed-off-by: Ed Santiago <santiago@redhat.com>
2024-04-08 10:45:53 -06:00
Toshiki Sonoda
7848291d89 system tests: fix volume exec/noexec test
The return code is "126" in the current version of runc.

Signed-off-by: Toshiki Sonoda <sonoda.toshiki@fujitsu.com>
2024-04-08 10:45:53 -06:00
openshift-merge-bot[bot]
6463484070
Merge pull request #22222 from TomSweeneyRedHat/dev/tsweeney/cve-v4.2.0-rhel-3
[v4.2.0-rhel] Bump Buildah to v1.27.4
2024-04-03 17:42:33 +00:00
tomsweeneyredhat
e1b0a045d4 [v4.2.0-rhel] Bump Buildah to v1.27.4
As the title says.  Bumping to address:
CVE-2024-1753

https://issues.redhat.com/browse/RHEL-26761

[NO NEW TESTS NEEDED]

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2024-04-02 16:52:20 -04:00
openshift-merge-bot[bot]
1d23a2ea7d
Merge pull request #22232 from cevich/v4.2.0-rhel_ci_minimize
[v4.2.0-rhel] CI: Remove F35 and Ubuntu
2024-04-01 19:00:14 +00:00
Chris Evich
b520e9ac21
[v4.2.0-rhel] CI: Remove F35 and Ubuntu
This release branch is tracking RHEL 8.6/9.0 and therefore has no need
to execute any CI testing on F35/Ubuntu.  Worse, going forward these
releases contain golang versions incompatible with future CVE backports.
Remove them.

Signed-off-by: Chris Evich <cevich@redhat.com>
2024-04-01 11:14:45 -04:00
openshift-merge-bot[bot]
12c22729dd
Merge pull request #22206 from TomSweeneyRedHat/dev/tsweeney/v4.0.2-rhel-cve-022-32149
[v4.2.0-rhel] Bump golang.org/x/text to v0.3.8
2024-03-29 11:16:18 +00:00
tomsweeneyredhat
184493dfb6 [v4.2.0-rhel] Bump golang.org/x/text to v0.3.8
As the title says.

Addresses: CVE-2022-32149
https://issues.redhat.com/browse/RHEL-30745

[NO NEW TESTS NEEDED]

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2024-03-28 15:31:12 -04:00
openshift-merge-bot[bot]
a49f6f7967
Merge pull request #21967 from kolyshkin/v4.2.0-rhel
[v4.2.0-rhel] Use a branched runc instead of manual vendor changes
2024-03-07 10:17:19 +00:00
Kir Kolyshkin
910bf6bfbe CI: restore the consistency check
This is a partial revert of commit 47b995b10.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2024-03-06 19:34:07 -08:00
Kir Kolyshkin
1135947b28 Use a branched runc instead of manual vendor changes
Commit 3e7ca842a manually patched runc/libcontainer in vendor, which is
OK but creates a maintenance problem down the line.

Instead, let's
 - create a branch[1] based on runc commit used here;
 - backport the CVE-2024-21626 fixes;
 - vendor the above branch here.

As a side note, all this mess could have been avoided if
https://github.com/opencontainers/runc/pull/3508 was backported
to a stable runc branch. Alas, this was never requested.

[1] https://github.com/projectatomic/runc/tree/podman-v4.2.0-rhel

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2024-03-06 19:33:45 -08:00
openshift-merge-bot[bot]
98fc8c62d3
Merge pull request #21483 from mheon/runc_manual_patch_420rhel
[v4.2.0-rhel] Manually patch vendor/ to address CVE-2024-21626
2024-02-02 21:33:31 +00:00
Matt Heon
52aa483090 Disable compose test as well, it uses python
Signed-off-by: Matt Heon <mheon@redhat.com>
2024-02-02 14:01:55 -05:00
Ed Santiago
f3355f9591 (Temporary) Emergency CI fix: quay search is broken
Someone please revert this once quay search is fixed.

Signed-off-by: Ed Santiago <santiago@redhat.com>

<MH: Cherry-pick into v4.2.0-rhel to fix CI>

Signed-off-by: Matt Heon <mheon@redhat.com>
2024-02-02 13:45:52 -05:00
Matt Heon
47b995b102 Disable broken CI tasks
Signed-off-by: Matt Heon <mheon@redhat.com>
2024-02-02 13:45:52 -05:00
Matt Heon
3e7ca842a6 Manually patch vendor/ to address CVE-2024-21626
We can't bump runc in this branch, it brings in too many other
things that won't build on this old Golang (this branch is still
on v1.16).

So, instead, backport the runc patches to this older runc.

The good news: We vendor very little of runc, so this was not all
that difficult.

Signed-off-by: Matt Heon <mheon@redhat.com>
2024-02-02 10:22:59 -05:00
OpenShift Merge Robot
22cf8c296d
Merge pull request #18832 from TomSweeneyRedHat/dev/tsweeney/tpyo_v4_2_0-rhel
[v4.2.0-rhel] podman-kube@.service.in: Remove Restart=never option wi…
2023-06-10 06:44:36 -04:00
Andrew Gunnerson
a5aa524ca7 [v4.2.0-rhel] podman-kube@.service.in: Remove Restart=never option with typo
systemd expects the value of the option to be `no` instead, but this is
already the default behavior. This fixes the following warning when
running `systemctl status` on the unit:

    Failed to parse service restart specifier, ignoring: never

Addresses: https://issues.redhat.com/browse/OCPBUGS-14284

[NO NEW TESTS NEEDED]

Signed-off-by: Andrew Gunnerson <chillermillerlong@hotmail.com>
Signed-off-by: Tom Sweeney <tsweeney@redhat.com>
2023-06-08 18:16:56 -04:00
OpenShift Merge Robot
1a116d108e
Merge pull request #17315 from TomSweeneyRedHat/dev/tsweeney/randomfix_4.2
[v4.2.0-rhel] all: stop using deprecated GenerateNonCryptoID
2023-02-02 13:31:24 +01:00
Kir Kolyshkin
f19c0335c2 [v4.2.0-rhel] all: stop using deprecated GenerateNonCryptoID
Cherry-pick #15788 to v4.2.0-rhel branch per RHBZ 2157930

In view of https://github.com/containers/storage/pull/1337, do this:

	for f in $(git grep -l stringid.GenerateNonCryptoID | grep -v '^vendor/'); do
		sed -i 's/stringid.GenerateNonCryptoID/stringid.GenerateRandomID/g' $f;
	done

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2023-02-01 16:35:50 -05:00
OpenShift Merge Robot
e1f0d65296
Merge pull request #17079 from cevich/v4.2.0-rhel_rm_gitlab
[v4.2.0-rhel] Cirrus: Strip only-main CI tasks
2023-01-11 13:24:12 -05:00
Chris Evich
159c79b50e
Cirrus: Strip only-main CI tasks
Signed-off-by: Chris Evich <cevich@redhat.com>
2023-01-11 10:47:00 -05:00
Daniel J Walsh
b8b9f57aae
Merge pull request #17008 from Romain-Geissler-1A/backport-docker-client-build-compat-v4.2.0-rhel
[release-v4.2.0-rhel] compat,build: handle docker's preconfigured cacheTo,cacheFrom
2023-01-10 13:01:35 -05:00
Daniel J Walsh
28df097800
Merge pull request #17052 from giuseppe/v4.2.0-rhel-podman-rm-f-no-processes
[v4.2.0-rhel] podman: podman rm -f doesn't leave processes
2023-01-10 10:29:30 -05:00
Giuseppe Scrivano
dce4a44c6f
podman: podman rm -f doesn't leave processes
follow-up to 6886e80b45

when "podman -rm -f" is used on a container in "stopping" state, also
make sure it is terminated before removing it from the local storage.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
(cherry picked from commit 4cf06fe7e0)
2023-01-10 11:18:37 +01:00
Giuseppe Scrivano
a83a88ec92
oci: check for valid PID before kill(pid, 0)
check that the container has a valid pid before attempting to use
kill($PID, 0) on it.  If the PID==0, it means the container is already
stopped.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
(cherry picked from commit 494db3e166)
2023-01-10 11:18:36 +01:00
Aditya R
75b236a2b4 compat,build: handle docker's preconfigured cacheTo,cacheFrom
Docker's newer clients popuates `cacheFrom` and `cacheTo` parameter
by default as empty array for all commands but buildah's design of
distributed cache expects this to be a repo not image hence parse
only the first populated repo and igore if empty array.

Signed-off-by: Aditya R <arajan@redhat.com>
2023-01-05 22:44:01 +00:00
OpenShift Merge Robot
0608f55e91
Merge pull request #17010 from openshift-cherrypick-robot/cherry-pick-16577-to-v4.2.0-rhel
[v4.2.0-rhel] [CI:DOCS] Migrate OSX Cross to M1
2023-01-05 10:43:59 -05:00
Ashley Cui
a598b73105 Migrate OSX Cross to M1
Migrate our OSX Cross build to a M1 instance, since Cirrus is sunsetting Intel-based macOS instances.

Signed-off-by: Ashley Cui <acui@redhat.com>
2023-01-05 14:40:25 +00:00
Daniel J Walsh
9ad538922d
Merge pull request #16990 from giuseppe/v4.2.0-rhel-backport-fix-race-condition-rm-ing-stopping-containers
[v4.2.0] libpod: fix race condition rm'ing stopping containers
2023-01-04 11:56:06 -05:00
Giuseppe Scrivano
cbe15ef706
libpod: fix race condition rm'ing stopping containers
do not allow removing containers that are in the stopping state,
otherwise it can lead to a race condition where a "podman rm" removes
the container from the storage while another process is stopping the
same container.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=2155828

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
(cherry picked from commit 6886e80b45)
2023-01-04 13:27:21 +01:00
Daniel J Walsh
43f4a866b9
Merge pull request #16935 from giuseppe/podman-4.2.0-rhel-bump-storage
[4.2.0-rhel] vendor: bump containers/storage
2022-12-26 07:27:53 -05:00
Giuseppe Scrivano
a4e0784651
vendor: bump containers/storage
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2022-12-23 20:22:26 +01:00
Daniel J Walsh
ff97c90f2c
Merge pull request #16866 from giuseppe/v4.2.0-rhel-no-spawn-dbus
[v4.2.0-rhel] vendor: bump to c/common v0.49.3
2022-12-17 05:11:15 -05:00
Giuseppe Scrivano
097aba1a53
vendor: bump to c/common v0.49.3
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2022-12-16 15:09:24 +01:00
OpenShift Merge Robot
bfac4a5de2
Merge pull request #16802 from TomSweeneyRedHat/dev/tsweeney/buildah_1.27.3
[v4.2-rhel] Bump Buildah to v1.27.3
2022-12-10 06:07:06 -05:00