Skip to content

Commit 367d439

Browse files
committed
Remove license requirement. Update go version, Docker base image version and dependencies. Update threat intel feed URL.
1 parent 6916a44 commit 367d439

File tree

149 files changed

+11474
-15427
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

149 files changed

+11474
-15427
lines changed

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export IMAGE_REPOSITORY?=quay.io/deepfenceio
1818
export DF_IMG_TAG?=latest
1919
export STEAMPIPE_IMG_TAG?=0.23.x
2020
export IS_DEV_BUILD?=false
21-
export VERSION?=v2.5.7
21+
export VERSION?=v2.5.8
2222
export AGENT_BINARY_BUILD=$(DEEPFENCE_FARGATE_DIR)/build
2323
export AGENT_BINARY_BUILD_RELATIVE=deepfence_agent/agent-binary/build
2424
export AGENT_BINARY_DIST=$(DEEPFENCE_FARGATE_DIR)/dist
@@ -125,21 +125,21 @@ graphdb:
125125
ui:
126126
git log --format="%h" -n 1 > $(DEEPFENCE_FRONTEND_DIR)/console_version.txt && \
127127
echo $(subst v,,$(VERSION)) > $(DEEPFENCE_FRONTEND_DIR)/product_version.txt && \
128-
docker run --rm --entrypoint=bash -v $(DEEPFENCE_FRONTEND_DIR):/app node:18-bullseye-slim -c "cd /app && corepack enable && corepack prepare pnpm@7.17.1 --activate && PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=true pnpm install --frozen-lockfile --prefer-offline && ENABLE_ANALYTICS=true pnpm run build" && \
128+
docker run --rm --entrypoint=bash -v $(DEEPFENCE_FRONTEND_DIR):/app node:24-bookworm-slim -c "cd /app && corepack enable && corepack prepare pnpm@9.15.4 --activate && PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=true pnpm install && ENABLE_ANALYTICS=true pnpm run build" && \
129129
docker build -f $(DEEPFENCE_FRONTEND_DIR)/Dockerfile -t $(IMAGE_REPOSITORY)/deepfence_ui_ce:$(DF_IMG_TAG) $(DEEPFENCE_FRONTEND_DIR) && \
130130
rm -rf $(DEEPFENCE_FRONTEND_DIR)/console_version.txt $(DEEPFENCE_FRONTEND_DIR)/product_version.txt
131131

132132
.PHONY: secretscanner
133133
secretscanner: bootstrap-agent-plugins
134-
docker build --tag=$(IMAGE_REPOSITORY)/deepfence_secret_scanner_ce:$(DF_IMG_TAG) -f $(SECRET_SCANNER_DIR)/Dockerfile $(SECRET_SCANNER_DIR)
134+
docker build --tag=$(IMAGE_REPOSITORY)/deepfence_secret_scanner_ce:$(DF_IMG_TAG) -f $(SECRET_SCANNER_DIR)/Dockerfile $(DEEPFENCE_AGENT_DIR)/plugins
135135

136136
.PHONY: malwarescanner
137137
malwarescanner: bootstrap-agent-plugins
138138
docker build --tag=$(IMAGE_REPOSITORY)/deepfence_malware_scanner_ce:$(DF_IMG_TAG) -f $(MALWARE_SCANNER_DIR)/Dockerfile $(MALWARE_SCANNER_DIR)
139139

140140
.PHONY: packagescanner
141141
packagescanner: bootstrap-agent-plugins
142-
docker build --tag=$(IMAGE_REPOSITORY)/deepfence_package_scanner_ce:$(DF_IMG_TAG) -f $(PACKAGE_SCANNER_DIR)/Dockerfile $(PACKAGE_SCANNER_DIR)
142+
docker build --tag=$(IMAGE_REPOSITORY)/deepfence_package_scanner_ce:$(DF_IMG_TAG) -f $(PACKAGE_SCANNER_DIR)/Dockerfile $(DEEPFENCE_AGENT_DIR)/plugins
143143

144144
.PHONY: packagescanner-cli
145145
packagescanner-cli:
@@ -174,7 +174,7 @@ openapi: server
174174
--git-user-id deepfence
175175

176176
rm openapi.yaml
177-
cd $(PWD)/golang_deepfence_sdk/client && rm -rf ./test && sed -i 's/go 1.18/go 1.23.2/g' go.mod && go mod tidy -v && cd -
177+
cd $(PWD)/golang_deepfence_sdk/client && rm -rf ./test && sed -i 's/go 1.18/go 1.25.5/g' go.mod && go mod tidy -v && cd -
178178

179179
.PHONY: cli
180180
cli: bootstrap

