Skip to content

Commit 4c6595d

Browse files
Merge pull request #484 from namansharma18899/fix-313-CVE-2025-66506
deps: updated fulcio to v1.8.3 (PROJQUAY-10031)
2 parents 1f12cbf + 1dfae68 commit 4c6595d

File tree

4 files changed

+176
-168
lines changed

4 files changed

+176
-168
lines changed

Containerfile.quay-builder

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Strictly for fips build
2-
FROM registry.access.redhat.com/ubi8/go-toolset:1.24.6-1764274816 as build
2+
FROM registry.access.redhat.com/ubi8/go-toolset:1.25.3-1765294123 as build
33
USER root
44
RUN dnf install -y --setopt=tsflags=nodocs git
55
COPY . /go/src/

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.access.redhat.com/ubi8/go-toolset:1.24.6-1764274816 as build
1+
FROM registry.access.redhat.com/ubi8/go-toolset:1.25.3-1765294123 as build
22
USER root
33
RUN dnf install -y --setopt=tsflags=nodocs git
44
COPY . /go/src/

go.mod

Lines changed: 47 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
11
module github.com/quay/quay-builder
22

3-
go 1.24.0
3+
go 1.25.0
44

55
require (
66
code.cloudfoundry.org/archiver v0.0.0-20230612152321-46722cbc3f99
7-
github.com/containers/buildah v1.38.0
8-
github.com/containers/podman/v5 v5.3.0
7+
github.com/containers/buildah v1.37.6
8+
github.com/containers/podman/v5 v5.2.5
99
github.com/distribution/reference v0.6.0
10-
github.com/docker/docker v27.4.0-rc.2+incompatible
10+
github.com/docker/docker v27.3.1+incompatible
1111
github.com/fsouza/go-dockerclient v1.12.0
1212
github.com/golang/protobuf v1.5.4
13-
github.com/moby/buildkit v0.18.0
13+
github.com/moby/buildkit v0.17.3
1414
github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d
1515
github.com/sirupsen/logrus v1.9.3
16-
google.golang.org/grpc v1.68.0
17-
google.golang.org/protobuf v1.35.1
16+
google.golang.org/grpc v1.77.0
17+
google.golang.org/protobuf v1.36.10
1818
)
1919

