@catladder/pipeline 3.8.4 → 3.8.5

package/examples/__snapshots__/node-build-with-docker-additions.test.ts.snap

@@ -319,7 +319,10 @@ www 🧪 test:
   interruptible: true
 'www 🧾 sbom | dev ':
   stage: build
-  image: aquasec/trivy:0.38.3
+  image:
+    name: aquasec/trivy:0.38.3
+    entrypoint:
+      - ''
   variables: {}
   script:
     - collapseable_section_start "injectvars" "Injecting variables"
@@ -615,7 +618,10 @@ www 🧪 test:
   interruptible: true
 'www 🧾 sbom | review ':
   stage: build
-  image: aquasec/trivy:0.38.3
+  image:
+    name: aquasec/trivy:0.38.3
+    entrypoint:
+      - ''
   variables: {}
   script:
     - collapseable_section_start "injectvars" "Injecting variables"
@@ -917,7 +923,10 @@ www 🧪 test:
   interruptible: true
 'www 🧾 sbom | stage ':
   stage: build
-  image: aquasec/trivy:0.38.3
+  image:
+    name: aquasec/trivy:0.38.3
+    entrypoint:
+      - ''
   variables: {}
   script:
     - collapseable_section_start "injectvars" "Injecting variables"
@@ -1206,7 +1215,10 @@ www 🧪 test:
   interruptible: true
 'www 🧾 sbom | prod ':
   stage: build
-  image: aquasec/trivy:0.38.3
+  image:
+    name: aquasec/trivy:0.38.3
+    entrypoint:
+      - ''
   variables: {}
   script:
     - collapseable_section_start "injectvars" "Injecting variables"

package/examples/__snapshots__/override-secrets.test.ts.snap

@@ -319,7 +319,10 @@ my-app 🧪 test:
   interruptible: true
 'my-app 🧾 sbom | dev ':
   stage: build
-  image: aquasec/trivy:0.38.3
+  image:
+    name: aquasec/trivy:0.38.3
+    entrypoint:
+      - ''
   variables: {}
   script:
     - collapseable_section_start "injectvars" "Injecting variables"
@@ -620,7 +623,10 @@ my-app 🧪 test:
   interruptible: true
 'my-app 🧾 sbom | review ':
   stage: build
-  image: aquasec/trivy:0.38.3
+  image:
+    name: aquasec/trivy:0.38.3
+    entrypoint:
+      - ''
   variables: {}
   script:
     - collapseable_section_start "injectvars" "Injecting variables"
@@ -928,7 +934,10 @@ my-app 🧪 test:
   interruptible: true
 'my-app 🧾 sbom | stage ':
   stage: build
-  image: aquasec/trivy:0.38.3
+  image:
+    name: aquasec/trivy:0.38.3
+    entrypoint:
+      - ''
   variables: {}
   script:
     - collapseable_section_start "injectvars" "Injecting variables"
@@ -1220,7 +1229,10 @@ my-app 🧪 test:
   interruptible: true
 'my-app 🧾 sbom | prod ':
   stage: build
-  image: aquasec/trivy:0.38.3
+  image:
+    name: aquasec/trivy:0.38.3
+    entrypoint:
+      - ''
   variables: {}
   script:
     - collapseable_section_start "injectvars" "Injecting variables"

package/examples/__snapshots__/rails-k8s-with-worker-dockerfile.test.ts.snap

@@ -182,7 +182,10 @@ app 🧪 test:
   interruptible: true
 'app 🧾 sbom | dev ':
   stage: build
-  image: aquasec/trivy:0.38.3
+  image:
+    name: aquasec/trivy:0.38.3
+    entrypoint:
+      - ''
   variables: {}
   script:
     - collapseable_section_start "injectvars" "Injecting variables"
@@ -503,7 +506,10 @@ app 🧪 test:
   interruptible: true
 'app 🧾 sbom | review ':
   stage: build
-  image: aquasec/trivy:0.38.3
+  image:
+    name: aquasec/trivy:0.38.3
+    entrypoint:
+      - ''
   variables: {}
   script:
     - collapseable_section_start "injectvars" "Injecting variables"
@@ -830,7 +836,10 @@ app 🧪 test:
   interruptible: true
 'app 🧾 sbom | stage ':
   stage: build
