Commit Graph

5403 Commits

Author SHA1 Message Date
Nalin Dahyabhai a2f0ebef65 Add a conformance test for copying to a mounted prior stage
Add a conformance test for cases where an intermediate stage mounts the
contents of a previous stage in a read-write fashion and modifies it.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2024-03-04 09:45:18 -05:00
openshift-merge-bot[bot] 0e0676d854
Merge pull request #5367 from rhatdan/VENDOR
Update vendor of containers/common
2024-03-01 19:02:16 +00:00
openshift-merge-bot[bot] 9116147da8
Merge pull request #5372 from containers/renovate/github.com-stretchr-testify-1.x
fix(deps): update module github.com/stretchr/testify to v1.9.0
2024-03-01 18:21:00 +00:00
renovate[bot] e504df1889
fix(deps): update module github.com/stretchr/testify to v1.9.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-03-01 16:17:34 +00:00
Lokesh Mandvekar 951dccd3ff
cgroups: reuse version check from c/common
[NO NEW TESTS NEEDED]

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2024-03-01 09:45:50 -05:00
Daniel J Walsh bbea3eb544
Update vendor of containers/(common,image)
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2024-03-01 09:45:50 -05:00
Daniel J Walsh d6e2dd76c4
Merge pull request #5369 from containers/renovate/github.com-containers-luksy-digest
fix(deps): update github.com/containers/luksy digest to ceb12d4
2024-03-01 04:50:59 -05:00
Daniel J Walsh 662908f8c7
Merge pull request #5370 from containers/renovate/github.com-containers-storage-digest
fix(deps): update github.com/containers/storage digest to eadc620
2024-03-01 04:50:33 -05:00
renovate[bot] 6474279ed2
fix(deps): update github.com/containers/storage digest to eadc620
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-03-01 09:48:09 +00:00
renovate[bot] f9d6036080
fix(deps): update github.com/containers/luksy digest to ceb12d4
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-03-01 09:47:57 +00:00
openshift-merge-bot[bot] 9de270eef0
Merge pull request #5368 from containers/renovate/github.com-containers-image-v5-digest
fix(deps): update github.com/containers/image/v5 digest to cdc6802
2024-03-01 09:46:43 +00:00
renovate[bot] 53f230e2b4
fix(deps): update github.com/containers/image/v5 digest to cdc6802
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-03-01 02:45:15 +00:00
openshift-merge-bot[bot] f5d7689ef4
Merge pull request #5366 from nalind/artifact-cli-flags
manifest add: complain if we get artifact flags without --artifact
2024-02-29 19:31:31 +00:00
Nalin Dahyabhai 8a1bcd51c4 manifest add: complain if we get artifact flags without --artifact
Complain if `manifest add` is invoked with any of "--artifact-type",
"--artifact-config", "--artifact-config-type", "--artifact-layer-type",
"--artifact-subject", "--artifact-exclude-titles", but not in
conjunction with "--artifact".

[NO NEW TESTS NEEDED]

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2024-02-29 10:45:43 -05:00
openshift-merge-bot[bot] d80ec964ad
Merge pull request #5345 from rhatdan/retry
Use retry logic from containers/common
2024-02-28 19:14:50 +00:00
Daniel J Walsh d0ffb9d374
Use retry logic from containers/common
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2024-02-28 09:44:33 -05:00
Daniel J Walsh e9c3c1666c
Vendor in containers/(storage,image,common)
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2024-02-28 09:44:33 -05:00
openshift-merge-bot[bot] b1ba39f030
Merge pull request #5360 from edsantiago/skip_unshare_on_rhel
tests: skip_if_no_unshare(): check for --setuid
2024-02-28 00:13:08 +00:00
openshift-merge-bot[bot] a60e5a6e54
Merge pull request #5358 from containers/renovate/golang.org-x-crypto-0.x
Update module golang.org/x/crypto to v0.20.0
2024-02-27 19:38:09 +00:00
renovate[bot] 5047a35669
Update module golang.org/x/crypto to v0.20.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-27 18:16:39 +00:00
openshift-merge-bot[bot] e5540d2615
Merge pull request #5342 from cevich/success_comment
[CI:DOCS] Add comment re: Total Success task name
2024-02-27 18:15:41 +00:00
Chris Evich 26d5b84b11
Add comment re: Total Success task name
Signed-off-by: Chris Evich <cevich@redhat.com>
2024-02-27 13:03:12 -05:00
Ed Santiago 4853c00423 tests: skip_if_no_unshare(): check for --setuid
unshare on RHEL8 does not support --setuid. This is causing
gating tests to fail.

