Skip to content

Commit be97860

Browse files
JasonPowrJasonPowr
authoredJan 13, 2025··
Merge branch 'main' into konflux/mintmaker/main/registry.access.redhat.com-ubi9-httpd-24
2 parents 8f2316e + f4c103c commit be97860

6 files changed

+105
-122
lines changed
 

‎Dockerfile.client-server-cg.rh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
FROM quay.io/securesign/cli-cosign@sha256:4ec69652b96c3cfddc813c42a763d81dc82f894c745a33e99deaa92814f4e918 AS cosign
44
FROM quay.io/securesign/gitsign@sha256:26288a765783d5c0ee93c5150523eca7610a021d9725494d4373f0529a2fee29 AS gitsign
55

6-
FROM registry.access.redhat.com/ubi9/ubi-minimal@sha256:8b6978d555746877c73f52375f60fd7b6fd27d6aca000eaed27d0995303c13de
6+
FROM registry.access.redhat.com/ubi9/ubi-minimal@sha256:e408de45e95eed0539fe821d31aa4288fe430d94f09a24c13c567bf99044dace
77
ENV APP_ROOT=/opt/app-root
88
WORKDIR $APP_ROOT/src/
99

‎Dockerfile.client-server-f.rh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Provides the Trusted Artifact Signer CLI binary, fetch-tsa-certs
22
FROM quay.io/securesign/fetch-tsa-certs@sha256:04ee10dd6f36b7ebca80c0e7badeb5c69d4ae2b37eb1abbea204d1af4eb1d0cc as fetch_tsa_certs
33

4-
FROM registry.access.redhat.com/ubi9/ubi-minimal@sha256:8b6978d555746877c73f52375f60fd7b6fd27d6aca000eaed27d0995303c13de
4+
FROM registry.access.redhat.com/ubi9/ubi-minimal@sha256:e408de45e95eed0539fe821d31aa4288fe430d94f09a24c13c567bf99044dace
55
ENV APP_ROOT=/opt/app-root
66
WORKDIR $APP_ROOT/src/
77

‎Dockerfile.client-server-re.rh

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
FROM quay.io/securesign/rekor-cli@sha256:0f874a33e5ee36ed6cdb080e1774a6d66d3c095458f8a138b5c0f95fd8f32944 as rekor
55
FROM registry.redhat.io/rhtas/ec-rhel9:0.5@sha256:815110eec64d0d7fb4af003e86c261234b165bcfde8012f0891eba6c0c419b4e as ec
66

7-
FROM registry.access.redhat.com/ubi9/ubi-minimal@sha256:8b6978d555746877c73f52375f60fd7b6fd27d6aca000eaed27d0995303c13de
7+
FROM registry.access.redhat.com/ubi9/ubi-minimal@sha256:e408de45e95eed0539fe821d31aa4288fe430d94f09a24c13c567bf99044dace
88

99
ENV APP_ROOT=/opt/app-root
1010
WORKDIR $APP_ROOT/src/

‎Dockerfile.cosign.rh

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ RUN git config --global --add safe.directory /cosign && \
2222
git update-index --no-assume-unchanged Dockerfile.cosign.rh
2323

2424
# Install Cosign
25-
FROM registry.access.redhat.com/ubi9/ubi-minimal@sha256:8b6978d555746877c73f52375f60fd7b6fd27d6aca000eaed27d0995303c13de
25+
FROM registry.access.redhat.com/ubi9/ubi-minimal@sha256:e408de45e95eed0539fe821d31aa4288fe430d94f09a24c13c567bf99044dace
2626

2727
LABEL description="Cosign is a container signing tool that leverages simple, secure, and auditable signatures based on simple primitives and best practices."
2828
LABEL io.k8s.description="Cosign is a container signing tool that leverages simple, secure, and auditable signatures based on simple primitives and best practices."

‎go.mod

