Commit Graph

4087 Commits

Author SHA1 Message Date
Paul Holzinger ba53f74292 Makefile: make sure we never add toolchain
We don't want to force a new go version for local builds

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2025-03-12 14:19:11 +01:00
openshift-merge-bot[bot] 64c94ae14f Merge pull request #2361 from containers/renovate/golangci-golangci-lint-1.x
chore(deps): update dependency golangci/golangci-lint to v1.64.7
2025-03-12 10:54:08 +00:00
renovate[bot] cf4afe77c7 chore(deps): update dependency golangci/golangci-lint to v1.64.7
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-03-12 02:25:50 +00:00
openshift-merge-bot[bot] e6a3fecd0f Merge pull request #2276 from lsm5/packit-remove-rhel
[skip-ci] Packit: remove epel/rhel copr targets
2025-03-11 12:15:56 +00:00
openshift-merge-bot[bot] e69effc801 Merge pull request #2359 from lsm5/rpmlint
[skip-ci] RPM: silence rpmlint warning
2025-03-11 12:13:14 +00:00
Lokesh Mandvekar 700d9c2351 [skip-ci] RPM: silence rpmlint warning
Doesn't affect upstream

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2025-03-11 17:29:32 +05:30
Lokesh Mandvekar e12b149a13 [skip-ci] Packit: remove epel/rhel copr targets
rhel copr targets are often outdated causing failed builds and tests.
Best to only have CentOS Stream targets upstream, so we ensure
everything that enters RHEL at some point has been tested upstream.

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2025-03-11 17:28:27 +05:30
openshift-merge-bot[bot] c4f20ceed9 Merge pull request #2355 from Luap99/disk-usage
libimage: rework DiskUsage() to count layers
2025-03-10 17:09:03 +00:00
Paul Holzinger e3d6a28822 libimage: rework DiskUsage() to count layers
The old implementation only counted full images when sharing content
between them. That is wrong, the store is layer based. We can have two
images with no parent image that shares layers.

As such get rid of the image tree that only is able to walk child/parent
images. Instead we actually walk all layers now and correctly notice
when they are shared.

To this this correctly, first convert all layers to map so we can look
them up by ID. And add missing size information if needed. Then we walk
all images layers and count how often each layers is used. Then walk
again but this time we know if the layer size must be shared or not so
we can actually acount things correctly.

Fixes: containers/podman#24452
Fixes: https://issues.redhat.com/browse/RHEL-29641

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2025-03-10 12:16:22 +01:00
openshift-merge-bot[bot] 8e47f514cd Merge pull request #2333 from mtrmac/c-image-for-docker
Update c/image to main
2025-03-06 14:29:25 +00:00
Miloslav Trmač 52f072860f Update c/image to main
... primarily to update docker/docker to v28; that broke API, so we
need to update the c/image caller as well.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2025-03-05 21:53:06 +01:00
Miloslav Trmač 7b2902a2dc Replace a reference to github.com/docker/docker/pkg/parsers.ParseUintList
It is deprecated in the docker repo as of v28. We are already carrying a
variant in c/storage.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2025-03-05 21:52:42 +01:00
openshift-merge-bot[bot] 2650c8db01 Merge pull request #2349 from kolyshkin/no-regexp
No regexp
2025-03-05 13:27:55 +00:00
Kir Kolyshkin 22a1d1c8f5 pkg/config: do not use regexp in validateUmask
Using ParseUint is faster and simpler.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2025-03-04 12:34:07 -08:00
openshift-merge-bot[bot] c92343f206 Merge pull request #2341 from Luap99/nv-ip-leak
libnetwork/netavark: dealloc ips on setup error
2025-03-04 20:12:45 +00:00
Kir Kolyshkin 97b3f8b60b pkg/secrets: replace regex with strings.ContainsAny
...which is both simpler and faster.

