Skip to content

Commit 9a889c8

Browse files
ramanan-raviramanan-ravi
committed
Migrate to zerolog for structured logging, update grype scan output to string, and update go version.
1 parent 407fd5f commit 9a889c8

File tree

16 files changed

+448
-461
lines changed

16 files changed

+448
-461
lines changed

‎Dockerfile‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,37 @@
1-
FROM golang:1.23-bookworm AS build
1+
FROM golang:1.25-trixie AS build
22

33
RUN apt-get clean && apt-get update
44
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
55
build-essential git gcc libc-dev libffi-dev bash make apt-utils
6+
7+
# Copy YaraHunter first (for local replace directive)
8+
WORKDIR /go
9+
COPY YaraHunter/ YaraHunter/
10+
611
WORKDIR /go/package-scanner/
7-
COPY . .
12+
COPY package-scanner/ .
813

914
ARG TARGETPLATFORM
1015
ARG MAKE_CMD=package-scanner
1116
RUN TARGETPLATFORM=$TARGETPLATFORM make tools
1217
RUN CGO_ENABLED=0 make $MAKE_CMD
1318

14-
FROM debian:bookworm-slim
15-
LABEL MAINTAINER="Deepfence Inc"
19+
FROM debian:trixie-slim
20+
LABEL maintainer="Deepfence Inc"
1621
LABEL deepfence.role=system
1722

1823
ENV PACKAGE_SCAN_CONCURRENCY=5 \
19-
DOCKER_VERSION=27.3.1 \
20-
NERDCTL_VERSION=1.7.7
24+
DOCKER_VERSION=29.1.3 \
25+
NERDCTL_VERSION=2.2.0
2126

2227
# ENV GRYPE_DB_UPDATE_URL="https://threat-intel.deepfence.io/vulnerability-db/listing.json"
2328

2429
COPY --from=build /go/package-scanner/package-scanner /usr/local/bin/package-scanner
2530
COPY --from=build /go/package-scanner/tools/grype-bin/grype.bin /usr/local/bin/grype
2631
COPY --from=build /go/package-scanner/tools/syft-bin/syft.bin /usr/local/bin/syft
2732

28-
COPY grype.yaml /root/.grype.yaml
29-
COPY entrypoint.sh /entrypoint.sh
33+
COPY package-scanner/grype.yaml /root/.grype.yaml
34+
COPY package-scanner/entrypoint.sh /entrypoint.sh
3035

3136
RUN apt-get update
3237

‎Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export IMAGE_REPOSITORY?=quay.io/deepfenceio
2-
export DF_IMG_TAG?=2.5.7
2+
export DF_IMG_TAG?=2.5.8
33

44
all: package-scanner
55

@@ -35,15 +35,15 @@ publish-docker-cli:
3535

3636
.PHONY: docker-cli
3737
docker-cli:
38-
docker build --build-arg MAKE_CMD="cli" -t $(IMAGE_REPOSITORY)/deepfence_package_scanner_cli:$(DF_IMG_TAG) .
38+
docker build --build-arg MAKE_CMD="cli" -t $(IMAGE_REPOSITORY)/deepfence_package_scanner_cli:$(DF_IMG_TAG) -f Dockerfile ..
3939

4040
.PHONY: docker-cli-multi-arch-push
4141
docker-cli-multi-arch-push: buildx
42-
docker buildx build --build-arg MAKE_CMD="cli" --platform linux/arm64,linux/amd64 --tag $(IMAGE_REPOSITORY)/deepfence_package_scanner_cli:$(DF_IMG_TAG) . --push
42+
docker buildx build --build-arg MAKE_CMD="cli" --platform linux/arm64,linux/amd64 --tag $(IMAGE_REPOSITORY)/deepfence_package_scanner_cli:$(DF_IMG_TAG) -f Dockerfile .. --push
4343

4444
.PHONY: docker-multi-arch
4545
docker-multi-arch:
46-
docker buildx build --platform linux/arm64,linux/amd64 --tag $(IMAGE_REPOSITORY)/deepfence_package_scanner:$(DF_IMG_TAG) .
46+
docker buildx build --platform linux/arm64,linux/amd64 --tag $(IMAGE_REPOSITORY)/deepfence_package_scanner:$(DF_IMG_TAG) -f Dockerfile ..
4747

4848
.PHONY: buildx
4949
buildx:

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,16 @@ export DEEPFENCE_LICENSE=<ThreatMapper or ThreatStryker license key>
4848