+33-35
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,13 @@ require (
4949
github.com/transparency-dev/merkle v0.0.2
5050
github.com/withfig/autocomplete-tools/integrations/cobra v1.2.1
5151
github.com/xanzy/go-gitlab v0.109.0
52-
go.step.sm/crypto v0.51.2
53-
golang.org/x/crypto v0.27.0
54-
golang.org/x/oauth2 v0.23.0
55-
golang.org/x/sync v0.8.0
56-
golang.org/x/term v0.24.0
57-
google.golang.org/api v0.196.0
58-
google.golang.org/protobuf v1.34.2
52+
go.step.sm/crypto v0.51.1
53+
golang.org/x/crypto v0.31.0
54+
golang.org/x/oauth2 v0.24.0
55+
golang.org/x/sync v0.10.0
56+
golang.org/x/term v0.27.0
57+
google.golang.org/api v0.214.0
58+
google.golang.org/protobuf v1.35.2
5959
k8s.io/api v0.28.3
6060
k8s.io/apimachinery v0.28.3
6161
k8s.io/client-go v0.28.3
@@ -64,14 +64,14 @@ require (
6464
)
6565

6666
require (
67-
cloud.google.com/go v0.115.1 // indirect
68-
cloud.google.com/go/auth v0.9.3 // indirect
69-
cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect
70-
cloud.google.com/go/compute/metadata v0.5.0 // indirect
71-
cloud.google.com/go/iam v1.2.0 // indirect
72-
cloud.google.com/go/kms v1.19.0 // indirect
73-
cloud.google.com/go/longrunning v0.6.0 // indirect
74-
cuelabs.dev/go/oci/ociregistry v0.0.0-20240404174027-a39bec0462d2 // indirect
67+
cloud.google.com/go v0.116.0 // indirect
68+
cloud.google.com/go/auth v0.13.0 // indirect
69+
cloud.google.com/go/auth/oauth2adapt v0.2.6 // indirect
70+
cloud.google.com/go/compute/metadata v0.6.0 // indirect
71+
cloud.google.com/go/iam v1.2.2 // indirect
72+
cloud.google.com/go/kms v1.20.2 // indirect
73+
cloud.google.com/go/longrunning v0.6.2 // indirect
74+
cuelabs.dev/go/oci/ociregistry v0.0.0-20240906074133-82eb438dd565 // indirect
7575
filippo.io/edwards25519 v1.1.0 // indirect
7676
github.com/AliyunContainerService/ack-ram-tool/pkg/credentials/provider v0.14.0 // indirect
7777
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible // indirect
@@ -166,7 +166,6 @@ require (
166166
github.com/gogo/protobuf v1.3.2 // indirect
167167
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
168168
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
169-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
170169
github.com/golang/protobuf v1.5.4 // indirect
171170
github.com/golang/snappy v0.0.4 // indirect
172171
github.com/google/flatbuffers v2.0.8+incompatible // indirect
@@ -176,8 +175,8 @@ require (
176175
github.com/google/s2a-go v0.1.8 // indirect
177176
github.com/google/tink/go v1.7.0 // indirect
178177
github.com/google/uuid v1.6.0 // indirect
179-
github.com/googleapis/enterprise-certificate-proxy v0.3.3 // indirect
180-
github.com/googleapis/gax-go/v2 v2.13.0 // indirect
178+
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
179+
github.com/googleapis/gax-go/v2 v2.14.0 // indirect
181180
github.com/gorilla/mux v1.8.1 // indirect
182181
github.com/hashicorp/errwrap v1.1.0 // indirect
183182
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
@@ -251,26 +250,25 @@ require (
251250
github.com/yashtewari/glob-intersection v0.2.0 // indirect
252251
github.com/zeebo/errs v1.3.0 // indirect
253252
go.mongodb.org/mongo-driver v1.14.0 // indirect
254-
go.opencensus.io v0.24.0 // indirect
255-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect
256-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
257-
go.opentelemetry.io/otel v1.29.0 // indirect
258-
go.opentelemetry.io/otel/metric v1.29.0 // indirect
253+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.55.0 // indirect
254+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0 // indirect
255+
go.opentelemetry.io/otel v1.30.0 // indirect
256+
go.opentelemetry.io/otel/metric v1.30.0 // indirect
259257
go.opentelemetry.io/otel/sdk v1.29.0 // indirect
260-
go.opentelemetry.io/otel/trace v1.29.0 // indirect
258+
go.opentelemetry.io/otel/trace v1.30.0 // indirect
261259
go.uber.org/multierr v1.11.0 // indirect
262260
go.uber.org/zap v1.27.0 // indirect
263-
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
264-
golang.org/x/mod v0.20.0 // indirect
265-
golang.org/x/net v0.28.0 // indirect
266-
golang.org/x/sys v0.25.0 // indirect
267-
golang.org/x/text v0.18.0 // indirect
268-
golang.org/x/time v0.6.0 // indirect
269-
golang.org/x/tools v0.23.0 // indirect
270-
google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1 // indirect
271-
google.golang.org/genproto/googleapis/api v0.0.0-20240827150818-7e3bb234dfed // indirect
272-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
273-
google.golang.org/grpc v1.66.0 // indirect
261+
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
262+
golang.org/x/mod v0.22.0 // indirect
263+
golang.org/x/net v0.33.0 // indirect
264+
golang.org/x/sys v0.28.0 // indirect
265+
golang.org/x/text v0.21.0 // indirect
266+
golang.org/x/time v0.8.0 // indirect
267+
golang.org/x/tools v0.27.0 // indirect
268+
google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect
269+
google.golang.org/genproto/googleapis/api v0.0.0-20241113202542-65e8d215514f // indirect
270+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
271+
google.golang.org/grpc v1.68.0 // indirect
274272
gopkg.in/inf.v0 v0.9.1 // indirect
275273
gopkg.in/ini.v1 v1.67.0 // indirect
276274
gopkg.in/yaml.v2 v2.4.0 // indirect

‎go.sum

+68-83
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)
Please sign in to comment.