Commit Graph

5076 Commits

Author SHA1 Message Date
openshift-merge-bot[bot] 7d761e6877
Merge pull request #6052 from openshift-cherrypick-robot/cherry-pick-6025-to-release-1.32
[release-1.32] tests/conformance/testdata/Dockerfile.add:...
2025-03-11 13:53:57 +00:00
Nalin Dahyabhai e2e5a30613 tests/conformance/testdata/Dockerfile.add:...
update some URLs

The origin repository renamed its "master" branch to "main", so we need
to update our references to items in that branch.

[NO NEW TESTS NEEDED]

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2025-03-10 19:17:50 +00:00
openshift-merge-bot[bot] d473f24596
Merge pull request #5579 from openshift-cherrypick-robot/cherry-pick-5572-to-release-1.32
[release-1.32] Cross-build on Fedora
2024-06-10 19:53:15 +00:00
Chris Evich 80287fbc2b Cross-build on Fedora
Executing a golang cross-compile on an expensive resource such as a Mac
has questionable overall value.  Switch to running on a default Fedora
VM instead.

Signed-off-by: Chris Evich <cevich@redhat.com>
2024-06-07 15:13:32 +00:00
openshift-merge-bot[bot] 4b5ec37c2f
Merge pull request #5424 from TomSweeneyRedHat/dev/tsweeney/cve-1.32
[release-1.32] Adresses CVE-2024-1753 and CVE-2024-24786, bump to V1.32.3
2024-03-27 17:34:31 +00:00
tomsweeneyredhat 39dbbf2a22 [release-1.32] Bump to Bulidah v1.32.3
As the title says.  Bumping to v1.32.3 to get a few
CVE fixes in.

[NO NEW TESTS NEEDED]

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2024-03-27 10:05:09 -04:00
tomsweeneyredhat ae50fd85ef [release-1.32] CVE-2024-1753 container escape fix
Addresses CVE-2024-1753 which allowed a user to write files to the
`/` directory of the host machine if selinux was not enabled.

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2024-03-27 10:05:09 -04:00
tomsweeneyredhat 7904c37a10 [release-1.32] Bump google.golang.org/protobuf to v1.33.0
As the title says.  This addresses CVE-2024-24786.

[NO NEW TESTS NEEDED]

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2024-03-27 10:05:09 -04:00
openshift-merge-bot[bot] d15b9db778
Merge pull request #5431 from cevich/release-1.32_fix_ci_vm
[release-1.32] Recover release-branch CI
2024-03-27 10:50:14 +00:00
Nalin Dahyabhai ca67765ab0
conformance tests: don't break on trailing zeroes in layer blobs
When analyzing a layer blob's contents, don't break if the blob has more
zeroes padding it out even after the tar reader thinks it's hit the end
of the archive.

Add more detail to the diagnostic error we print when there's a digest
or length mismatch, too, in case it's triggered by something other than
zero padding.

Don't ignore errors which might be encountered when we try to use skopeo
to copy an image to a directory.

(cevich cherry-picked from b2504c2636)

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
Signed-off-by: Chris Evich <cevich@redhat.com>
2024-03-25 15:53:36 -04:00
Chris Evich 7ac39be0c5
Recover release-branch CI
Unfortunately maintenance CI was not enabled on this branch, resulting
in the CI VM images being pruned and irrecoverably purged.  Restore
CI by substituting similar images.  These images aren't a perfect match,
but they are already marked for permanent retention.

Signed-off-by: Chris Evich <cevich@redhat.com>
2024-03-25 14:30:40 -04:00
openshift-merge-bot[bot] 2e6a9be438
Merge pull request #5142 from lsm5/release-1.32-cve-2023-39325
Fix for CVE-2023-39325
2023-11-13 18:40:13 +00:00
Lokesh Mandvekar fd72a9a617
Fix for CVE-2023-39325
Updated golang.org/x/net to v0.17.0

Ref: https://github.com/advisories/GHSA-4374-p667-p6c8
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2248243

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
2023-11-13 20:11:54 +05:30
openshift-ci[bot] 050318f87d
Merge pull request #5114 from nalind/v1.32.2
[release-1.32] tag v1.32.2
2023-10-30 18:14:46 +00:00
openshift-ci[bot] dd540cb891
Merge pull request #5113 from mheon/cherrypick_5111
Mask /sys/devices/virtual/powercap by default
2023-10-30 18:07:44 +00:00
Matt Heon b8e0fb258c Mask /sys/devices/virtual/powercap by default
This mimics #5111 but without the vendor update, which is very
large on this branch.

