@catladder/pipeline 1.123.1 → 1.124.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (24) hide show
  1. package/dist/build/docker.js +34 -1
  2. package/dist/bundles/catladder-gitlab/index.js +1 -1
  3. package/dist/constants.js +1 -1
  4. package/dist/tsconfig.tsbuildinfo +1 -1
  5. package/examples/__snapshots__/cloud-run-memory-limit.ts.snap +24 -4
  6. package/examples/__snapshots__/cloud-run-no-cpu-throttling.ts.snap +24 -4
  7. package/examples/__snapshots__/cloud-run-non-public.ts.snap +24 -4
  8. package/examples/__snapshots__/cloud-run-with-sql-reuse-db.ts.snap +48 -8
  9. package/examples/__snapshots__/cloud-run-with-sql.ts.snap +48 -8
  10. package/examples/__snapshots__/custom-build-job-with-tests.ts.snap +24 -4
  11. package/examples/__snapshots__/custom-build-job.ts.snap +24 -4
  12. package/examples/__snapshots__/custom-deploy.ts.snap +24 -4
  13. package/examples/__snapshots__/custom-sbom-java.ts.snap +24 -4
  14. package/examples/__snapshots__/kubernetes-application-customization.ts.snap +24 -4
  15. package/examples/__snapshots__/kubernetes-with-cloud-sql-legacy.ts.snap +24 -4
  16. package/examples/__snapshots__/kubernetes-with-cloud-sql.ts.snap +24 -4
  17. package/examples/__snapshots__/kubernetes-with-jobs.ts.snap +48 -8
  18. package/examples/__snapshots__/kubernetes-with-mongodb.ts.snap +24 -4
  19. package/examples/__snapshots__/meteor-kubernetes.ts.snap +24 -4
  20. package/examples/__snapshots__/native-app.ts.snap +24 -4
  21. package/examples/__snapshots__/node-build-with-custom-image.ts.snap +24 -4
  22. package/examples/__snapshots__/rails-k8s-with-worker.ts.snap +24 -4
  23. package/package.json +1 -1
  24. package/src/build/docker.ts +16 -6