The change is being tested by TestAddSecretName.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2025-03-04 11:34:32 -08:00
openshift-merge-bot[bot] 2d7cb1ca7c Merge pull request #2346 from kolyshkin/golangci-lint
ci: fixups to golangci lint configuration
2025-03-04 19:31:32 +00:00
openshift-merge-bot[bot] 015b65001e Merge pull request #2348 from Luap99/merge-back
Merge back v0.62.1 into main
2025-03-04 17:31:01 +00:00
Paul Holzinger ced0f18641 Merge tag 'v0.62.1' into merge-back
Merge the tag back into main to make go modules aware that main is newer
than this tag.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2025-03-04 11:53:44 +01:00
openshift-merge-bot[bot] c5300bbc84 Merge pull request #2344 from kolyshkin/no-dm
Makefile,.golangci.yml: rm exclude_graphdriver_devicemapper
2025-03-04 10:39:51 +00:00
openshift-merge-bot[bot] a8a00194af Merge pull request #2342 from containers/renovate/github.com-opencontainers-image-spec-1.x
fix(deps): update module github.com/opencontainers/image-spec to v1.1.1
2025-03-04 10:28:29 +00:00
Kir Kolyshkin a487d16d0b .cirrus.yml: rm GOLANGCILINT_CACHE
It is not used since commit b63d51f3 ("cirrus-ci: rm make validate").

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2025-03-03 18:48:48 -08:00
Kir Kolyshkin ab6465985a ci: rm deprecated linters from .golangci.yml
This fixes the following warnings from golangci-lint v1.64.6:

	WARN [lintersdb] The linter "gomnd" is deprecated (step 2) and deactivated. It should be removed from the list of disabled linters. https://golangci-lint.run/product/roadmap/#linter-deprecation-cycle
	WARN [lintersdb] The linter "execinquery" is deprecated (step 2) and deactivated. It should be removed from the list of disabled linters. https://golangci-lint.run/product/roadmap/#linter-deprecation-cycle

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2025-03-03 18:39:44 -08:00
Kir Kolyshkin 9fc8f2b0aa Makefile: rm golangci-lint installation
Currently, "make validate" is not used from any CI workflows, meaning
it is there for local developer consumption only. For that case, we
can safely assume that a developer can maintain a recent golangci-lint
installation.

