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

Adjust Docker build defaults

Makefile

@@ -1,8 +1,13 @@
 # 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
 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
 
@@ -29,8 +34,8 @@ publish: check-branch
                 --platform $(PLATFORMS) \
                 --tag $(IMAGE_NAME):latest \
                 --tag $(IMAGE_NAME):$(MONTHLY_TAG) \
-		--sbom=true \
-		--provenance=true \
+                $(SBOM_FLAG) \
+                $(PROVENANCE_FLAG) \
                 --push \
                 .
         $(MAKE) scan

package-lock.json

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

package.json

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