package/examples/__snapshots__/node-build-with-custom-image.ts.snap CHANGED
@@ -158,12 +158,17 @@ exports[`matches snapshot 1`] = `
158
158
  },
159
159
  "script": [
160
160
  "ensureNodeDockerfile",
161
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
161
162
  "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
162
- "docker version",
163
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
164
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
163
165
  "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile . --build-arg BUILDKIT_INLINE_CACHE=1",
166
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
167
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
164
168
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
165
169
  "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
166
170
  "docker push $DOCKER_CACHE_IMAGE",
171
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
167
172
  ],
168
173
  "services": [
169
174
  {
@@ -701,12 +706,17 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
701
706
  },
702
707
  "script": [
703
708
  "ensureNodeDockerfile",
709
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
704
710
  "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
705
- "docker version",
711
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
712
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
706
713
  "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile . --build-arg BUILDKIT_INLINE_CACHE=1",
714
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
715
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
707
716
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
708
717
  "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
709
718
  "docker push $DOCKER_CACHE_IMAGE",
719
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
710
720
  ],
711
721
  "services": [
712
722
  {
@@ -1285,12 +1295,17 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1285
1295
  },
1286
1296
  "script": [
1287
1297
  "ensureNodeDockerfile",
1298
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
1288
1299
  "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
1289
- "docker version",
1300
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
1301
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
1290
1302
  "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile . --build-arg BUILDKIT_INLINE_CACHE=1",
1303
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
1304
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
1291
1305
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
1292
1306
  "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
1293
1307
  "docker push $DOCKER_CACHE_IMAGE",
1308
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
1294
1309
  ],
1295
1310
  "services": [
1296
1311
  {
@@ -1353,12 +1368,17 @@ COPY --chown=node:node .yarn /app/.yarn",
1353
1368
  },
1354
1369
  "script": [
1355
1370
  "ensureNodeDockerfile",
1371
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
1356
1372
  "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
1357
- "docker version",
1373
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
1374
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
1358
1375
  "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile . --build-arg BUILDKIT_INLINE_CACHE=1",
1376
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
1377
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
1359
1378
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
1360
1379
  "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
1361
1380
  "docker push $DOCKER_CACHE_IMAGE",
1381
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
1362
1382
  ],
1363
1383
  "services": [
1364
1384
  {
package/examples/__snapshots__/rails-k8s-with-worker.ts.snap CHANGED
@@ -2252,12 +2252,17 @@ jobs:
2252
2252
  ],
2253
2253
  },
2254
2254
  "script": [
2255
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
2255
2256
  "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
2256
- "docker version",
2257
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
2258
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
2257
2259
  "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile . --build-arg BUILDKIT_INLINE_CACHE=1",
2260
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
2261
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
2258
2262
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
2259
2263
  "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
2260
2264
  "docker push $DOCKER_CACHE_IMAGE",
2265
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
2261
2266
  ],
2262
2267
  "services": [
2263
2268
  {
@@ -2841,12 +2846,17 @@ jobs:
2841
2846
  ],
2842
2847
  },
2843
2848
  "script": [
2849
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
2844
2850
  "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
2845
- "docker version",
2851
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
2852
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
2846
2853
  "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile . --build-arg BUILDKIT_INLINE_CACHE=1",
2854
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
2855
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
2847
2856
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
2848
2857
  "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
2849
2858
  "docker push $DOCKER_CACHE_IMAGE",
2859
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
2850
2860
  ],
2851
2861
  "services": [
2852
2862
  {
@@ -3509,12 +3519,17 @@ jobs:
3509
3519
  ],
3510
3520
  },
3511
3521
  "script": [
3522
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
3512
3523
  "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
3513
- "docker version",
3524
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
3525
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
3514
3526
  "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile . --build-arg BUILDKIT_INLINE_CACHE=1",
3527
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
3528
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
3515
3529
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
3516
3530
  "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
3517
3531
  "docker push $DOCKER_CACHE_IMAGE",
3532
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
3518
3533
  ],
3519
3534
  "services": [
3520
3535
  {
@@ -3558,12 +3573,17 @@ jobs:
3558
3573
  ],
3559
3574
  },
3560
3575
  "script": [
3576
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
3561
3577
  "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
3562
- "docker version",
3578
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
3579
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
3563
3580
  "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile . --build-arg BUILDKIT_INLINE_CACHE=1",
3581
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
3582
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
3564
3583
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
3565
3584
  "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
3566
3585
  "docker push $DOCKER_CACHE_IMAGE",
3586
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
3567
3587
  ],
3568
3588
  "services": [
3569
3589
  {
package/package.json CHANGED
@@ -52,7 +52,7 @@
52
52
  }
53
53
  ],
54
54
  "license": "MIT",
55
- "version": "1.123.1",
55
+ "version": "1.124.0",
56
56
  "scripts": {
57
57
  "build:tsc": "yarn tsc",
58
58
  "build": "yarn build:compile && yarn build:inline-variables && yarn build:bundle",
package/src/build/docker.ts CHANGED
@@ -5,6 +5,7 @@ import type { Context } from "../types";
5
5
  import type { CatladderJob } from "../types/jobs";
6
6
  import { existsSync } from "fs";
7
7
  import path from "path";
8
+ import { collapseableSection } from "../utils/gitlab";
8
9
 
9
10
  const DOCKER_RUNNER_BUILD_VARIABLES = {
10
11
  KUBERNETES_CPU_REQUEST: "0.5",
@@ -99,12 +100,21 @@ export const gitlabDockerLogin =
99
100
  export const getDockerBuildDefaultScript = (ensureDockerFileScript?: string) =>
100
101
  [
101
102
  ensureDockerFileScript,
102
- gitlabDockerLogin,
103
- "docker version",
104
- "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile . --build-arg BUILDKIT_INLINE_CACHE=1", //BUILDKIT_INLINE_CACHE, see https://testdriven.io/blog/faster-ci-builds-with-docker-cache/
105
- "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
106
- "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
107
- "docker push $DOCKER_CACHE_IMAGE",
103
+ ...collapseableSection("docker-login", "Docker Login")([gitlabDockerLogin]),
104
+ ...collapseableSection(
105
+ "docker-build",
106
+ "Docker build"
107
+ )([
108
+ "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile . --build-arg BUILDKIT_INLINE_CACHE=1", //BUILDKIT_INLINE_CACHE, see https://testdriven.io/blog/faster-ci-builds-with-docker-cache/
109
+ ]),
110
+ ...collapseableSection(
111
+ "docker-push",
112
+ "Docker push and tag"
113
+ )([
114
+ "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
115
+ "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
116
+ "docker push $DOCKER_CACHE_IMAGE",
117
+ ]),
108
118
  ].filter(Boolean);
109
119
 
110
120
  export const hasDockerfile = (context: Context) =>