4949
## Build docker image
5050
1. make docker-cli
51-
2. docker images should show new image with name quay.io/deepfenceio/deepfence_package_scanner_cli:2.5.7
51+
2. docker images should show new image with name quay.io/deepfenceio/deepfence_package_scanner_cli:2.5.8
5252
```
5353
$ docker images
5454
REPOSITORY TAG IMAGE ID CREATED SIZE
55-
quay.io/deepfenceio/deepfence_package_scanner_cli 2.5.7 e06fb1cd3868 About an hour ago 569MB
55+
quay.io/deepfenceio/deepfence_package_scanner_cli 2.5.8 e06fb1cd3868 About an hour ago 569MB
5656
nginx latest 1403e55ab369 8 days ago 142MB
5757
```
5858
5959
## Docker image standalone usage example
6060
```
6161
docker pull nginx:latest
62-
docker run -it --rm -e DEEPFENCE_PRODUCT=<ThreatMapper or ThreatStryker> -e DEEPFENCE_LICENSE=<ThreatMapper or ThreatStryker license key> -v /var/run/docker.sock:/var/run/docker.sock --name package-scanner quay.io/deepfenceio/deepfence_package_scanner_cli:2.5.7 -source nginx:latest
62+
docker run -it --rm -e DEEPFENCE_PRODUCT=<ThreatMapper or ThreatStryker> -e DEEPFENCE_LICENSE=<ThreatMapper or ThreatStryker license key> -v /var/run/docker.sock:/var/run/docker.sock --name package-scanner quay.io/deepfenceio/deepfence_package_scanner_cli:2.5.8 -source nginx:latest
6363
```

‎agent-plugins-grpc‎

‎go.mod‎

Lines changed: 84 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,111 +1,134 @@
11
module github.com/deepfence/package-scanner
22

3-
go 1.23.2
3+
go 1.25.5
44

55
replace github.com/deepfence/agent-plugins-grpc => ./agent-plugins-grpc/
66

7+
replace github.com/deepfence/YaraHunter => ../YaraHunter
8+
79
require (
810
github.com/Jeffail/tunny v0.1.4
9-
github.com/deepfence/YaraHunter v0.0.0-20250424121040-0bbd794a7321
10-
github.com/deepfence/agent-plugins-grpc v1.1.0
11-
github.com/deepfence/golang_deepfence_sdk/client v0.0.0-20250404165334-270bd6030734
12-
github.com/deepfence/golang_deepfence_sdk/utils v0.0.0-20250404165334-270bd6030734
13-
github.com/deepfence/vessel v0.14.0
14-
github.com/gin-gonic/gin v1.10.0
11+
github.com/deepfence/YaraHunter v0.0.0-20251222131915-e8654b4b528f
12+
github.com/deepfence/agent-plugins-grpc v0.0.0-00010101000000-000000000000
13+
github.com/deepfence/golang_deepfence_sdk/client v0.0.0-20251220185839-eab97c9c3b76
14+
github.com/deepfence/golang_deepfence_sdk/utils v0.0.0-20251220185839-eab97c9c3b76
15+
github.com/deepfence/vessel v0.15.0
16+
github.com/gin-gonic/gin v1.11.0
1517
github.com/google/uuid v1.6.0
16-
github.com/olekukonko/tablewriter v0.0.5
17-
github.com/sirupsen/logrus v1.9.3
18-
google.golang.org/grpc v1.72.0
18+
github.com/olekukonko/tablewriter v1.1.2
19+
github.com/rs/zerolog v1.34.0
20+
google.golang.org/grpc v1.77.0
1921
gopkg.in/yaml.v3 v3.0.1
20-
zombiezen.com/go/sqlite v1.4.0
21-
22+
zombiezen.com/go/sqlite v1.4.2
2223
)
2324