Solution: check for option, skip test if unavailable

Signed-off-by: Ed Santiago <santiago@redhat.com>
2024-02-27 10:27:31 -07:00
openshift-merge-bot[bot] 8436ffdea5
Merge pull request #5354 from rhatdan/pull
Properly handle build --pull=false
2024-02-27 13:04:32 +00:00
Daniel J Walsh 63975b5418
Properly handle build --pull=false
buildah build --pull=false is documented to never pull the image, but it
is currently ignored.

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

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2024-02-26 16:42:14 -05:00
openshift-merge-bot[bot] 5f2e014da5
Merge pull request #5357 from containers/renovate/tim-actions-get-pr-commits-1.x
[skip-ci] Update tim-actions/get-pr-commits action to v1.3.1
2024-02-26 20:04:09 +00:00
renovate[bot] 836b9384d7
[skip-ci] Update tim-actions/get-pr-commits action to v1.3.1
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-26 09:54:52 +00:00
openshift-merge-bot[bot] a7299721dc
Merge pull request #5355 from containers/renovate/go.etcd.io-bbolt-1.x
Update module go.etcd.io/bbolt to v1.3.9
2024-02-25 01:43:24 +00:00
renovate[bot] 5748595ae7
Update module go.etcd.io/bbolt to v1.3.9
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-24 19:37:57 +00:00
openshift-merge-bot[bot] 608c5bab71
Merge pull request #5350 from cevich/revert_microdnf
[CI:DOCS] Revert "Reduce official image size"
2024-02-21 22:13:29 +00:00
Tom Sweeney 184842000e
Merge branch 'main' into revert_microdnf 2024-02-21 16:02:29 -05:00
openshift-merge-bot[bot] b10478a574
Merge pull request #5341 from containers/renovate/github.com-opencontainers-image-spec-1.x
Update module github.com/opencontainers/image-spec to v1.1.0
2024-02-21 20:12:29 +00:00
Chris Evich fee7050811
Revert "Reduce official image size"
Fixes: #5349

Unanticipated missing `dnf` functionality likely negatively impacts a
significant number of image users.  Further exploration of size
reduction is needed, but we cannot (likely) swap to `microdnf` easily.

This reverts commit cdb1a4ff8e.

Signed-off-by: Chris Evich <cevich@redhat.com>
2024-02-21 15:03:52 -05:00
renovate[bot] aee02318ab
Update module github.com/opencontainers/image-spec to v1.1.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-21 14:00:45 +00:00
openshift-merge-bot[bot] aff6485e57
Merge pull request #5347 from isker/reduce-image-size
Reduce official image size
2024-02-21 13:59:34 +00:00
Ian Kerins cdb1a4ff8e Reduce official image size
Current image size is 728MB.

1. Switch to fedora-minimal. Requires switching to dnf5. shadow-utils is
no longer included in the base image, so the bits about it are renmoved.
728MB -> 650MB.
2. Don't update unrelated packages. 650MB -> 598MB.

Ultimately the image is still very large, which is driven by the
veritable constellation of dependencies buildah installs.  Installing
`buildah` in fedora-minimal gives you this plan:

