Skip to content

Commit e4116cb

Browse files
committed
Merge branch 'main' into release-2.5
# Conflicts: # deepfence_agent/plugins/SecretScanner # deepfence_agent/plugins/YaraHunter # deepfence_agent/plugins/package-scanner # deepfence_worker/go.mod
2 parents 5de3b2f + 12b2977 commit e4116cb

File tree

7 files changed

+88
-82
lines changed

7 files changed

+88
-82
lines changed

deepfence_agent/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ FROM $IMAGE_REPOSITORY/deepfence_compliance_scanner_ce:$DF_IMG_TAG AS compliance
99
FROM debian:12-slim as downloads
1010

1111
ENV DOCKERVERSION="27.3.1" \
12-
VESSEL_VERSION="0.13.0"\
12+
VESSEL_VERSION="0.14.0" \
1313
NERDCTL_VERSION="1.7.7" \
1414
CRICTL_VERSION="v1.31.1"
1515

deepfence_worker/go.mod

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ require (
2929
github.com/deepfence/SecretScanner v0.0.0-00010101000000-000000000000
3030
github.com/deepfence/ThreatMapper/deepfence_server v0.0.0-00010101000000-000000000000
3131
github.com/deepfence/ThreatMapper/deepfence_utils v0.0.0-00010101000000-000000000000
32-
github.com/deepfence/YaraHunter v0.0.0-20250411074428-6437db622ae5
32+
github.com/deepfence/YaraHunter v0.0.0-20250424121102-5c7a440b1405
3333
github.com/deepfence/agent-plugins-grpc v1.1.0
3434
github.com/deepfence/golang_deepfence_sdk/utils v0.0.0-20250404165334-270bd6030734
35-
github.com/deepfence/match-scanner v0.0.0-20241104190155-00799508ab6c
35+
github.com/deepfence/match-scanner v0.0.0-20250424114533-ad87103b0479
3636
github.com/deepfence/package-scanner v0.0.0-00010101000000-000000000000
3737
github.com/go-chi/chi/v5 v5.2.1
3838
github.com/hibiken/asynq v0.25.1
@@ -51,10 +51,10 @@ require (
5151
github.com/twmb/franz-go v1.18.0
5252
github.com/twmb/franz-go/pkg/kadm v1.14.0
5353
github.com/xuri/excelize/v2 v2.9.0
54-
go.opentelemetry.io/otel v1.32.0
54+
go.opentelemetry.io/otel v1.34.0
5555
go.opentelemetry.io/otel/exporters/jaeger v1.17.0
56-
go.opentelemetry.io/otel/sdk v1.31.0
57-
go.opentelemetry.io/otel/trace v1.32.0
56+
go.opentelemetry.io/otel/sdk v1.34.0
57+
go.opentelemetry.io/otel/trace v1.34.0
5858
golang.org/x/mod v0.17.0
5959
)
6060

@@ -91,24 +91,24 @@ require (
9191
github.com/cespare/xxhash/v2 v2.3.0 // indirect
9292
github.com/charmbracelet/lipgloss v0.10.0 // indirect
9393
github.com/containerd/cgroups/v3 v3.0.4 // indirect
94-
github.com/containerd/containerd v1.7.24 // indirect
94+
github.com/containerd/containerd v1.7.27 // indirect
9595
github.com/containerd/containerd/api v1.8.0 // indirect
9696
github.com/containerd/continuity v0.4.5 // indirect
9797
github.com/containerd/errdefs v1.0.0 // indirect
9898
github.com/containerd/errdefs/pkg v0.3.0 // indirect
9999
github.com/containerd/fifo v1.1.0 // indirect
100100
github.com/containerd/log v0.1.0 // indirect
101101
github.com/containerd/platforms v0.2.1 // indirect
102-
github.com/containerd/ttrpc v1.2.6 // indirect
102+
github.com/containerd/ttrpc v1.2.7 // indirect
103103
github.com/containerd/typeurl/v2 v2.2.3 // indirect
104104
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
105105
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
106106
github.com/deepfence/golang_deepfence_sdk/client v0.0.0-20250404165334-270bd6030734 // indirect
107-
github.com/deepfence/vessel v0.13.0 // indirect
107+
github.com/deepfence/vessel v0.14.0 // indirect
108108
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
109109
github.com/distribution/reference v0.6.0 // indirect
110110
github.com/docker/cli v24.0.0+incompatible // indirect
111-
github.com/docker/docker v27.3.1+incompatible // indirect
111+
github.com/docker/docker v28.1.1+incompatible // indirect
112112
github.com/docker/docker-credential-helpers v0.7.0 // indirect
113113
github.com/docker/go-connections v0.5.0 // indirect
114114
github.com/docker/go-events v0.0.0-20241114183025-9940093291f5 // indirect
@@ -118,11 +118,11 @@ require (
118118
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
119119
github.com/f-amaral/go-async v0.3.0 // indirect
120120
github.com/facebookincubator/nvdtools v0.1.5 // indirect
121-
github.com/fatih/color v1.17.0 // indirect
121+
github.com/fatih/color v1.18.0 // indirect
122122
github.com/fatih/structs v1.1.0 // indirect
123123
github.com/felixge/httpsnoop v1.0.4 // indirect
124124
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
125-
github.com/gabriel-vasile/mimetype v1.4.7 // indirect
125+
github.com/gabriel-vasile/mimetype v1.4.9 // indirect
126126
github.com/github/go-spdx/v2 v2.2.0 // indirect
127127
github.com/go-chi/jwtauth/v5 v5.3.3 // indirect
128128
github.com/go-ini/ini v1.67.0 // indirect
@@ -251,22 +251,23 @@ require (
251251
github.com/xuri/efp v0.0.0-20240408161823-9ad904a10d6d // indirect
252252
github.com/xuri/nfp v0.0.0-20240318013403-ab9948c2c4a7 // indirect
253253
go.opencensus.io v0.24.0 // indirect
254+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
254255
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0 // indirect
255-
go.opentelemetry.io/otel/metric v1.32.0 // indirect
256+
go.opentelemetry.io/otel/metric v1.34.0 // indirect
256257
go.uber.org/multierr v1.11.0 // indirect
257-
golang.org/x/crypto v0.31.0 // indirect
258+
golang.org/x/crypto v0.37.0 // indirect
258259
golang.org/x/image v0.18.0 // indirect
259-
golang.org/x/net v0.31.0 // indirect
260-
golang.org/x/oauth2 v0.23.0 // indirect
261-
golang.org/x/sync v0.10.0 // indirect
262-
golang.org/x/sys v0.28.0 // indirect
263-
golang.org/x/term v0.27.0 // indirect
264-
golang.org/x/text v0.21.0 // indirect
260+
golang.org/x/net v0.39.0 // indirect
261+
golang.org/x/oauth2 v0.26.0 // indirect
262+
golang.org/x/sync v0.13.0 // indirect
263+
golang.org/x/sys v0.32.0 // indirect
264+
golang.org/x/term v0.31.0 // indirect
265+
golang.org/x/text v0.24.0 // indirect
265266
golang.org/x/time v0.8.0 // indirect
266267
google.golang.org/genproto v0.0.0-20241202173237-19429a94021a // indirect
267-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241202173237-19429a94021a // indirect
268-
google.golang.org/grpc v1.69.2 // indirect
269-
google.golang.org/protobuf v1.35.2 // indirect
268+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a // indirect
269+
google.golang.org/grpc v1.72.0 // indirect
270+
google.golang.org/protobuf v1.36.5 // indirect
270271
gopkg.in/inf.v0 v0.9.1 // indirect
271272
gopkg.in/yaml.v2 v2.4.0 // indirect
272273
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)