-  image: aquasec/trivy:0.38.3
+  image:
+    name: aquasec/trivy:0.38.3
+    entrypoint:
+      - ''
   variables: {}
   script:
     - collapseable_section_start "injectvars" "Injecting variables"
@@ -1144,7 +1153,10 @@ app 🧪 test:
   interruptible: true
 'app 🧾 sbom | prod ':
   stage: build
-  image: aquasec/trivy:0.38.3
+  image:
+    name: aquasec/trivy:0.38.3
+    entrypoint:
+      - ''
   variables: {}
   script:
     - collapseable_section_start "injectvars" "Injecting variables"

package/examples/__snapshots__/rails-k8s-with-worker.test.ts.snap

@@ -178,7 +178,10 @@ app 🧪 test:
   interruptible: true
 'app 🧾 sbom | dev ':
   stage: build
-  image: aquasec/trivy:0.38.3
+  image:
+    name: aquasec/trivy:0.38.3
+    entrypoint:
+      - ''
   variables: {}
   script:
     - collapseable_section_start "injectvars" "Injecting variables"
@@ -495,7 +498,10 @@ app 🧪 test:
   interruptible: true
 'app 🧾 sbom | review ':
   stage: build
-  image: aquasec/trivy:0.38.3
+  image:
+    name: aquasec/trivy:0.38.3
+    entrypoint:
+      - ''
   variables: {}
   script:
     - collapseable_section_start "injectvars" "Injecting variables"
@@ -818,7 +824,10 @@ app 🧪 test:
   interruptible: true
 'app 🧾 sbom | stage ':
   stage: build
-  image: aquasec/trivy:0.38.3
+  image:
+    name: aquasec/trivy:0.38.3
+    entrypoint:
+      - ''
   variables: {}
   script:
     - collapseable_section_start "injectvars" "Injecting variables"
@@ -1128,7 +1137,10 @@ app 🧪 test:
   interruptible: true
 'app 🧾 sbom | prod ':
   stage: build
-  image: aquasec/trivy:0.38.3
+  image:
+    name: aquasec/trivy:0.38.3
+    entrypoint:
+      - ''
   variables: {}
   script:
     - collapseable_section_start "injectvars" "Injecting variables"

package/examples/__snapshots__/referencing-other-vars.test.ts.snap

@@ -327,7 +327,10 @@ app1 🧪 test:
   interruptible: true
 'app1 🧾 sbom | dev ':
   stage: build
-  image: aquasec/trivy:0.38.3
+  image:
+    name: aquasec/trivy:0.38.3
+    entrypoint:
+      - ''
   variables: {}
   script:
     - collapseable_section_start "injectvars" "Injecting variables"
@@ -646,7 +649,10 @@ app1 🧪 test:
   interruptible: true
 'app1 🧾 sbom | review ':
   stage: build
-  image: aquasec/trivy:0.38.3
+  image:
+    name: aquasec/trivy:0.38.3
+    entrypoint:
+      - ''
   variables: {}
   script:
     - collapseable_section_start "injectvars" "Injecting variables"
@@ -971,7 +977,10 @@ app1 🧪 test:
   interruptible: true
 'app1 🧾 sbom | stage ':
   stage: build
-  image: aquasec/trivy:0.38.3
+  image:
+    name: aquasec/trivy:0.38.3
+    entrypoint:
+      - ''
   variables: {}
   script:
     - collapseable_section_start "injectvars" "Injecting variables"
@@ -1283,7 +1292,10 @@ app1 🧪 test:
   interruptible: true
 'app1 🧾 sbom | prod ':
   stage: build
-  image: aquasec/trivy:0.38.3
+  image:
+    name: aquasec/trivy:0.38.3
+    entrypoint:
+      - ''
   variables: {}
   script:
     - collapseable_section_start "injectvars" "Injecting variables"
@@ -1697,7 +1709,10 @@ app2 🧪 test:
   interruptible: true
 'app2 🧾 sbom | dev ':
   stage: build
-  image: aquasec/trivy:0.38.3
+  image:
+    name: aquasec/trivy:0.38.3
+    entrypoint:
+      - ''
   variables: {}
   script:
     - collapseable_section_start "injectvars" "Injecting variables"
@@ -2026,7 +2041,10 @@ app2 🧪 test:
   interruptible: true
 'app2 🧾 sbom | review ':
   stage: build