2020
require (
2121
dario.cat/mergo v1.0.1 // indirect
22-
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
22+
github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 // indirect
23+
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
2324
github.com/BurntSushi/toml v1.4.0 // indirect
2425
github.com/Microsoft/go-winio v0.6.2 // indirect
2526
github.com/Microsoft/hcsshim v0.12.9 // indirect
@@ -31,34 +32,35 @@ require (
3132
github.com/blang/semver/v4 v4.0.0 // indirect
3233
github.com/chzyer/readline v1.5.1 // indirect
3334
github.com/containerd/cgroups/v3 v3.0.3 // indirect
34-
github.com/containerd/errdefs v0.3.0 // indirect
35+
github.com/containerd/containerd v1.7.23 // indirect
36+
github.com/containerd/errdefs v1.0.0 // indirect
3537
github.com/containerd/errdefs/pkg v0.3.0 // indirect
3638
github.com/containerd/log v0.1.0 // indirect
3739
github.com/containerd/platforms v0.2.1 // indirect
38-
github.com/containerd/stargz-snapshotter/estargz v0.15.1 // indirect
40+
github.com/containerd/stargz-snapshotter/estargz v0.16.3 // indirect
3941
github.com/containerd/typeurl/v2 v2.2.3 // indirect
4042
github.com/containernetworking/cni v1.2.3 // indirect
4143
github.com/containernetworking/plugins v1.5.1 // indirect
42-
github.com/containers/common v0.61.0 // indirect
43-
github.com/containers/image/v5 v5.33.0 // indirect
44+
github.com/containers/common v0.60.4 // indirect
45+
github.com/containers/image/v5 v5.32.2 // indirect
4446
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
4547
github.com/containers/luksy v0.0.0-20241007190014-e2530d691420 // indirect
4648
github.com/containers/ocicrypt v1.2.0 // indirect
4749
github.com/containers/psgo v1.9.0 // indirect
48-
github.com/containers/storage v1.56.0 // indirect
50+
github.com/containers/storage v1.55.2 // indirect
4951
github.com/coreos/go-systemd/v22 v22.5.1-0.20231103132048-7d375ecc2b09 // indirect
5052
github.com/cyberphone/json-canonicalization v0.0.0-20231217050601-ba74d44ecf5f // indirect
51-
github.com/cyphar/filepath-securejoin v0.3.4 // indirect
53+
github.com/cyphar/filepath-securejoin v0.3.1 // indirect
5254
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
5355
github.com/disiqueira/gotree/v3 v3.0.2 // indirect
5456
github.com/docker/distribution v2.8.3+incompatible // indirect
55-
github.com/docker/docker-credential-helpers v0.8.2 // indirect
57+
github.com/docker/docker-credential-helpers v0.9.3 // indirect
5658
github.com/docker/go-connections v0.5.0 // indirect
5759
github.com/docker/go-units v0.5.0 // indirect
5860
github.com/felixge/httpsnoop v1.0.4 // indirect
59-
github.com/fsnotify/fsnotify v1.8.0 // indirect
60-
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
61-
github.com/go-logr/logr v1.4.2 // indirect
61+
github.com/fsnotify/fsnotify v1.9.0 // indirect
62+
github.com/go-jose/go-jose/v4 v4.1.3 // indirect
63+
github.com/go-logr/logr v1.4.3 // indirect
6264
github.com/go-logr/stdr v1.2.2 // indirect
6365
github.com/go-openapi/analysis v0.23.0 // indirect
6466
github.com/go-openapi/errors v0.22.0 // indirect
@@ -72,7 +74,7 @@ require (
7274
github.com/go-openapi/validate v0.24.0 // indirect
7375
github.com/godbus/dbus/v5 v5.1.1-0.20240921181615-a817f3cc4a9e // indirect
7476
github.com/gogo/protobuf v1.3.2 // indirect
75-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
77+
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
7678
github.com/google/go-containerregistry v0.20.2 // indirect
7779
github.com/google/go-intervals v0.0.2 // indirect
7880
github.com/google/uuid v1.6.0 // indirect
@@ -83,35 +85,33 @@ require (
8385
github.com/jinzhu/copier v0.4.0 // indirect
8486
github.com/josharian/intern v1.0.0 // indirect
8587
github.com/json-iterator/go v1.1.12 // indirect
86-
github.com/kevinburke/ssh_config v1.2.0 // indirect
87-
github.com/klauspost/compress v1.17.11 // indirect
88+
github.com/klauspost/compress v1.18.2 // indirect
8889
github.com/klauspost/pgzip v1.2.6 // indirect
8990
github.com/kr/fs v0.1.0 // indirect
9091
github.com/letsencrypt/boulder v0.0.0-20240620165639-de9c06129bec // indirect
9192
github.com/mailru/easyjson v0.7.7 // indirect
9293
github.com/manifoldco/promptui v0.9.0 // indirect
9394
github.com/mattn/go-runewidth v0.0.16 // indirect
9495
github.com/mattn/go-shellwords v1.0.12 // indirect
95-
github.com/mattn/go-sqlite3 v1.14.24 // indirect
96+
github.com/mattn/go-sqlite3 v1.14.28 // indirect
9697
github.com/miekg/pkcs11 v1.1.1 // indirect
9798
github.com/mistifyio/go-zfs/v3 v3.0.1 // indirect
9899
github.com/mitchellh/mapstructure v1.5.0 // indirect
99100
github.com/moby/docker-image-spec v1.3.1 // indirect
100101
github.com/moby/patternmatcher v0.6.0 // indirect
101-
github.com/moby/sys/capability v0.3.0 // indirect
102102
github.com/moby/sys/mountinfo v0.7.2 // indirect
103103
github.com/moby/sys/sequential v0.6.0 // indirect
104-
github.com/moby/sys/user v0.3.0 // indirect
104+
github.com/moby/sys/user v0.4.0 // indirect
105105
github.com/moby/sys/userns v0.1.0 // indirect
106-
github.com/moby/term v0.5.0 // indirect
106+
github.com/moby/term v0.5.2 // indirect
107107
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
108108
github.com/modern-go/reflect2 v1.0.2 // indirect
109109
github.com/morikuni/aec v1.0.0 // indirect
110110
github.com/nxadm/tail v1.4.11 // indirect
111111
github.com/oklog/ulid v1.3.1 // indirect
112112
github.com/opencontainers/go-digest v1.0.0 // indirect
113-
github.com/opencontainers/image-spec v1.1.0 // indirect
114-
github.com/opencontainers/runc v1.2.1 // indirect
113+
github.com/opencontainers/image-spec v1.1.1 // indirect
114+
github.com/opencontainers/runc v1.2.0-rc.3 // indirect
115115
github.com/opencontainers/runtime-spec v1.2.0 // indirect
116116
github.com/opencontainers/runtime-tools v0.9.1-0.20241001195557-6c9570a1678f // indirect
117117
github.com/opencontainers/selinux v1.11.1 // indirect
@@ -124,43 +124,46 @@ require (
124124
github.com/proglottis/gpgme v0.1.3 // indirect
125125
github.com/rivo/uniseg v0.4.7 // indirect
126126
github.com/seccomp/libseccomp-golang v0.10.0 // indirect
127-
github.com/secure-systems-lab/go-securesystemslib v0.8.0 // indirect
128-
github.com/sigstore/fulcio v1.6.4 // indirect
127+
github.com/secure-systems-lab/go-securesystemslib v0.9.1 // indirect
128+
github.com/sigstore/fulcio v1.6.6 // indirect
129+
github.com/sigstore/protobuf-specs v0.5.0 // indirect
129130
github.com/sigstore/rekor v1.3.6 // indirect
130-
github.com/sigstore/sigstore v1.8.9 // indirect
131-
github.com/skeema/knownhosts v1.3.0 // indirect
132-
github.com/spf13/cobra v1.8.1 // indirect
133-
github.com/spf13/pflag v1.0.5 // indirect
131+
github.com/sigstore/sigstore v1.8.15 // indirect
132+
github.com/spf13/cobra v1.10.2 // indirect
133+
github.com/spf13/pflag v1.0.10 // indirect
134134
github.com/stefanberger/go-pkcs11uri v0.0.0-20230803200340-78284954bff6 // indirect
135135
github.com/sylabs/sif/v2 v2.19.1 // indirect
136136
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
137137
github.com/tchap/go-patricia/v2 v2.3.1 // indirect
138138
github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 // indirect
139139
github.com/tonistiigi/go-csvvalue v0.0.0-20240710180619-ddb21b71c0b4 // indirect
140140
github.com/ulikunitz/xz v0.5.12 // indirect
141-
github.com/vbatts/tar-split v0.11.6 // indirect
141+
github.com/vbatts/tar-split v0.12.1 // indirect
142142
github.com/vbauerster/mpb/v8 v8.8.3 // indirect
143143
github.com/vishvananda/netlink v1.3.0 // indirect
144144
github.com/vishvananda/netns v0.0.4 // indirect
145-
go.etcd.io/bbolt v1.3.11 // indirect
145+
go.etcd.io/bbolt v1.4.0 // indirect
146146
go.mongodb.org/mongo-driver v1.14.0 // indirect
147147
go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352 // indirect
148148
go.opencensus.io v0.24.0 // indirect
149-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
150-
go.opentelemetry.io/otel v1.28.0 // indirect
151-
go.opentelemetry.io/otel/metric v1.28.0 // indirect
152-
go.opentelemetry.io/otel/trace v1.28.0 // indirect
153-
golang.org/x/crypto v0.44.0 // indirect
154-
golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect
149+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
150+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
151+
go.opentelemetry.io/otel v1.38.0 // indirect
152+
go.opentelemetry.io/otel/metric v1.38.0 // indirect
153+
go.opentelemetry.io/otel/trace v1.38.0 // indirect
154+
golang.org/x/crypto v0.45.0 // indirect
155+
golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b // indirect
155156
golang.org/x/mod v0.29.0 // indirect
156-
golang.org/x/net v0.46.0 // indirect
157+
golang.org/x/net v0.47.0 // indirect
157158
golang.org/x/sync v0.18.0 // indirect
158-
golang.org/x/sys v0.38.0 // indirect
159+
golang.org/x/sys v0.40.0 // indirect
159160
golang.org/x/term v0.37.0 // indirect
160161
golang.org/x/text v0.31.0 // indirect
161-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
162+
google.golang.org/genproto/googleapis/api v0.0.0-20251022142026-3a174f9686a8 // indirect
163+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251103181224-f26f9409b101 // indirect
162164
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
163165
gopkg.in/yaml.v3 v3.0.1 // indirect
166+
gotest.tools/v3 v3.5.2 // indirect
164167
sigs.k8s.io/yaml v1.4.0 // indirect
165168
tags.cncf.io/container-device-interface v0.8.0 // indirect
166169
tags.cncf.io/container-device-interface/specs-go v0.8.0 // indirect

0 commit comments

Comments
 (0)