Commit graph

509 commits

Author SHA1 Message Date
tomsweeneyredhat
e035eb4ffa [v4.4-rhel] Adjust for common bump
The vendoring of Buildah dragged in a bump of common from v0.51.4 to
v0.57.7 which contained many changes to variable and function names.

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2025-12-17 15:40:01 -05:00
tomsweeneyredhat
2e8bce201e [v4.4.1-rhel] Bump runc to 1.2.9, Buidah 1.29.6
Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2025-12-17 15:39:55 -05:00
tomsweeneyredhat
0b9f534a2b [v4.4.1-rhel] CVE-2024-11218 Fix
This fixes CVE-2024-11218 by vendoring in Buidlah v1.29.5 which
has the actual fixes within it.

Fixes: https://issues.redhat.com/browse/OCPBUGS-44538,
https://issues.redhat.com/browse/OCPBUGS-44537,
https://issues.redhat.com/browse/OCPBUGS-44539,
https://issues.redhat.com/browse/RHEL-67603, https://issues.redhat.com/browse/RHEL-67597

[NO NEW TESTS NEEDED]

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2025-02-06 18:50:21 -05:00
David Shea
638400242d [v4.4.1-rhel] Update buildah for CVE-2024-9675
Addresses:
https://issues.redhat.com/browse/RHEL-62386
https://issues.redhat.com/browse/RHEL-62377

[NO NEW TESTS NEEDED]

Signed-off-by: David Shea <dshea@redhat.com>
2024-10-18 13:37:25 -04:00
tomsweeneyredhat
2c2d84f2b7 [v4.4.1-rhel] CVE-2024-3727 & stats
Addresses CVE-2024-3727 and Podman stats takes pagecache into account

Fixes: https://issues.redhat.com/browse/OCPBUGS-37008
       https://issues.redhat.com/browse/OCPBUGS-37010
       https://issues.redhat.com/browse/OCPBUGS-37011

Also addresses #1642 in the v4.4.1-rhel branch

Fixes: https://issues.redhat.com/browse/RHEL-16376

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2024-09-19 12:07:38 -04:00
tomsweeneyredhat
a90356fd8d [v4.4.1-rhel] builds try to write to additionalImageStore
... read-only locataion

This vendors in c/storage v1.45.7 to address this issue in RHEL 8.8/9.2: containers/storage#1733

This addresses: https://issues.redhat.com/browse/RHEL-41079 and https://issues.redhat.com/browse/ACCELFIX-243

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2024-07-22 11:27:54 -04:00
tomsweeneyredhat
788303370e [v4.4.1-rhel] Bump ocicrypt and go-jose CVE-2024-28180
Bump github.com/go-jose/go-jose to v3.0.0 and
github.com/containers/ocicrypt to v1.1.10

Addresses: CVE-2024-28180
https://issues.redhat.com/browse/OCPBUGS-30785
https://issues.redhat.com/browse/OCPBUGS-30786
https://issues.redhat.com/browse/OCPBUGS-30787

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2024-04-18 16:24:44 -04:00
tomsweeneyredhat
e79c35238e [v4.4.1-rhel] Bump Buildah to v1.29.3 CVE-2024-1753
As the title says, buming to Buildah v1.29.3 to address:
CVE-2024-1753
https://issues.redhat.com/browse/RHEL-26762 and probably another card
TBD

[NO NEW TESTS NEEDED]

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2024-03-27 20:55:27 -04:00
TomSweeneyRedHat
c346d69e3b [v4.4.1-rhel] vendor c/storage v1.45.6
This backport a fix for c/storage for unlink functionaliy from https://github.com/containers/storage/pull/1631/

This was a WIP, but has been updated and is ready to merge, assuming
happy tests.

[NO NEW TESTS NEEDED]

Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
2023-09-14 17:53:53 -04:00
Paul Holzinger
10e879c6a1
update c/common to v0.51.3
Addresses:
https://bugzilla.redhat.com/show_bug.cgi?id=2210113
https://bugzilla.redhat.com/show_bug.cgi?id=2210111

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2023-05-26 10:08:44 +02:00
tomsweeneyredhat
b458fc63d2 [v4.4.1-rhel] Vendor c/storage v1.45.5
Vendor in c/storage v1.45.5

Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=2177925 and
https://bugzilla.redhat.com/show_bug.cgi?id=2176833

"Podman containers do not start after upgrade to v4.4.1 "

ZeroDay BZs for RHEL 8.8 and 9.2

Repushed with v1.45.5 after it was found that v1.45.4 was built
incorrectly from main.

[NO NEW TESTS NEEDED]

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2023-04-13 08:44:36 -04:00
Valentin Rothberg
3101c8be24 [v4.4.1-rhel] compat: /auth: parse server address correctly
Use `auth.Login` as `podman login` does which parses and normalizes the
input addresses correctly, especially for docker.io.