```
Package                            Arch    Version              Repository      Size
Upgrading:
 alternatives                      aarch64 1.26-1.fc39          updates    218.2 KiB
  replacing alternatives           aarch64 1.25-1.fc39          <unknown>  218.2 KiB
 bash                              aarch64 5.2.26-1.fc39        updates      8.3 MiB
  replacing bash                   aarch64 5.2.21-1.fc39        <unknown>    8.3 MiB
 crypto-policies                   noarch  20231204-1.git1e3a2e updates    149.3 KiB
  replacing crypto-policies        noarch  20231113-1.gitb402e8 <unknown>  149.1 KiB
 glibc                             aarch64 2.38-16.fc39         updates      9.7 MiB
  replacing glibc                  aarch64 2.38-11.fc39         <unknown>    9.7 MiB
 glibc-common                      aarch64 2.38-16.fc39         updates      2.6 MiB
  replacing glibc-common           aarch64 2.38-11.fc39         <unknown>    2.6 MiB
 glibc-minimal-langpack            aarch64 2.38-16.fc39         updates      0.0   B
  replacing glibc-minimal-langpack aarch64 2.38-11.fc39         <unknown>    0.0   B
 gnutls                            aarch64 3.8.3-1.fc39         updates      3.4 MiB
  replacing gnutls                 aarch64 3.8.1-1.fc39         <unknown>    3.4 MiB
 libacl                            aarch64 2.3.1-9.fc39         updates    196.0 KiB
  replacing libacl                 aarch64 2.3.1-8.fc39         <unknown>  196.0 KiB
 libblkid                          aarch64 2.39.3-5.fc39        updates    392.9 KiB
  replacing libblkid               aarch64 2.39.2-1.fc39        <unknown>  392.9 KiB
 libcap                            aarch64 2.48-9.fc39          updates      1.4 MiB
  replacing libcap                 aarch64 2.48-7.fc39          <unknown>    1.4 MiB
 libgcc                            aarch64 13.2.1-6.fc39        updates    349.7 KiB
  replacing libgcc                 aarch64 13.2.1-4.fc39        <unknown>  349.8 KiB
 libidn2                           aarch64 2.3.7-1.fc39         updates    457.1 KiB
  replacing libidn2                aarch64 2.3.4-3.fc39         <unknown>  451.0 KiB
 libmount                          aarch64 2.39.3-5.fc39        updates    484.1 KiB
  replacing libmount               aarch64 2.39.2-1.fc39        <unknown>  484.1 KiB
 libsmartcols                      aarch64 2.39.3-5.fc39        updates    288.1 KiB
  replacing libsmartcols           aarch64 2.39.2-1.fc39        <unknown>  288.1 KiB
 libuuid                           aarch64 2.39.3-5.fc39        updates    197.5 KiB
  replacing libuuid                aarch64 2.39.2-1.fc39        <unknown>  197.5 KiB
 readline                          aarch64 8.2-6.fc39           updates    689.1 KiB
  replacing readline               aarch64 8.2-4.fc39           <unknown>  689.1 KiB
 systemd-libs                      aarch64 254.9-1.fc39         updates      2.4 MiB
  replacing systemd-libs           aarch64 254.5-2.fc39         <unknown>    2.4 MiB
 util-linux-core                   aarch64 2.39.3-5.fc39        updates      6.1 MiB
   replacing util-linux-core       aarch64 2.39.2-1.fc39        <unknown>    5.9 MiB
Installing:
 buildah                           aarch64 1.34.0-1.fc39        updates     28.7 MiB
Installing dependencies:
 audit-libs                        aarch64 3.1.2-8.fc39         updates    547.2 KiB
 containers-common                 noarch  4:1-99.fc39          updates    124.4 KiB
 containers-common-extra           noarch  4:1-99.fc39          updates      0.0   B
 cracklib                          aarch64 2.9.11-2.fc39        fedora     934.7 KiB
 criu                              aarch64 3.19-2.fc39          updates      1.6 MiB
 crun                              aarch64 1.14.3-1.fc39        updates    554.2 KiB
 dbus                              aarch64 1:1.14.10-1.fc39     fedora       0.0   B
 dbus-broker                       aarch64 35-2.fc39            updates    614.2 KiB
 dbus-common                       noarch  1:1.14.10-1.fc39     fedora      11.2 KiB
 device-mapper                     aarch64 1.02.197-1.fc39      updates    630.3 KiB
 device-mapper-libs                aarch64 1.02.197-1.fc39      updates    511.4 KiB
 duktape                           aarch64 2.7.0-5.fc39         fedora     928.1 KiB
 elfutils-default-yama-scope       noarch  0.190-4.fc39         updates      1.8 KiB
 expat                             aarch64 2.6.0-1.fc39         updates    532.9 KiB
 fuse-common                       aarch64 3.16.1-1.fc39        fedora      38.0   B
 fuse3                             aarch64 3.16.1-1.fc39        fedora     457.7 KiB
 fuse3-libs                        aarch64 3.16.1-1.fc39        fedora     353.5 KiB
 gnupg2                            aarch64 2.4.3-4.fc39         updates     12.1 MiB
 gpgme                             aarch64 1.20.0-5.fc39        fedora     805.1 KiB
 gzip                              aarch64 1.12-6.fc39          fedora     475.8 KiB
 iptables-legacy                   aarch64 1.8.9-5.fc39         fedora     207.8 KiB
 iptables-legacy-libs              aarch64 1.8.9-5.fc39         fedora     410.4 KiB
 iptables-libs                     aarch64 1.8.9-5.fc39         fedora      19.2 MiB
 jansson                           aarch64 2.13.1-7.fc39        fedora     220.4 KiB
 json-c                            aarch64 0.17-1.fc39          fedora     202.4 KiB
 kmod                              aarch64 30-6.fc39            fedora     316.5 KiB
 kmod-libs                         aarch64 30-6.fc39            fedora     287.3 KiB
 libargon2                         aarch64 20190702-3.fc39      fedora     213.1 KiB
 libassuan                         aarch64 2.5.6-2.fc39         fedora     279.4 KiB
 libatomic                         aarch64 13.2.1-6.fc39        updates    196.8 KiB
 libb2                             aarch64 0.98.1-9.fc39        fedora     202.1 KiB
 libbsd                            aarch64 0.11.7-5.fc39        fedora     485.7 KiB
 libcap-ng                         aarch64 0.8.3-8.fc39         fedora     416.4 KiB
 libeconf                          aarch64 0.5.2-1.fc39         fedora     204.0 KiB
 libedit                           aarch64 3.1-48.20230828cvs.f fedora     343.8 KiB
 libfdisk                          aarch64 2.39.3-5.fc39        updates    494.9 KiB
 libgcrypt                         aarch64 1.10.2-2.fc39        fedora       1.1 MiB
 libgomp                           aarch64 13.2.1-6.fc39        updates    545.5 KiB
 libgpg-error                      aarch64 1.47-2.fc39          fedora       1.1 MiB
 libibverbs                        aarch64 46.0-4.fc39          fedora       3.9 MiB
 libksba                           aarch64 1.6.4-2.fc39         fedora     522.9 KiB
 libmd                             aarch64 1.1.0-2.fc39         fedora     238.9 KiB
 libmnl                            aarch64 1.0.5-3.fc39         fedora     223.2 KiB
 libnet                            aarch64 1.3-1.fc39           updates    228.7 KiB
 libnetfilter_conntrack            aarch64 1.0.9-2.fc39         fedora     279.5 KiB
 libnfnetlink                      aarch64 1.0.1-24.fc39        fedora     213.8 KiB
 libnftnl                          aarch64 1.2.6-2.fc39         fedora     286.1 KiB
 libnl3                            aarch64 3.9.0-1.fc39         updates      1.7 MiB
 libnsl2                           aarch64 2.0.0-6.fc39         fedora     221.9 KiB
 libpcap                           aarch64 14:1.10.4-2.fc39     fedora     489.6 KiB
 libseccomp                        aarch64 2.5.3-6.fc39         fedora     243.2 KiB
 libsecret                         aarch64 0.21.2-1.fc39        updates    873.3 KiB
 libsemanage                       aarch64 3.5-4.fc39           fedora     364.2 KiB
 libslirp                          aarch64 4.7.0-4.fc39         fedora     278.6 KiB
 libtirpc                          aarch64 1.3.4-0.rc2.fc39     updates    274.7 KiB
 libusb1                           aarch64 1.0.26-3.fc39        fedora     241.0 KiB
 mpdecimal                         aarch64 2.5.1-7.fc39         fedora     328.7 KiB
 netavark                          aarch64 1.10.3-1.fc39        updates     10.0 MiB
 nftables                          aarch64 1:1.0.7-3.fc39       fedora       1.2 MiB
 npth                              aarch64 1.6-14.fc39          fedora     221.4 KiB
 pam-libs                          aarch64 1.5.3-3.fc39         updates    607.9 KiB
 pcsc-lite                         aarch64 2.0.1-1.fc39         updates    354.7 KiB
 pcsc-lite-libs                    aarch64 2.0.1-1.fc39         updates    200.5 KiB
 polkit                            aarch64 123-1.fc39.1         updates      1.4 MiB
 polkit-libs                       aarch64 123-1.fc39.1         updates    415.2 KiB
 polkit-pkla-compat                aarch64 0.1-26.fc39          fedora     425.7 KiB
 protobuf-c                        aarch64 1.4.1-5.fc39         fedora     225.1 KiB
 python-pip-wheel                  noarch  23.2.1-1.fc39        fedora       1.5 MiB
 python3                           aarch64 3.12.1-2.fc39        updates    211.8 KiB
 python3-libs                      aarch64 3.12.1-2.fc39        updates     51.9 MiB
 qemu-user-static-aarch64          aarch64 2:8.1.3-3.fc39       updates     12.9 MiB
 qemu-user-static-alpha            aarch64 2:8.1.3-3.fc39       updates      3.5 MiB
 qemu-user-static-arm              aarch64 2:8.1.3-3.fc39       updates      9.1 MiB
 qemu-user-static-cris             aarch64 2:8.1.3-3.fc39       updates      3.4 MiB
 qemu-user-static-hexagon          aarch64 2:8.1.3-3.fc39       updates      5.8 MiB
 qemu-user-static-hppa             aarch64 2:8.1.3-3.fc39       updates      3.5 MiB
 qemu-user-static-loongarch64      aarch64 2:8.1.3-3.fc39       updates      3.8 MiB
 qemu-user-static-m68k             aarch64 2:8.1.3-3.fc39       updates      3.7 MiB
 qemu-user-static-microblaze       aarch64 2:8.1.3-3.fc39       updates      6.9 MiB
 qemu-user-static-mips             aarch64 2:8.1.3-3.fc39       updates     26.4 MiB
 qemu-user-static-nios2            aarch64 2:8.1.3-3.fc39       updates      3.4 MiB
 qemu-user-static-or1k             aarch64 2:8.1.3-3.fc39       updates      3.4 MiB
 qemu-user-static-ppc              aarch64 2:8.1.3-3.fc39       updates     13.5 MiB
 qemu-user-static-riscv            aarch64 2:8.1.3-3.fc39       updates      9.2 MiB
 qemu-user-static-s390x            aarch64 2:8.1.3-3.fc39       updates      3.9 MiB
 qemu-user-static-sh4              aarch64 2:8.1.3-3.fc39       updates      7.0 MiB
 qemu-user-static-sparc            aarch64 2:8.1.3-3.fc39       updates     10.8 MiB
 qemu-user-static-x86              aarch64 2:8.1.3-3.fc39       updates      8.1 MiB
 qemu-user-static-xtensa           aarch64 2:8.1.3-3.fc39       updates     13.7 MiB
 shadow-utils                      aarch64 2:4.14.0-2.fc39      updates      7.1 MiB
 shadow-utils-subid                aarch64 2:4.14.0-2.fc39      updates    394.8 KiB
 systemd                           aarch64 254.9-1.fc39         updates     25.0 MiB
 systemd-pam                       aarch64 254.9-1.fc39         updates      1.2 MiB
 tpm2-tss                          aarch64 4.0.1-6.fc39         updates      3.2 MiB
 tzdata                            noarch  2024a-2.fc39         updates      1.6 MiB
 xkeyboard-config                  noarch  2.40-1.fc39          updates      6.6 MiB
 yajl                              aarch64 2.1.0-22.fc39        fedora     598.4 KiB
Installing weak dependencies:
 aardvark-dns                      aarch64 1.10.0-1.fc39        updates      2.1 MiB
 cracklib-dicts                    aarch64 2.9.11-2.fc39        fedora       9.3 MiB
 criu-libs                         aarch64 3.19-2.fc39          updates    196.7 KiB
 cryptsetup-libs                   aarch64 2.6.1-3.fc39         fedora       2.1 MiB
 diffutils                         aarch64 3.10-3.fc39          fedora       2.1 MiB
 elfutils-debuginfod-client        aarch64 0.190-4.fc39         updates    396.8 KiB
 elfutils-libelf                   aarch64 0.190-4.fc39         updates      1.1 MiB
 elfutils-libs                     aarch64 0.190-4.fc39         updates      1.0 MiB
 fuse-overlayfs                    aarch64 1.12-2.fc39          fedora     218.8 KiB
 glibc-langpack-en                 aarch64 2.38-16.fc39         updates      5.7 MiB
 gnupg2-smime                      aarch64 2.4.3-4.fc39         updates    739.1 KiB
 libbpf                            aarch64 2:1.1.0-4.fc39       fedora     458.5 KiB
 libpwquality                      aarch64 1.4.5-6.fc39         fedora       1.1 MiB
 libxkbcommon                      aarch64 1.6.0-1.fc39         updates    597.3 KiB
 passt                             aarch64 0^20231230.gf091893- updates    784.7 KiB
 pcsc-lite-ccid                    aarch64 1.5.5-1.fc39         updates      1.9 MiB
 pinentry                          aarch64 1.2.1-4.fc39         fedora     361.7 KiB
 python-unversioned-command        noarch  3.12.1-2.fc39        updates     23.0   B
 qemu-user-static                  aarch64 2:8.1.3-3.fc39       updates     44.6 KiB
 qrencode-libs                     aarch64 4.1.1-5.fc39         fedora     300.9 KiB
 slirp4netns                       aarch64 1.2.2-1.fc39         updates    225.6 KiB
 systemd-networkd                  aarch64 254.9-1.fc39         updates      2.3 MiB
 systemd-resolved                  aarch64 254.9-1.fc39         updates    704.8 KiB
 tar                               aarch64 2:1.35-2.fc39        fedora       3.1 MiB

Transaction Summary:
 Installing:      122 packages
 Upgrading:        18 packages
 Replacing:        18 packages

Total size of inbound packages is 89 MiB. Need to download 89 MiB.
After this operation 390 MiB will be used (install 427 MiB, remove 37MiB).
```