[NO NEW TESTS NEEDED] This cannot be tested in CI as cloud
providers already don't provide these interfaces in their VMs.

Signed-off-by: Matt Heon <mheon@redhat.com>
2023-10-30 10:53:28 -04:00
Nalin Dahyabhai f0c23adbed tag v1.32.2
[NO NEW TESTS NEEDED]

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2023-10-30 10:49:30 -04:00
openshift-ci[bot] bfd436d159
Merge pull request #5100 from nalind/v1.32.1
[release-1.32] tag v1.32.1
2023-10-24 14:06:09 +00:00
Nalin Dahyabhai aa6b3d1794 tag v1.32.1
[NO NEW TESTS NEEDED]

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2023-10-23 15:55:53 -04:00
openshift-ci[bot] 515126d810
Merge pull request #5099 from openshift-cherrypick-robot/cherry-pick-5083-to-release-1.32
[release-1.32] chroot.setupChrootBindMounts: pay more attention to flags
2023-10-23 19:12:22 +00:00
Nalin Dahyabhai e00e1126f7 chroot.setupChrootBindMounts: pay more attention to flags
Pay better attention to dev/nodev/exec/noexec/suid/nosuid/ro/rw flags on
bind, overlay, and tmpfs mounts when any of them are specified.  Stop
quietly adding "nodev" when it isn't asked for.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2023-10-23 14:55:32 +00:00
OpenShift Merge Robot 4f3d7b0b63
Merge pull request #5048 from nalind/post-1.32
[release-1.32] .cirrus.yml: run tests relative to the release-1.32 branch
2023-09-15 01:08:54 +02:00
Nalin Dahyabhai 5151ccff51 .cirrus.yml: run tests relative to the release-1.32 branch
Tell Cirrus to use `release-1.32` as a baseline instead of `main`.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2023-09-14 15:48:12 -04:00
Nalin Dahyabhai 2326d4929f Tag v1.32.0
[NO NEW TESTS NEEDED]

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2023-09-14 13:18:55 -04:00
Daniel J Walsh 0ad0a8cd41
Merge pull request #5043 from rhatdan/tmpdir
GetTmpDir is not using ImageCopyTmpdir correctly
2023-09-14 10:48:48 -04:00
OpenShift Merge Robot 42eaf2f0e8
Merge pull request #5045 from rhatdan/codespell
Run codespell on code
2023-09-14 14:27:49 +02:00
Daniel J Walsh e90b3502b7
GetTmpDir is not using ImageCopyTmpdir correctly
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2023-09-14 08:12:52 -04:00
Daniel J Walsh ccac7ca0bf
Run codespell on code
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2023-09-14 06:05:57 -04:00
Daniel J Walsh 70d8ab9495
Merge pull request #5042 from rhatdan/VENDOR
Bump vendor containers/(common, storage, image)
2023-09-14 05:05:47 -04:00
Daniel J Walsh a316b9abf6
Merge pull request #5006 from cevich/remove_multiarch_cron
Cirrus: Remove multi-arch buildah image builds
2023-09-13 21:40:48 -04:00
Daniel J Walsh 798fd3117b
Merge pull request #5039 from Luap99/libimage-remote
Move code around to not require libimage
2023-09-13 20:55:51 -04:00
Daniel J Walsh 6be7194545
Bump vendor containers/(common, storage, image)
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2023-09-13 20:46:30 -04:00
Chris Evich 9545744e8b
Cirrus: Remove multi-arch buildah image builds
These jobs have been failing since early August due to
technical/scripting problems.  Disable/remove entirely since a fix is
unlikely to be implemented anytime soon.

Ref: Abandoned recent attempt at debugging
https://github.com/containers/podman/pull/19720

Signed-off-by: Chris Evich <cevich@redhat.com>
2023-09-13 14:17:25 -04:00
OpenShift Merge Robot 4db17cc7a2
Merge pull request #5040 from containers/renovate/github.com-containerd-containerd-1.x
fix(deps): update module github.com/containerd/containerd to v1.7.6
2023-09-13 02:34:16 +02:00
renovate[bot] 206cda149c
fix(deps): update module github.com/containerd/containerd to v1.7.6
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-12 21:57:21 +00:00
Paul Holzinger 0191bc6710
Split GetTempDir from internal/util
With this pkg/parse does not depend on libimage.