2425
require (
25-
github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 // indirect
26-
github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20231105174938-2b5cbb29f3e2 // indirect
26+
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
2727
github.com/Microsoft/go-winio v0.6.2 // indirect
28-
github.com/Microsoft/hcsshim v0.12.9 // indirect
28+
github.com/Microsoft/hcsshim v0.14.0-rc.1 // indirect
2929
github.com/VirusTotal/gyp v0.9.0 // indirect
30-
github.com/bytedance/sonic v1.11.6 // indirect
31-
github.com/bytedance/sonic/loader v0.1.1 // indirect
32-
github.com/cloudwego/base64x v0.1.4 // indirect
33-
github.com/cloudwego/iasm v0.2.0 // indirect
34-
github.com/containerd/cgroups/v3 v3.0.4 // indirect
35-
github.com/containerd/containerd v1.7.27 // indirect
36-
github.com/containerd/containerd/api v1.8.0 // indirect
30+
github.com/bytedance/sonic v1.14.0 // indirect
31+
github.com/bytedance/sonic/loader v0.3.0 // indirect
32+
github.com/clipperhouse/displaywidth v0.6.0 // indirect
33+
github.com/clipperhouse/stringish v0.1.1 // indirect
34+
github.com/clipperhouse/uax29/v2 v2.3.0 // indirect
35+
github.com/cloudwego/base64x v0.1.6 // indirect
36+
github.com/containerd/cgroups/v3 v3.1.2 // indirect
37+
github.com/containerd/containerd/api v1.10.0 // indirect
38+
github.com/containerd/containerd/v2 v2.2.1 // indirect
3739
github.com/containerd/continuity v0.4.5 // indirect
3840
github.com/containerd/errdefs v1.0.0 // indirect
3941
github.com/containerd/errdefs/pkg v0.3.0 // indirect
4042
github.com/containerd/fifo v1.1.0 // indirect
4143
github.com/containerd/log v0.1.0 // indirect
42-
github.com/containerd/platforms v0.2.1 // indirect
44+
github.com/containerd/platforms v1.0.0-rc.2 // indirect
45+
github.com/containerd/plugin v1.0.0 // indirect
4346
github.com/containerd/ttrpc v1.2.7 // indirect
4447
github.com/containerd/typeurl/v2 v2.2.3 // indirect
48+
github.com/cyphar/filepath-securejoin v0.5.1 // indirect
4549
github.com/distribution/reference v0.6.0 // indirect
46-
github.com/docker/docker v28.1.1+incompatible // indirect
47-
github.com/docker/go-connections v0.5.0 // indirect
48-
github.com/docker/go-events v0.0.0-20241114183025-9940093291f5 // indirect
50+
github.com/docker/docker v28.5.2+incompatible // indirect
51+
github.com/docker/go-connections v0.6.0 // indirect
4952
github.com/docker/go-units v0.5.0 // indirect
5053
github.com/dustin/go-humanize v1.0.1 // indirect
54+
github.com/fatih/color v1.16.0 // indirect
5155
github.com/felixge/httpsnoop v1.0.4 // indirect
52-
github.com/gabriel-vasile/mimetype v1.4.9 // indirect
53-
github.com/gin-contrib/sse v0.1.0 // indirect
54-
github.com/go-logr/logr v1.4.2 // indirect
56+
github.com/gabriel-vasile/mimetype v1.4.12 // indirect
57+
github.com/gin-contrib/sse v1.1.0 // indirect
58+
github.com/go-logr/logr v1.4.3 // indirect
5559
github.com/go-logr/stdr v1.2.2 // indirect
5660
github.com/go-playground/locales v0.14.1 // indirect
5761
github.com/go-playground/universal-translator v0.18.1 // indirect
58-
github.com/go-playground/validator/v10 v10.20.0 // indirect
62+
github.com/go-playground/validator/v10 v10.27.0 // indirect
5963
github.com/goccy/go-json v0.10.2 // indirect
64+
github.com/goccy/go-yaml v1.18.0 // indirect
6065
github.com/gogo/protobuf v1.3.2 // indirect
6166
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
6267
github.com/golang/protobuf v1.5.4 // indirect
63-
github.com/google/go-cmp v0.6.0 // indirect
68+
github.com/google/go-cmp v0.7.0 // indirect
6469
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
65-
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
70+
github.com/hashicorp/go-retryablehttp v0.7.8 // indirect
6671
github.com/json-iterator/go v1.1.12 // indirect
67-
github.com/klauspost/compress v1.17.11 // indirect
68-
github.com/klauspost/cpuid/v2 v2.2.7 // indirect
72+
github.com/klauspost/compress v1.18.1 // indirect
73+
github.com/klauspost/cpuid/v2 v2.3.0 // indirect
6974
github.com/leodido/go-urn v1.4.0 // indirect
75+
github.com/mattn/go-colorable v0.1.13 // indirect
7076
github.com/mattn/go-isatty v0.0.20 // indirect
71-
github.com/mattn/go-runewidth v0.0.16 // indirect
77+
github.com/mattn/go-runewidth v0.0.19 // indirect
7278
github.com/moby/docker-image-spec v1.3.1 // indirect
7379
github.com/moby/locker v1.0.1 // indirect
7480
github.com/moby/sys/mountinfo v0.7.2 // indirect
7581
github.com/moby/sys/sequential v0.6.0 // indirect
7682
github.com/moby/sys/signal v0.7.1 // indirect
77-
github.com/moby/sys/user v0.3.0 // indirect
83+
github.com/moby/sys/user v0.4.0 // indirect
7884
github.com/moby/sys/userns v0.1.0 // indirect
7985
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
80-
github.com/modern-go/reflect2 v1.0.2 // indirect
86+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
8187
github.com/ncruces/go-strftime v0.1.9 // indirect
88+
github.com/olekukonko/cat v0.0.0-20250911104152-50322a0618f6 // indirect
89+
github.com/olekukonko/errors v1.1.0 // indirect
90+
github.com/olekukonko/ll v0.1.3 // indirect
8291
github.com/opencontainers/go-digest v1.0.0 // indirect
83-
github.com/opencontainers/image-spec v1.1.0 // indirect
84-
github.com/opencontainers/runtime-spec v1.2.0 // indirect
85-
github.com/opencontainers/selinux v1.11.1 // indirect
86-
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
92+
github.com/opencontainers/image-spec v1.1.1 // indirect
93+
github.com/opencontainers/runtime-spec v1.3.0 // indirect
94+
github.com/opencontainers/selinux v1.13.1 // indirect
95+
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
8796
github.com/pkg/errors v0.9.1 // indirect
97+
github.com/quic-go/qpack v0.5.1 // indirect
98+
github.com/quic-go/quic-go v0.54.0 // indirect
8899
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
89-
github.com/rivo/uniseg v0.4.7 // indirect
100+
github.com/sirupsen/logrus v1.9.3 // indirect
90101
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
91-
github.com/ugorji/go/codec v1.2.12 // indirect
102+
github.com/ugorji/go/codec v1.3.0 // indirect
92103
go.opencensus.io v0.24.0 // indirect
93-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
94-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0 // indirect
95-
go.opentelemetry.io/otel v1.34.0 // indirect
96-
go.opentelemetry.io/otel/metric v1.34.0 // indirect
97-
go.opentelemetry.io/otel/trace v1.34.0 // indirect
98-
golang.org/x/arch v0.8.0 // indirect
99-
golang.org/x/crypto v0.37.0 // indirect
100-
golang.org/x/net v0.39.0 // indirect
101-
golang.org/x/sync v0.13.0 // indirect
102-
golang.org/x/sys v0.32.0 // indirect
103-
golang.org/x/text v0.24.0 // indirect
104-
google.golang.org/genproto v0.0.0-20241202173237-19429a94021a // indirect
105-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a // indirect
106-
google.golang.org/protobuf v1.36.5 // indirect
107-
modernc.org/libc v1.55.3 // indirect
108-
modernc.org/mathutil v1.6.0 // indirect
109-
modernc.org/memory v1.8.0 // indirect
110-
modernc.org/sqlite v1.33.1 // indirect
104+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
105+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
106+
go.opentelemetry.io/otel v1.38.0 // indirect
107+
go.opentelemetry.io/otel/metric v1.38.0 // indirect
108+
go.opentelemetry.io/otel/trace v1.38.0 // indirect
109+
go.uber.org/mock v0.5.0 // indirect
110+
golang.org/x/arch v0.20.0 // indirect
111+
golang.org/x/crypto v0.46.0 // indirect
112+
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 // indirect
113+
golang.org/x/mod v0.30.0 // indirect
114+
golang.org/x/net v0.48.0 // indirect
115+
golang.org/x/sync v0.19.0 // indirect
116+
golang.org/x/sys v0.39.0 // indirect
117+
golang.org/x/text v0.32.0 // indirect
118+
golang.org/x/tools v0.39.0 // indirect
119+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251213004720-97cd9d5aeac2 // indirect
120+
google.golang.org/protobuf v1.36.11 // indirect
121+
modernc.org/libc v1.65.7 // indirect
122+
modernc.org/mathutil v1.7.1 // indirect
123+
modernc.org/memory v1.11.0 // indirect
124+
modernc.org/sqlite v1.37.1 // indirect
125+
)
126+
127+
exclude (
128+
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8
129+
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55
130+
google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884
131+
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013
132+
google.golang.org/genproto v0.0.0-20210917145530-b395a37504d4
133+
google.golang.org/genproto v0.0.0-20231211222908-989df2bf70f3
111134
)

0 commit comments

Comments
 (0)