-  image: aquasec/trivy:0.38.3
+  image:
+    name: aquasec/trivy:0.38.3
+    entrypoint:
+      - ''
   variables: {}
   script:
     - collapseable_section_start "injectvars" "Injecting variables"
@@ -2361,7 +2379,10 @@ app2 🧪 test:
   interruptible: true
 'app2 🧾 sbom | stage ':
   stage: build
-  image: aquasec/trivy:0.38.3
+  image:
+    name: aquasec/trivy:0.38.3
+    entrypoint:
+      - ''
   variables: {}
   script:
     - collapseable_section_start "injectvars" "Injecting variables"
@@ -2683,7 +2704,10 @@ app2 🧪 test:
   interruptible: true
 'app2 🧾 sbom | prod ':
   stage: build
-  image: aquasec/trivy:0.38.3
+  image:
+    name: aquasec/trivy:0.38.3
+    entrypoint:
+      - ''
   variables: {}
   script:
     - collapseable_section_start "injectvars" "Injecting variables"
@@ -3097,7 +3121,10 @@ app3 🧪 test:
   interruptible: true
 'app3 🧾 sbom | dev ':
   stage: build
-  image: aquasec/trivy:0.38.3
+  image:
+    name: aquasec/trivy:0.38.3
+    entrypoint:
+      - ''
   variables: {}
   script:
     - collapseable_section_start "injectvars" "Injecting variables"
@@ -3506,7 +3533,10 @@ app3 🧪 test:
   interruptible: true
 'app3 🧾 sbom | review ':
   stage: build
-  image: aquasec/trivy:0.38.3
+  image:
+    name: aquasec/trivy:0.38.3
+    entrypoint:
+      - ''
   variables: {}
   script:
     - collapseable_section_start "injectvars" "Injecting variables"
@@ -3916,7 +3946,10 @@ app3 🧪 test:
   interruptible: true
 'app3 🧾 sbom | stage ':
   stage: build
-  image: aquasec/trivy:0.38.3
+  image:
+    name: aquasec/trivy:0.38.3
+    entrypoint:
+      - ''
   variables: {}
   script:
     - collapseable_section_start "injectvars" "Injecting variables"
@@ -4318,7 +4351,10 @@ app3 🧪 test:
   interruptible: true
 'app3 🧾 sbom | prod ':
   stage: build
-  image: aquasec/trivy:0.38.3
+  image:
+    name: aquasec/trivy:0.38.3
+    entrypoint:
+      - ''
   variables: {}
   script:
     - collapseable_section_start "injectvars" "Injecting variables"

package/examples/__snapshots__/wait-for-other-deploy.test.ts.snap

@@ -251,7 +251,10 @@ api 🧪 test:
   interruptible: true
 'api 🧾 sbom | dev ':
   stage: build
-  image: aquasec/trivy:0.38.3
+  image:
+    name: aquasec/trivy:0.38.3
+    entrypoint:
+      - ''
   variables: {}
   script:
     - collapseable_section_start "injectvars" "Injecting variables"
@@ -389,7 +392,10 @@ api 🧪 test:
   interruptible: true
 'api 🧾 sbom | review ':
   stage: build
-  image: aquasec/trivy:0.38.3
+  image:
+    name: aquasec/trivy:0.38.3
+    entrypoint:
+      - ''
   variables: {}
   script:
     - collapseable_section_start "injectvars" "Injecting variables"
@@ -527,7 +533,10 @@ api 🧪 test:
   interruptible: true
 'api 🧾 sbom | stage ':
   stage: build
-  image: aquasec/trivy:0.38.3
+  image:
+    name: aquasec/trivy:0.38.3
+    entrypoint:
+      - ''
   variables: {}
   script:
     - collapseable_section_start "injectvars" "Injecting variables"
@@ -659,7 +668,10 @@ api 🧪 test:
   interruptible: true
 'api 🧾 sbom | prod ':
   stage: build
-  image: aquasec/trivy:0.38.3
+  image:
+    name: aquasec/trivy:0.38.3
+    entrypoint:
+      - ''
   variables: {}
   script:
     - collapseable_section_start "injectvars" "Injecting variables"
