exlim/cyberchef
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #17 from mkilijanek/codex/verify-npm-package-dependencies

Browse Source 
Adjust Docker build defaults
This commit is contained in:
Kili 2025-12-26 18:53:55 +01:00 committed by GitHub
commit f3466b97db
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Makefile
View File

@ -1,8 +1,13 @@
# Multi-platform Docker build and publish for CyberChef # Multi-platform Docker build and publish for CyberChef
IMAGE_NAME ?= ghcr.io/gchq/cyberchef IMAGE_NAME ?= ghcr.io/mkilijanek/cyberchef
PLATFORMS ?= linux/amd64,linux/arm64 PLATFORMS ?= linux/amd64,linux/arm64
MONTHLY_TAG ?= $(shell date +%Y-%m) MONTHLY_TAG ?= $(shell date +%Y-%m)
SBOM ?= false
PROVENANCE ?= false
SBOM_FLAG := $(if $(filter true,$(SBOM)),--sbom=true,)
PROVENANCE_FLAG := $(if $(filter true,$(PROVENANCE)),--provenance=true,)
.PHONY: check-branch build publish scan .PHONY: check-branch build publish scan
@ -26,14 +31,14 @@ build: check-branch
publish: check-branch publish: check-branch
docker buildx build \ docker buildx build \
--pull \ --pull \
--platform $(PLATFORMS) \ --platform $(PLATFORMS) \
--tag $(IMAGE_NAME):latest \ --tag $(IMAGE_NAME):latest \
--tag $(IMAGE_NAME):$(MONTHLY_TAG) \ --tag $(IMAGE_NAME):$(MONTHLY_TAG) \
--sbom=true \ $(SBOM_FLAG) \
--provenance=true \ $(PROVENANCE_FLAG) \
--push \ --push \
. .
$(MAKE) scan $(MAKE) scan
scan: scan:
docker scout cves $(IMAGE_NAME):latest --only-severity critical,high || true docker scout cves $(IMAGE_NAME):latest --only-severity critical,high || true

6
package-lock.json generated
View File

@ -73,7 +73,7 @@
"moment": "^2.30.1", "moment": "^2.30.1",
"moment-timezone": "^0.5.45", "moment-timezone": "^0.5.45",
"ngeohash": "^0.6.3", "ngeohash": "^0.6.3",
"node-forge": "^1.3.1", "node-forge": "^1.3.3",
"node-md6": "^0.1.0", "node-md6": "^0.1.0",
"nodom": "^2.4.0", "nodom": "^2.4.0",
"notepack.io": "^3.0.1", "notepack.io": "^3.0.1",
@ -159,6 +159,10 @@
"webpack-dev-server": "5.2.1", "webpack-dev-server": "5.2.1",
"webpack-node-externals": "^3.0.0", "webpack-node-externals": "^3.0.0",
"worker-loader": "^3.0.8" "worker-loader": "^3.0.8"
},
"overrides": {
"pbkdf2": "^3.1.5",
"sha.js": "^2.4.12"
} }
}, },
"node_modules/@ampproject/remapping": { "node_modules/@ampproject/remapping": {

6
package.json
View File

@ -160,7 +160,7 @@
"moment": "^2.30.1", "moment": "^2.30.1",
"moment-timezone": "^0.5.45", "moment-timezone": "^0.5.45",
"ngeohash": "^0.6.3", "ngeohash": "^0.6.3",
"node-forge": "^1.3.1", "node-forge": "^1.3.3",
"node-md6": "^0.1.0", "node-md6": "^0.1.0",
"nodom": "^2.4.0", "nodom": "^2.4.0",
"notepack.io": "^3.0.1", "notepack.io": "^3.0.1",
@ -190,6 +190,10 @@
"xregexp": "^5.1.1", "xregexp": "^5.1.1",
"zlibjs": "^0.3.1" "zlibjs": "^0.3.1"
}, },
"overrides": {
"pbkdf2": "^3.1.5",
"sha.js": "^2.4.12"
},
"scripts": { "scripts": {
"start": "npx grunt dev", "start": "npx grunt dev",
"build": "npx grunt prod", "build": "npx grunt prod",