This also fixes the problem of golangci-lint version discrepancy between
Makefile and .github/workflows/validate.yml, introduced by commit 594e9b833
("renovate: teach it to update the lint version").

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2025-03-03 18:37:49 -08:00
Kir Kolyshkin 020e122214 Makefile,.golangci.yml: rm exclude_graphdriver_devicemapper
It is not needed since commit 34145bbe ("Bump c/image to v5.31.0,
c/storage v1.54.0"), which removes device mapper support.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2025-03-03 17:18:37 -08:00
renovate[bot] 664a3129bf fix(deps): update module github.com/opencontainers/image-spec to v1.1.1
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-03-03 16:28:49 +00:00
Paul Holzinger 829598d49a libnetwork/netavark: dealloc ips on setup error
While we already did clean up the allocated ips on the regular setup
error this did not worked for errors from the rootlessNetns.Setup()
call. To ensure we dealloc the ips on all error paths use a defer
function that checks the return error value.

Fixes containers/podman#25422

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2025-03-03 14:04:33 +01:00
openshift-merge-bot[bot] 06b7d1d0f6 Merge pull request #2335 from mtrmac/enforce-digests
Use UnparsedInstance.Manifest instead of ImageSource.GetManifest
2025-03-03 10:31:39 +00:00
openshift-merge-bot[bot] 2907b7ce95 Merge pull request #2340 from containers/renovate/golangci-golangci-lint-1.x
chore(deps): update dependency golangci/golangci-lint to v1.64.6
2025-03-03 10:28:54 +00:00
renovate[bot] 894bb8ff3a chore(deps): update dependency golangci/golangci-lint to v1.64.6
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-03-03 02:20:12 +00:00
tomsweeneyredhat 1de2a3d438 [v0.62] Bump to c/common v0.62.1
As the title says.  Part of a vendor dance for the
RHEL 9.6/10.0 ZeroDay.

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2025-02-28 15:04:21 -05:00
tomsweeneyredhat b4e9dc2bbb [v0.62] Bump c/image to v5.34.1
Bump c/image to v5.34.1 which will bring in BYOPKI signature
verification per CRIO's request starting with: https://github.com/containers/image/pull/2579

This is targeted for RHEL 9.6/10.0 ZeroDay.

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2025-02-28 15:03:03 -05:00
Miloslav Trmač 904e85e7f7 Add a missing .Close()
The underlying implementation does not do anything, so purely
for consistency.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2025-02-28 20:16:31 +01:00
Miloslav Trmač 0ebdf967d6 Use UnparsedInstance.Manifest instead of ImageSource.GetManifest
... to validate that the manifests match expected digests, if any.

Do this everywhere, even where we read local storage which is
mostly trusted, because it is cheap enough and being consistent
makes it less likely for the code to be copied into other
contexts where the sources are not trusted.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2025-02-28 20:16:28 +01:00
openshift-merge-bot[bot] 20a8e90334 Merge pull request #2334 from containers/renovate/github.com-opencontainers-runtime-spec-1.x
fix(deps): update module github.com/opencontainers/runtime-spec to v1.2.1
2025-02-28 14:49:42 +00:00
renovate[bot] ea72a3c9be fix(deps): update module github.com/opencontainers/runtime-spec to v1.2.1
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-02-28 02:06:58 +00:00
openshift-merge-bot[bot] d24c34c9a9 Merge pull request #2332 from containers/renovate/go-github.com-go-jose-go-jose-v4-vulnerability
chore(deps): update module github.com/go-jose/go-jose/v4 to v4.0.5 [security]
2025-02-26 18:14:19 +00:00
renovate[bot] c5572ece97 chore(deps): update module github.com/go-jose/go-jose/v4 to v4.0.5 [security]
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-02-26 17:58:53 +00:00
openshift-merge-bot[bot] 26c55da5a9 Merge pull request #2331 from containers/renovate/tags.cncf.io-container-device-interface-0.x
fix(deps): update module tags.cncf.io/container-device-interface to v0.8.1
2025-02-26 17:57:47 +00:00
renovate[bot] 4dfdf5698c fix(deps): update module tags.cncf.io/container-device-interface to v0.8.1
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-02-24 19:03:49 +00:00
openshift-merge-bot[bot] 02845a045c Merge pull request #2327 from containers/renovate/golangci-golangci-lint-1.x
chore(deps): update dependency golangci/golangci-lint to v1.64.5
2025-02-18 10:28:54 +00:00
renovate[bot] ea512beab6 chore(deps): update dependency golangci/golangci-lint to v1.64.5
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-02-17 15:53:36 +00:00
openshift-merge-bot[bot] 1c3f39e948 Merge pull request #2323 from Luap99/lint
update golangci-lint to v1.64.4
2025-02-17 15:53:04 +00:00
openshift-merge-bot[bot] 11c5b2c60f Merge pull request #2325 from containers/renovate/github.com-spf13-cobra-1.x
fix(deps): update module github.com/spf13/cobra to v1.9.1
2025-02-17 15:06:20 +00:00
renovate[bot] cb5f0c91f1 fix(deps): update module github.com/spf13/cobra to v1.9.1
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-02-17 14:52:25 +00:00
openshift-merge-bot[bot] 2a6493a6e3 Merge pull request #2326 from dfr/freebsd-nocaps
pkg/config: make Capabilities() a no-op stub on non-linux platforms
2025-02-17 14:51:19 +00:00
Doug Rabson 2b75c29931 pkg/config: make Capabilities() a no-op stub on non-linux platforms
This fixes 'podman build' and 'buildah build' on non-linux platforms
where (*Config).Capabilities started throwing errors after the
pkg/capabilities package started using github.com/moby/sys/capability to
validate the capability lists.

Signed-off-by: Doug Rabson <dfr@rabson.org>
2025-02-17 14:32:11 +00:00
Paul Holzinger 594e9b8330 renovate: teach it to update the lint version
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2025-02-14 11:50:51 +01:00
Paul Holzinger 4319ff8c26 update golangci-lint to v1.64.4
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2025-02-14 11:50:51 +01:00
Paul Holzinger d4e88c2245 fix issue reported by recvcheck
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2025-02-14 11:50:51 +01:00