@@ -889,7 +901,10 @@ www 🧪 test:
   interruptible: true
 'www 🧾 sbom | dev ':
   stage: build
-  image: aquasec/trivy:0.38.3
+  image:
+    name: aquasec/trivy:0.38.3
+    entrypoint:
+      - ''
   variables: {}
   script:
     - collapseable_section_start "injectvars" "Injecting variables"
@@ -1029,7 +1044,10 @@ www 🧪 test:
   interruptible: true
 'www 🧾 sbom | review ':
   stage: build
-  image: aquasec/trivy:0.38.3
+  image:
+    name: aquasec/trivy:0.38.3
+    entrypoint:
+      - ''
   variables: {}
   script:
     - collapseable_section_start "injectvars" "Injecting variables"
@@ -1169,7 +1187,10 @@ www 🧪 test:
   interruptible: true
 'www 🧾 sbom | stage ':
   stage: build
-  image: aquasec/trivy:0.38.3
+  image:
+    name: aquasec/trivy:0.38.3
+    entrypoint:
+      - ''
   variables: {}
   script:
     - collapseable_section_start "injectvars" "Injecting variables"
@@ -1303,7 +1324,10 @@ www 🧪 test:
   interruptible: true
 'www 🧾 sbom | prod ':
   stage: build
-  image: aquasec/trivy:0.38.3
+  image:
+    name: aquasec/trivy:0.38.3
+    entrypoint:
+      - ''
   variables: {}
   script:
     - collapseable_section_start "injectvars" "Injecting variables"

package/examples/__snapshots__/workspace-api-www-turbo-cache.test.ts.snap

@@ -598,7 +598,10 @@ before_script:
   interruptible: true
 '🔹 api 🧾 sbom | dev ':
   stage: build
-  image: aquasec/trivy:0.38.3
+  image:
+    name: aquasec/trivy:0.38.3
+    entrypoint:
+      - ''
   variables: {}
   script:
     - collapseable_section_start "injectvars" "Injecting variables"
@@ -811,7 +814,10 @@ before_script:
   interruptible: true
 '🔹 api 🧾 sbom | review ':
   stage: build
-  image: aquasec/trivy:0.38.3
+  image:
+    name: aquasec/trivy:0.38.3
+    entrypoint:
+      - ''
   variables: {}
   script:
     - collapseable_section_start "injectvars" "Injecting variables"
@@ -1030,7 +1036,10 @@ before_script:
   interruptible: true
 '🔹 api 🧾 sbom | stage ':
   stage: build
-  image: aquasec/trivy:0.38.3
+  image:
+    name: aquasec/trivy:0.38.3
+    entrypoint:
+      - ''
   variables: {}
   script:
     - collapseable_section_start "injectvars" "Injecting variables"
@@ -1236,7 +1245,10 @@ before_script:
   interruptible: true
 '🔹 api 🧾 sbom | prod ':
   stage: build
-  image: aquasec/trivy:0.38.3
+  image:
+    name: aquasec/trivy:0.38.3
+    entrypoint:
+      - ''
   variables: {}
   script:
     - collapseable_section_start "injectvars" "Injecting variables"
@@ -1442,7 +1454,10 @@ before_script:
   interruptible: true
 '🔹 www 🧾 sbom | dev ':
   stage: build
-  image: aquasec/trivy:0.38.3
+  image:
+    name: aquasec/trivy:0.38.3
+    entrypoint:
+      - ''
   variables: {}
   script:
     - collapseable_section_start "injectvars" "Injecting variables"
@@ -1658,7 +1673,10 @@ before_script:
   interruptible: true
 '🔹 www 🧾 sbom | review ':
   stage: build
-  image: aquasec/trivy:0.38.3
+  image:
+    name: aquasec/trivy:0.38.3
+    entrypoint:
+      - ''
   variables: {}
   script:
     - collapseable_section_start "injectvars" "Injecting variables"
@@ -1880,7 +1898,10 @@ before_script:
   interruptible: true
 '🔹 www 🧾 sbom | stage ':
   stage: build
-  image: aquasec/trivy:0.38.3
+  image:
+    name: aquasec/trivy:0.38.3
+    entrypoint:
+      - ''
   variables: {}
   script:
     - collapseable_section_start "injectvars" "Injecting variables"