There's a lot of confusing stuff in there, and we can't do anything to
fix that here.

See #5321.

Signed-off-by: Ian Kerins <git@isk.haus>
2024-02-21 00:07:36 -05:00
Lokesh Mandvekar 540a73296f
Merge pull request #5339 from dfr/freebsd-cni
Build with CNI support on FreeBSD
2024-02-16 17:00:45 +05:30
Doug Rabson eb6269d8cc Build with CNI support on FreeBSD
This is needed until there is netavark support on FreeBSD

[NO NEW TESTS NEEDED]

Signed-off-by: Doug Rabson <dfr@rabson.org>
2024-02-15 08:27:23 +00:00
openshift-merge-bot[bot] a626bd17b0
Merge pull request #5335 from nalind/only-most-platforms
build --all-platforms: skip some base "image" platforms
2024-02-12 22:44:42 +00:00
Nalin Dahyabhai 98f8707535 build --all-platforms: skip some base "image" platforms
When figuring out which platforms the base images allow us to build
derived images for, screen out any images with non-empty artifactType
values.  Also screen out any which use empty values or the word
"unknown" in the OS and Architecture platform fields, and any
Architecture values that the compiler hasn't heard of.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2024-02-12 14:34:04 -05:00
openshift-merge-bot[bot] d62beb9833
Merge pull request #5328 from TomSweeneyRedHat/dev/tsweeney/v1.35
Bump main to v1.35.0-dev
2024-02-09 15:37:26 +00:00
tomsweeneyredhat d73e211205 Bump main to v1.35.0-dev
There have been a number of breaking changes added
since v1.34 to the main branch.  We'll create a new
release branch for v1.34 and will set the version in
main to 1.35.0-dev.