This Cherry Picks https://github.com/containers/podman/pull/17581 and
brings in necessary changes to run_test.go from i
5f86fae71f

Addreses: https://bugzilla.redhat.com/show_bug.cgi?id=2183601 and
https://bugzilla.redhat.com/show_bug.cgi?id=2183602 for the RHEL 8.8 and
9.2 ZeroDay

The original Fixed: #17571
Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2023-03-31 16:10:16 -04:00
tomsweeneyredhat
f8a635a482 [v4.4.1-rhel] Bump c/image to v5.24.1
Bump c/image to v5.24.1 in preparation of the RHEL 8.8 and 9.2
release.

[NO NEW TESTS NEEDED]

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2023-02-15 16:14:22 -05:00
Miloslav Trmač
097ca60568 Add (podman {image,manifest} push --sign-by-sigstore=param-file.yaml)
(podman push) and (podman manifest push) now support --sign-by-sigstore=param-file,
using the containers-sigstore-signing-params.yaml(5) file format.

That notably adds support for Fulcio and Rekor signing.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2023-01-27 16:46:28 +01:00
tomsweeneyredhat
36875c2654 [v4.4] Bump to Buildah v1.29.0
As the title says.

[NO NEW TESTS NEEDED]

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2023-01-26 12:37:53 -05:00
Ashley Cui
2db4682041 Vendor containers/(storage, image, common, buildah)
c/storage v1.45.3
c/image v5.24.0
c/common v0.51.0
c/buildah main

Signed-off-by: Ashley Cui <acui@redhat.com>
2023-01-24 11:07:09 -05:00
Daniel J Walsh
f65d79f4c7
vendor in latests containers/(storage, common, build, image)
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2023-01-19 10:42:10 -05:00
Valentin Rothberg
b5a6f3f914 fix bud-multiple-platform-with-base-as-default-arg flake
By vendoring the latest c/common.

Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
2023-01-18 15:32:38 +01:00
Ashley Cui
ddf8e49891 Vendor in latest c/common
Signed-off-by: Ashley Cui <acui@redhat.com>
2023-01-17 12:12:17 -05:00
Daniel J Walsh
5ac5aaa723
Vendor in latest containers/storage
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2023-01-15 07:41:30 -05:00
Daniel J Walsh
c433982d18
Vendor in latest containers/storage
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2023-01-12 18:21:29 -05:00
Daniel J Walsh
e332b6246b
Vendor in latest containers/common
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2023-01-06 14:19:47 -05:00
Daniel J Walsh
eea78ec7b3
Vendor in latest containers/(common, image, storage)
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2023-01-05 10:40:36 -05:00
Aditya R
1d3fd53833
vendor: bump c/storage to a747b27
CI in other projects which uses podman is blocked because of missing https://github.com/containers/storage/pull/1455
Update `c/storage` to a747b27 so it contains patch from https://github.com/containers/storage/pull/1455

[NO NEW TESTS NEEDED]
[NO TESTS NEEDED]

Closes: https://github.com/containers/crun/pull/1111#issuecomment-1368367699

Signed-off-by: Aditya R <arajan@redhat.com>
2023-01-02 14:24:10 +05:30
Daniel J Walsh
bfec23c363
Vendor in latest containers/(buildah, image, common)
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2022-12-21 06:12:45 -05:00
Aditya R
987c8e3a78
vendor: bump to buildah ca578b290144 and use new cache API
Bump to buildah ca578b290144 and use new `cacheTo` and `cacheFrom` API.

[NO NEW TESTS NEEDED]
[NO TESTS NEEDED]

Signed-off-by: Aditya R <arajan@redhat.com>
2022-12-20 17:13:59 +05:30
Daniel J Walsh
3718ac8e96
Vendor in latest containers/common with default capabilities
Also update vendor of containers/storage and image

Cleanup display of added/dropped capabilties as well

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2022-12-15 14:28:30 -05:00
Ygal Blum
7d16c2b69e Update containers common package
The new version adds NetworkCreateOptions. For now pass nil

[NO NEW TESTS NEEDED]

Signed-off-by: Ygal Blum <ygal.blum@gmail.com>
2022-12-06 13:52:28 +02:00
Miloslav Trmač
c83efd0f07 Update c/storage after https://github.com/containers/storage/pull/1436
... and update to remove the now-deprecated Locker interface.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2022-12-01 16:05:13 +01:00
Daniel J Walsh
2862ecf288
Update vendor of containers/(image, buildah)
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2022-11-30 13:05:12 -05:00
Valentin Rothberg
71f92d263c container create: add inspect data to event
When the new `events_container_create_inspect_data` option is enabled in
containers.conf set the `ContainersInspectData` event field for each
container-create event.

The data was requested for the purpose of auditing (e.g., intrusion
detection).