@@ -2089,7 +2110,10 @@ before_script:
   interruptible: true
 '🔹 www 🧾 sbom | prod ':
   stage: build
-  image: aquasec/trivy:0.38.3
+  image:
+    name: aquasec/trivy:0.38.3
+    entrypoint:
+      - ''
   variables: {}
   script:
     - collapseable_section_start "injectvars" "Injecting variables"

package/examples/__snapshots__/workspace-api-www.test.ts.snap

@@ -590,7 +590,10 @@ before_script:
   interruptible: true
 '🔹 api 🧾 sbom | dev ':
   stage: build
-  image: aquasec/trivy:0.38.3
+  image:
+    name: aquasec/trivy:0.38.3
+    entrypoint:
+      - ''
   variables: {}
   script:
     - collapseable_section_start "injectvars" "Injecting variables"
@@ -803,7 +806,10 @@ before_script:
   interruptible: true
 '🔹 api 🧾 sbom | review ':
   stage: build
-  image: aquasec/trivy:0.38.3
+  image:
+    name: aquasec/trivy:0.38.3
+    entrypoint:
+      - ''
   variables: {}
   script:
     - collapseable_section_start "injectvars" "Injecting variables"
@@ -1022,7 +1028,10 @@ before_script:
   interruptible: true
 '🔹 api 🧾 sbom | stage ':
   stage: build
-  image: aquasec/trivy:0.38.3
+  image:
+    name: aquasec/trivy:0.38.3
+    entrypoint:
+      - ''
   variables: {}
   script:
     - collapseable_section_start "injectvars" "Injecting variables"
@@ -1228,7 +1237,10 @@ before_script:
   interruptible: true
 '🔹 api 🧾 sbom | prod ':
   stage: build
-  image: aquasec/trivy:0.38.3
+  image:
+    name: aquasec/trivy:0.38.3
+    entrypoint:
+      - ''
   variables: {}
   script:
     - collapseable_section_start "injectvars" "Injecting variables"
@@ -1434,7 +1446,10 @@ before_script:
   interruptible: true
 '🔹 www 🧾 sbom | dev ':
   stage: build
-  image: aquasec/trivy:0.38.3
+  image:
+    name: aquasec/trivy:0.38.3
+    entrypoint:
+      - ''
   variables: {}
   script:
     - collapseable_section_start "injectvars" "Injecting variables"
@@ -1650,7 +1665,10 @@ before_script:
   interruptible: true
 '🔹 www 🧾 sbom | review ':
   stage: build
-  image: aquasec/trivy:0.38.3
+  image:
+    name: aquasec/trivy:0.38.3
+    entrypoint:
+      - ''
   variables: {}
   script:
     - collapseable_section_start "injectvars" "Injecting variables"
@@ -1872,7 +1890,10 @@ before_script:
   interruptible: true
 '🔹 www 🧾 sbom | stage ':
   stage: build
-  image: aquasec/trivy:0.38.3
+  image:
+    name: aquasec/trivy:0.38.3
+    entrypoint:
+      - ''
   variables: {}
   script:
     - collapseable_section_start "injectvars" "Injecting variables"
@@ -2081,7 +2102,10 @@ before_script:
   interruptible: true
 '🔹 www 🧾 sbom | prod ':
   stage: build
-  image: aquasec/trivy:0.38.3
+  image:
+    name: aquasec/trivy:0.38.3
+    entrypoint:
+      - ''
   variables: {}
   script:
     - collapseable_section_start "injectvars" "Injecting variables"

package/package.json

@@ -53,7 +53,7 @@
     }
   ],
   "license": "MIT",
-  "version": "3.8.4",
+  "version": "3.8.5",
   "scripts": {
     "build:tsc": "yarn tsc",
     "build": "yarn build:compile && yarn build:inline-variables",

package/src/build/sbom.ts

@@ -11,7 +11,10 @@ export const createSbomBuildJob = (
 ): CatladderJob => {
   const buildConfig = context.build.config;
 
-  const defaultImage = "aquasec/trivy:0.38.3";
+  const defaultImage = {
+    name: "aquasec/trivy:0.38.3",
+    entrypoint: [""],
+  };
   const defaultScript = [
     `trivy fs --quiet --format cyclonedx --output "${SBOM_FILE}" ${
       context.packageManagerInfo.componentIsInWorkspace