README.md

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,9 @@
22

33
[![GitHub license](https://img.shields.io/github/license/deepfence/ThreatMapper)](https://github.com/deepfence/ThreatMapper/blob/master/LICENSE)
44
[![GitHub stars](https://img.shields.io/github/stars/deepfence/ThreatMapper)](https://github.com/deepfence/ThreatMapper/stargazers)
5-
[![Hacktoberfest](https://img.shields.io/github/hacktoberfest/2022/deepfence/ThreatMapper)](https://github.com/deepfence/ThreatMapper/issues)
65
[![GitHub issues](https://img.shields.io/github/issues/deepfence/ThreatMapper)](https://github.com/deepfence/ThreatMapper/issues)
76
[![Documentation](https://img.shields.io/badge/documentation-read-green)](https://threatmapper.org/threatmapper/docs/v2.5/)
8-
[![Demo](https://img.shields.io/badge/threatmapper-demo-green)](https://threatmapper.org/threatmapper/docs/v2.5/demo)
9-
[![Docker pulls](https://img.shields.io/docker/pulls/deepfenceio/deepfence_agent_ce)](https://hub.docker.com/r/deepfenceio/deepfence_agent_ce)
107
[![Slack](https://img.shields.io/badge/slack-@deepfence-blue.svg?logo=slack)](https://join.slack.com/t/deepfence-community/shared_invite/zt-podmzle9-5X~qYx8wMaLt9bGWwkSdgQ)
11-
[![Twitter](https://img.shields.io/twitter/url?style=social&url=https%3A%2F%2Fgithub.com%2Fdeepfence%2FThreatMapper)](https://twitter.com/intent/tweet?text=Wow:&url=https%3A%2F%2Fgithub.com%2Fdeepfence%2FThreatMapper)
128

139
# ThreatMapper - Runtime Threat Management and Attack Path Enumeration for Cloud Native
1410

@@ -30,11 +26,6 @@ ThreatMapper carries on the good 'shift left' security practices that you alread
3026
Use ThreatMapper to provide security observability for your production workloads and infrastructure, across cloud, kubernetes, serverless (Fargate) and on-prem platforms.
3127

3228

33-
<!--- # (# Getting Started with ThreatMapper) --->
34-
35-
<!--- # (https://user-images.githubusercontent.com/3711627/183735806-7afc0dd3-a3ee-4486-a241-06541025a3d4.mp4) --->
36-
37-
3829
## Planning your Deployment
3930

4031
ThreatMapper consists of two components:
@@ -96,10 +87,10 @@ docker run -dit \
9687
-e http_proxy="" \
9788
-e https_proxy="" \
9889
-e no_proxy="" \
99-
quay.io/deepfenceio/deepfence_agent_ce:2.5.7
90+
quay.io/deepfenceio/deepfence_agent_ce:2.5.8
10091
```
10192

102-
Note: Image tag `quay.io/deepfenceio/deepfence_agent_ce:2.5.7-multiarch` is supported in amd64 and arm64/v8 architectures.
93+
Note: Image tag `quay.io/deepfenceio/deepfence_agent_ce:2.5.8-multiarch` is supported in amd64 and arm64/v8 architectures.
10394

10495
On a Kubernetes platform, the sensors are installed using [helm chart](https://threatmapper.org/threatmapper/docs/v2.5/sensors/kubernetes/)
10596

@@ -137,12 +128,3 @@ Please file GitHub issues as needed, and join the Deepfence Community [Slack cha
137128
The Deepfence ThreatMapper project (this repository) is offered under the [Apache2 license](https://www.apache.org/licenses/LICENSE-2.0).
138129

139130
[Contributions](CONTRIBUTING.md) to Deepfence ThreatMapper project are similarly accepted under the Apache2 license, as per [GitHub's inbound=outbound policy](https://docs.github.com/en/github/site-policy/github-terms-of-service#6-contributions-under-repository-license).
140-
141-
# Performance Stats of deepfence/ThreatMapper - Last 28 days
142-
143-
<a href="https://next.ossinsight.io/widgets/official/compose-last-28-days-stats?repo_id=238662977" target="_blank" style="display: block" align="center">
144-
<picture>
145-
<source media="(prefers-color-scheme: dark)" srcset="https://next.ossinsight.io/widgets/official/compose-last-28-days-stats/thumbnail.png?repo_id=238662977&image_size=auto&color_scheme=dark" width="662" height="auto">
146-
<img alt="Performance Stats of deepfence/ThreatMapper - Last 28 days" src="https://next.ossinsight.io/widgets/official/compose-last-28-days-stats/thumbnail.png?repo_id=238662977&image_size=auto&color_scheme=light" width="662" height="auto">
147-
</picture>
148-
</a>
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
FROM python:3.6-slim-stretch
2-
MAINTAINER Deepfence Inc "support@deepfence.io"
32
COPY jenkins/index.html /
43
CMD python3 -m http.server 8000
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
FROM python:3.6-slim-stretch
2-
MAINTAINER Deepfence Inc "support@deepfence.io"
32
COPY ci-cd-integrations/jenkins/index.html /
43
CMD python3 -m http.server 8000

deepfence_agent/Dockerfile

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ FROM $IMAGE_REPOSITORY/deepfence_package_scanner_ce:$DF_IMG_TAG AS package_build
66
FROM $IMAGE_REPOSITORY/deepfence_malware_scanner_ce:$DF_IMG_TAG AS malware_build
77
FROM $IMAGE_REPOSITORY/deepfence_compliance_scanner_ce:$DF_IMG_TAG AS compliance_build
88

9-
FROM debian:12-slim as downloads
9+
FROM debian:13-slim as downloads
1010

11-
ENV DOCKERVERSION="27.3.1" \
12-
VESSEL_VERSION="0.14.0" \
13-
NERDCTL_VERSION="1.7.7" \
14-
CRICTL_VERSION="v1.31.1"
11+
ENV DOCKERVERSION="29.1.3" \
12+
VESSEL_VERSION="0.15.0" \
13+
NERDCTL_VERSION="2.2.0" \
14+
CRICTL_VERSION="v1.35.0"
1515

1616
ARG TARGETARCH
1717

@@ -68,9 +68,8 @@ RUN . /envfile-tools; cat /envfile-tools && \
6868
rm -f crictl-${CRICTL_VERSION}-linux-${ARCHITECTURE}.tar.gz
6969

7070

71-
FROM debian:12-slim
71+
FROM debian:13-slim
7272

73-
MAINTAINER Deepfence Inc
7473
LABEL deepfence.role=system
7574

7675
ENV CHECKPOINT_DISABLE=true \

deepfence_agent/Dockerfile.cloud-agent

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@ ARG STEAMPIPE_IMG_TAG=0.23.x
22
ARG IMAGE_REPOSITORY=quay.io/deepfenceio
33
FROM $IMAGE_REPOSITORY/steampipe:$STEAMPIPE_IMG_TAG AS steampipe
44

5-
FROM debian:bookworm-slim
5+
FROM debian:trixie-slim
66
ARG VERSION
7-
MAINTAINER Deepfence Inc
87
LABEL deepfence.role=system
98

109
ENV CHECKPOINT_DISABLE=true \

deepfence_agent/Dockerfile.cluster-agent

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
FROM debian:bullseye-slim
2-
LABEL maintainer="Deepfence Inc"
1+
FROM debian:trixie-slim
32
LABEL deepfence.role=system
43

54
ENV CHECKPOINT_DISABLE=true \

deepfence_agent/agent-binary/Dockerfile.scratch

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
FROM golang:1.19-bullseye AS build
1+
FROM golang:1.25-trixie AS build
22
RUN apt-get update \
33
&& apt-get install -y bash make git gcc \
44
&& cd /go \
5-
&& git clone --depth 1 -b v0.44.1 https://github.com/deepfence/syft \
6-
&& cd /go/syft \
7-
&& go build -v -o syftCli .
5+
&& git clone --depth 1 -b v1.39.0 https://github.com/anchore/syft \
6+
&& cd /go/syft/cmd/syft \
7+
&& go build -v -o /go/syft/syftCli .
88

99
FROM scratch
1010

11-
MAINTAINER Deepfence Inc
1211
LABEL deepfence.role=system
1312

1413
WORKDIR /

deepfence_agent/build-fargate.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ IMAGE_REPOSITORY=${IMAGE_REPOSITORY:-deepfenceio}
44

55
rm -rf $AGENT_BINARY_BUILD/*
66

7-
wget https://deepfence-public.s3.amazonaws.com/ThreatMapper/agent-sensor/v2.1.0/cc11435d-bf5f-4a16-8c92-0a5a27e06b92/deepfence-agent-2.tar.gz
7+
wget https://artifacts.threatmapper.org/ThreatMapper/agent-sensor/v2.1.0/cc11435d-bf5f-4a16-8c92-0a5a27e06b92/deepfence-agent-2.tar.gz
88

99
tar -zxvf deepfence-agent-2.tar.gz -C $AGENT_BINARY_BUILD/
1010
rm -rf deepfence-agent-2.tar.gz

0 commit comments

Comments
 (0)