[NO NEW TESTS NEEDED]

Based on Miloslav's work: https://github.com/containers/podman/pull/19718

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2023-09-12 15:21:04 +02:00
Paul Holzinger 6e6827b270
Move most of internal/parse to internal/volumes
internal/parse does not need to depend on libimage.
This allows for a smaller podman remote client.

Based on Miloslav's work: https://github.com/containers/podman/pull/19718

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2023-09-12 14:29:31 +02:00
Paul Holzinger 292b429f6c
copier: remove libimage dependency via util package
This allows podman to import the copier package on the remote client
without needing the full libimage package.

Based on Miloslav's work: https://github.com/containers/podman/pull/19718

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2023-09-12 14:08:41 +02:00
OpenShift Merge Robot 0cbe85260a
Merge pull request #4960 from nalind/mkcw
Produce confidential workload images
2023-09-07 22:47:10 +02:00
Nalin Dahyabhai 4f3abf9367 Add some docs for `build --cw`, `commit --cw`, and `mkcw`
Add docs for the new --cw option recognized by both `commit` and
`build`, and the new `mkcw` command.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2023-09-07 14:05:10 -04:00
Nalin Dahyabhai e89fac6c9b Add `buildah mkcw`, add `--cw` to `buildah commit` and `buildah build`
Add a --cw option to `buildah build` and `buildah commit`, which takes a
comma-separated list of arguments and produces an image laid out for use
as a confidential workload:
  type: sev or snp
  attestation_url: location of a key broker server
  cpus: expected number of virtual CPUs to run with
  memory: expected megabytes of memory to run with
  workload_id: a distinguishing identifier for the key broker server
  ignore_attestation_errors: ignore errors registering the workload
  passphrase: for encrypting the disk image
  slop: extra space to allocate for the disk image

At least one of attestation_url and passphrase must be specified in
order for the encrypted disk image to be decryptable at run-time.  Other
arguments can be omitted.  ignore_attestation_errors is intentionally
undocumented, as it's mainly used to permit some amount of testing on
systems which don't have the required hardware.

Add an `mkcw` top-level command, for converting directly from an image
to a confidential workload.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2023-09-07 14:05:10 -04:00
OpenShift Merge Robot 25473ec2ba
Merge pull request #5032 from nalind/abspaths
Make sure that pathnames picked up from the environment are absolute
2023-09-07 20:04:58 +02:00
Nalin Dahyabhai cc619c28d9 Make sure that pathnames picked up from the environment are absolute
When we read TMPDIR and SSH_AUTH_SOCK from the environment, convert them
to absolute paths before using them.  Call auth.GetDefaultAuthFile()
instead of reading REGISTRY_AUTH_FILE.

[NO NEW TESTS NEEDED]

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2023-09-07 11:20:54 -04:00
OpenShift Merge Robot 1a001dee21
Merge pull request #5030 from containers/renovate/github.com-cyphar-filepath-securejoin-0.x
fix(deps): update module github.com/cyphar/filepath-securejoin to v0.2.4
2023-09-06 22:01:58 +02:00
renovate[bot] 4ee5f020a9
fix(deps): update module github.com/cyphar/filepath-securejoin to v0.2.4
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-06 14:39:55 +00:00
OpenShift Merge Robot b0f74cf4a4
Merge pull request #5029 from containers/renovate/github.com-docker-docker-24.x
fix(deps): update module github.com/docker/docker to v24.0.6+incompatible
2023-09-06 16:37:57 +02:00
renovate[bot] fd72bbee2d
fix(deps): update module github.com/docker/docker to v24.0.6+incompatible
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-06 11:09:26 +00:00
OpenShift Merge Robot d72370f051
Merge pull request #5025 from nalind/tagging-resolve
Don't try to look up names when committing images
2023-09-06 09:14:55 +02:00
Nalin Dahyabhai 7545685800 Don't try to look up names when committing images
Don't try to look up an image by name when we're committing an image,
because we don't want to accidentally take advantage of any fuzzy
matching that libimage might start doing.  Instead, just use the
normalization call.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2023-09-05 16:37:14 -04:00
OpenShift Merge Robot 54e6d7e338
Merge pull request #5026 from containers/renovate/golang.org-x-crypto-0.x
fix(deps): update module golang.org/x/crypto to v0.13.0
2023-09-05 21:48:09 +02:00