The intended target for Buildah v1.35 is Fedora 40.

[NO NEW TESTS NEEDED]
Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2024-02-08 10:42:20 -05:00
openshift-merge-bot[bot] f2a11e6245
Merge pull request #5290 from rhatdan/VENDOR
Vendor in latest containers/storage and image
2024-02-08 15:11:23 +00:00
openshift-merge-bot[bot] 35d2366ffd
Merge pull request #5288 from nalind/sbom
Split up error messages for missing --sbom related flags
2024-02-08 14:43:52 +00:00
Daniel J Walsh 90c0d97941
Vendor in latest containers/(storage,image,common)
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2024-02-08 06:43:21 -05:00
Nalin Dahyabhai 1def7d6de4 Split up error messages for missing --sbom related flags
Split up the diagnostic for missing SBOM generation settings so that we
can more easily tell the difference between "you didn't tell me where to
put the output files" and "I don't know how to generate things".

[NO NEW TESTS NEEDED]

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2024-02-07 15:57:55 -05:00
openshift-merge-bot[bot] 817237adff
Merge pull request #5301 from nalind/fun-with-artifacts
buildah manifest: add artifact-related options
2024-02-07 20:20:31 +00:00
Nalin Dahyabhai aca884a89d `buildah manifest`: add artifact-related options
Add functionality for creating artifact manifests and adding them to
image indexes.  `buildah manifest add` gets a `--artifact` option for
telling it to create artifact manifests, and `--artifact-type`,
`--artifact-config`, `--artifact-config-type`, `--artifact-layer-type`,
`--artifact-exclude-titles`, and `--subject` options to fine-tune the
contents of the artifact manifests it creates.

Add a `--index` flag to `buildah manifest annotate` so that it can be
told to set annotations on the index itself instead of on one of the
entries in the image index.

Add a `--subject` flag to `buildah manifest annotate` for setting the
`subject` field of an image index.

Add a `--annotation` flag to `buildah manifest create` to allow for
adding annotations to the new image index.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2024-02-07 11:51:58 -05:00
Nalin Dahyabhai 07057917dc cmd/buildah/manifest.go: lock lists before adding/annotating/pushing
Lock an image index's image before attempting to modify or push it.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2024-02-07 11:51:32 -05:00
Nalin Dahyabhai a0852e9947 cmd/buildah/manifest.go: don't make struct declarations aliases
Locally-defined structs don't need to be aliases for themselves.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2024-02-07 11:51:06 -05:00