Commit Graph

3272 Commits

Author SHA1 Message Date
Miloslav Trmač
013ba490f1 Update conditions for signing tests
NewEphemeralSigningMechanism() may, with Sequoia, return
a mechanism which !SupportsSigning(); so, to determine that,
test with a non-ephemeral mechanism instead. (That's likely
actually faster, because we create a GNUPGHOME in these tests
anyway, so we avoid creating an deleting a separate temporary
directory.)

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2025-08-08 16:52:56 +02:00
Miloslav Trmač
d6d2c975d4 Stop using fgrep
> fgrep: warning: fgrep is obsolescent; using grep -F

Should not change behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2025-08-08 16:52:50 +02:00
Miloslav Trmač
60b95b1be1 Merge pull request #2673 from containers/renovate/golang.org-x-term-0.x
fix(deps): update module golang.org/x/term to v0.34.0
2025-08-07 21:45:43 +02:00
renovate[bot]
2d34849c79 fix(deps): update module golang.org/x/term to v0.34.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-08-07 18:04:08 +00:00
Miloslav Trmač
d983e39b88 Merge pull request #2672 from containers/renovate/github.com-containers-common-0.x
fix(deps): update module github.com/containers/common to v0.64.1
2025-08-05 22:18:30 +02:00
renovate[bot]
5538ce8c5f fix(deps): update module github.com/containers/common to v0.64.1
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-08-05 17:11:40 +00:00
Miloslav Trmač
5db9ff4ad8 Merge pull request #2671 from containers/renovate/github.com-containers-image-v5-5.x
fix(deps): update module github.com/containers/image/v5 to v5.36.1
2025-08-04 23:13:55 +02:00
renovate[bot]
12340b3e7e fix(deps): update module github.com/containers/image/v5 to v5.36.1
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-08-04 20:36:01 +00:00
Miloslav Trmač
ddf1ea2844 Merge pull request #2670 from containers/renovate/github.com-containers-storage-1.x
fix(deps): update module github.com/containers/storage to v1.59.1
2025-08-04 21:30:57 +02:00
renovate[bot]
94ef22e9e7 fix(deps): update module github.com/containers/storage to v1.59.1
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-08-04 16:33:39 +00:00
Miloslav Trmač
a7a0fc47b6 Merge pull request #2668 from containers/renovate/golangci-golangci-lint-2.x
chore(deps): update dependency golangci/golangci-lint to v2.3.1
2025-08-04 13:41:57 +02:00
renovate[bot]
f9d10b3c9c chore(deps): update dependency golangci/golangci-lint to v2.3.1
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-08-03 00:51:58 +00:00
Miloslav Trmač
47aa5f526b Merge pull request #2666 from TomSweeneyRedHat/dev/tsweeney/v1.20.0
Bump to v1.20.0 then v1.21.0-dev
2025-08-02 14:07:30 +02:00
tomsweeneyredhat
af9f6d73e0 Bump to v1.21.0-dev
Bump main back to the next dev version.

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2025-08-01 15:00:17 -04:00
tomsweeneyredhat
e2c1eecd40 Bump to v1.20.0
Bumping to v1.20 to align with Buildah v1.41 and Podman v5.6
now that Skopeo has the same c/* libraries vendored in.

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
v1.20.0
2025-08-01 14:58:20 -04:00
Miloslav Trmač
5650a2cd4d Merge pull request #2665 from containers/renovate/go-github.com-docker-docker-vulnerability
chore(deps): update module github.com/docker/docker to v28.3.3+incompatible [security]
2025-08-01 11:23:46 +02:00
renovate[bot]
33d3ae416a chore(deps): update module github.com/docker/docker to v28.3.3+incompatible [security]
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-08-01 08:57:22 +00:00
Miloslav Trmač
bec43c5784 Merge pull request #2664 from containers/renovate/github.com-opencontainers-image-spec-digest
fix(deps): update github.com/opencontainers/image-spec digest to 2daaaaf
2025-08-01 10:56:20 +02:00
renovate[bot]
36176ac499 fix(deps): update github.com/opencontainers/image-spec digest to 2daaaaf
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-08-01 05:26:22 +00:00
Miloslav Trmač
92ee8a550d Merge pull request #2661 from lsm5/registry-binary
integration: rename registry binary
2025-07-23 19:09:27 +02:00
Lokesh Mandvekar
d1bbcb4626 openshiftCluster.dockerLogin: create path with parents
Co-authored-by: Miloslav Trmač <mitr@redhat.com>
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
2025-07-22 10:47:37 -04:00
Lokesh Mandvekar
5973d144f2 integration: rename registry binary
The skopeo_cidev image is updated with the registry binary from the
docker-distribution package instead of building one from source.

Ref: https://github.com/containers/automation_images/pull/410

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
2025-07-22 10:47:37 -04:00
Miloslav Trmač
cf76c899c7 Merge pull request #2662 from containers/renovate/golangci-golangci-lint-2.x
Update dependency golangci/golangci-lint to v2.3.0
2025-07-22 12:04:45 +02:00
renovate[bot]
a4f3fb313a Update dependency golangci/golangci-lint to v2.3.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-07-21 19:43:45 +00:00
Miloslav Trmač
b59c8598cd Merge pull request #2650 from mtrmac/sequoia-cli-infra
Prepare for `--sign-by-sq-fingerprint`
2025-07-18 18:52:15 +02:00
Miloslav Trmač
203a4cf741 Improve parameter passing to hack/test-system.sh
Allow passing SKOPEO_LDFLAGS and BUILDTAGS.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2025-07-18 17:59:10 +02:00
Miloslav Trmač
319d18c0f9 Improve parameter passing to hack/test-integration.sh
Rely on "$@" to allow passing options with spaces, like SKOPEO_LDFLAGS.
Then pass SKOPEO_LDFLAGS.

Also fix the documentation of TESTFLAGS.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2025-07-18 17:59:10 +02:00
Miloslav Trmač
94e949984f Centralize policy edits in copySuite.policyFixture
Should not change test behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2025-07-18 17:59:10 +02:00
Miloslav Trmač
5d2cb67fb1 Use t.Cleanup in fileFromFixture
... to simplify users.

Should not change test behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2025-07-18 17:59:10 +02:00
Miloslav Trmač
4dafc99bd6 Merge pull request #2657 from containers/renovate/github.com-spf13-pflag-1.x
Update module github.com/spf13/pflag to v1.0.7
2025-07-18 17:58:23 +02:00
renovate[bot]
d64b59917d Update module github.com/spf13/pflag to v1.0.7
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-07-17 19:26:14 +00:00
Lokesh Mandvekar
5a1e5749c8 Merge pull request #2658 from containers/renovate/github.com-containers-common-0.x
Update module github.com/containers/common to v0.64.0
2025-07-17 15:24:19 -04:00
renovate[bot]
0aab0745e9 Update module github.com/containers/common to v0.64.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-07-17 19:03:14 +00:00
Miloslav Trmač
7b68a033bc Merge pull request #2659 from mtrmac/image-spec
Update opencontainers/image-spec after https://github.com/opencontainers/image-spec/pull/1253
2025-07-17 21:00:42 +02:00
Miloslav Trmač
a3b8e175c5 Update opencontainers/image-spec after https://github.com/opencontainers/image-spec/pull/1253 .
This updates github.com/opencontainers/image-spec/schema subpackage from an obsolete
.../jsonschema/v5 to /v6 .

We use these dependencies only in tests, so it doesn't matter that much,
but removing references to years-old unmaintained versions makes it easier to check
/ remove other such cases.

(This is test-only, so the added files in vendor/ do not mean a larger binary
size; it's almost exactly unchanged.)

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2025-07-17 19:25:53 +02:00
Miloslav Trmač
729a053464 Merge pull request #2653 from containers/renovate/github.com-containers-image-v5-5.x
Update module github.com/containers/image/v5 to v5.36.0
2025-07-16 16:13:54 +02:00
renovate[bot]
f17b4c9672 Update module github.com/containers/image/v5 to v5.36.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-07-15 21:58:37 +00:00
Miloslav Trmač
cb17dedf54 Merge pull request #2651 from containers/renovate/golangci-golangci-lint-2.x
Update dependency golangci/golangci-lint to v2.2.2
2025-07-11 19:14:49 +02:00
renovate[bot]
f87d569628 Update dependency golangci/golangci-lint to v2.2.2
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-07-11 16:56:02 +00:00
Miloslav Trmač
b395b2b923 Merge pull request #2648 from mtrmac/shared-signing
Consolidate options shared between copy and sync to sharedCopyOptions
2025-07-10 21:41:37 +02:00
Miloslav Trmač
f9bdc2d8fc Consolidate options shared between copy and sync to sharedCopyOptions
Add some test coverage, but not full - the previous code
did not have any.

Should not change behavior, other than some help texts.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2025-07-10 21:11:30 +02:00
Miloslav Trmač
1f18641d34 Consistently use AddFlagSet before flag definitions
AddFlagSet silently ignores conflicting flags, whereas individual
flag definitions panic on (simple) conflicts; so, to detect ambiguities,
prefer to use AddFlagSet first.

Should not change behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2025-07-10 21:11:30 +02:00
Miloslav Trmač
8651716fa7 Merge pull request #2647 from mtrmac/sha256-test-keys
Update GPG keys not to use SHA-1
2025-07-10 21:09:25 +02:00
Miloslav Trmač
4ac60afc85 Update GPG keys not to use SHA-1
Sequoia-PGP does not accept SHA-1 by default; update
to avoid that.

Both the keys and the signatures come from c/image commit
70dbc81047f63a68130a5bdf1bfaee43db39746d .

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2025-07-10 20:24:17 +02:00
Miloslav Trmač
73f3b44cdb Merge pull request #2649 from containers/renovate/golang.org-x-term-0.x
Update module golang.org/x/term to v0.33.0
2025-07-10 18:21:03 +02:00
renovate[bot]
862c2331b7 Update module golang.org/x/term to v0.33.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-07-09 23:42:17 +00:00
Miloslav Trmač
872ab48154 Merge pull request #2637 from containers/renovate/github.com-masterminds-semver-v3-3.x
Update module github.com/Masterminds/semver/v3 to v3.4.0
2025-06-30 18:35:27 +02:00
renovate[bot]
ef2375bc80 Update module github.com/Masterminds/semver/v3 to v3.4.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-06-30 15:53:16 +00:00
Miloslav Trmač
a4ab531365 Merge pull request #2638 from containers/renovate/golangci-golangci-lint-2.x
Update dependency golangci/golangci-lint to v2.2.1
2025-06-30 17:52:07 +02:00
renovate[bot]
3de83e9f73 Update dependency golangci/golangci-lint to v2.2.1
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-06-30 15:23:26 +00:00