Jira: https://issues.redhat.com/browse/RUN-1702
Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
2022-11-29 10:40:24 +01:00
Daniel J Walsh
35b46a4200
Update Vendor of containers/(common, image, buildah)
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2022-11-28 06:41:31 -05:00
Giuseppe Scrivano
7eb11e7bb3
vendor: update containers/common
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2022-11-25 11:44:38 +01:00
Daniel J Walsh
fb429dbe3c
Update vendor of containers/(buildah, common, storage, image)
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2022-11-22 08:53:59 -05:00
Daniel J Walsh
5df00c6f79
Vendor in latest containers/(common,image,storage)
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2022-11-11 14:40:03 -05:00
Paul Holzinger
3e08f85353
fix --format {{json .}} output to match docker
`--format json` should not be the same as `--format {{json .}}`, the
later should actually run through the go template and thus create one
json object per entry instead of an json array.

Includes a vendor of c/common@main since it requires a fix from there as
well.

This matches docker compat.
Fixes #16436

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2022-11-09 17:59:05 +01:00
Daniel J Walsh
571833d562
Update vendor of containers/(image, storage, common)
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2022-11-04 08:58:12 -04:00
Daniel J Walsh
9003cdbf62
Do not report that /usr/share/containers/storage.conf has been edited.
Only want to report if user created local customized storage in
/etc/containers/storage.conf or in
$HOME/.config/containers/storage.conf, when resetting storage.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2022-10-29 11:24:56 -04:00
Daniel J Walsh
6fe64591d6
Update vendor containers/(common,storage,buildah,image)
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2022-10-28 06:16:22 -04:00
Valentin Rothberg
34235b2726 system df: fix image-size calculations
Fix two bugs in `system df`:

1.  The total size was calculated incorrectly as it was creating the sum
    of all image sizes but did not consider that a) the same image may
    be listed more than once (i.e., for each repo-tag pair), and that
    b) images share layers.

    The total size is now calculated directly in `libimage` by taking
    multi-layer use into account.

2.  The reclaimable size was calculated incorrectly.  This number
    indicates which data we can actually remove which means the total
    size minus what containers use (i.e., the "unique" size of the image
    in use by containers).

NOTE: The c/storage version is pinned back to the previous commit as it
      is buggy.  c/common already requires the buggy version, so use a
      `replace` to force/pin.

Fixes: #16135
Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
2022-10-19 11:20:41 +02:00
Daniel J Walsh
01a3245d7d
Update vendor containers/(common,image,storage)
Fixes: https://github.com/containers/podman/issues/16150

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2022-10-15 09:42:51 -04:00
OpenShift Merge Robot
c5c57f0c50
Merge pull request #16144 from presztak/vendor_psgo
vendor containers/psgo@v1.8.0
2022-10-15 07:07:19 -04:00
OpenShift Merge Robot
8656ffa563
Merge pull request #15662 from mtrmac/c-image-errors
Update for https://github.com/containers/image/pull/1299 + update tests
2022-10-14 17:56:16 -04:00
Piotr Resztak
04c126a3b4 vendor containers/psgo@v1.8.0
Signed-off-by: Piotr Resztak <piotr.resztak@gmail.com>
2022-10-14 17:28:15 +02:00
Miloslav Trmač
05119a9175 Update c/image after https://github.com/containers/image/pull/1299
> go get github.com/containers/image/v5@main
> make vendor

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2022-10-13 20:56:02 +02:00
Valentin Rothberg
69815a7f1c vendor containers/storage@main
Mainly to pull in fixes for #1382 which is impossible to reproduce
locally so let's optimistically mark it as fixed and reopen if needed
in the future.

Fixes: #1382
Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
2022-10-13 16:54:14 +02:00
dependabot[bot]
b5950a9189
build(deps): bump github.com/containers/ocicrypt from 1.1.5 to 1.1.6
Bumps [github.com/containers/ocicrypt](https://github.com/containers/ocicrypt) from 1.1.5 to 1.1.6.
- [Release notes](https://github.com/containers/ocicrypt/releases)
- [Commits](https://github.com/containers/ocicrypt/compare/v1.1.5...v1.1.6)

---
updated-dependencies:
- dependency-name: github.com/containers/ocicrypt
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-10 12:16:08 +00:00
Daniel J Walsh
11e83a0952
Update vendor of containers/buildah v1.28.0
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2022-10-03 10:17:14 -04:00
Daniel J Walsh
fe3c91d581
Update vendor containers/(common,image)
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2022-09-30 06:45:24 -04:00
Aditya R
f00ceaabd4
vendor: bump c/common to v0.49.2-0.20220929111928-2d1b45ae2423
[NO NEW TESTS NEEDED]
[NO TESTS NEEDED]

Signed-off-by: Aditya R <arajan@redhat.com>
2022-09-29 18:20:03 +05:30