@catladder/pipeline 1.123.0 → 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 (25) 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 +48 -28
  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/examples/custom-deploy.ts +8 -0
  24. package/package.json +1 -1
  25. package/src/build/docker.ts +16 -6
package/examples/__snapshots__/kubernetes-with-mongodb.ts.snap CHANGED
@@ -275,12 +275,17 @@ mongodb:
275
275
  },
276
276
  "script": [
277
277
  "ensureNodeDockerfile",
278
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
278
279
  "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
279
- "docker version",
280
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
281
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
280
282
  "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",
283
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
284
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
281
285
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
282
286
  "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
283
287
  "docker push $DOCKER_CACHE_IMAGE",
288
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
284
289
  ],
285
290
  "services": [
286
291
  {
@@ -1027,12 +1032,17 @@ mongodb:
1027
1032
  },
1028
1033
  "script": [
1029
1034
  "ensureNodeDockerfile",
1035
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
1030
1036
  "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
1031
- "docker version",
1037
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
1038
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
1032
1039
  "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",
1040
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
1041
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
1033
1042
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
1034
1043
  "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
1035
1044
  "docker push $DOCKER_CACHE_IMAGE",
1045
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
1036
1046
  ],
1037
1047
  "services": [
1038
1048
  {
@@ -1931,12 +1941,17 @@ mongodb:
1931
1941
  },
1932
1942
  "script": [
1933
1943
  "ensureNodeDockerfile",
1944
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
1934
1945
  "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
1935
- "docker version",
1946
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
1947
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
1936
1948
  "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",
1949
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
1950
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
1937
1951
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
1938
1952
  "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
1939
1953
  "docker push $DOCKER_CACHE_IMAGE",
1954
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
1940
1955
  ],
1941
1956
  "services": [
1942
1957
  {
@@ -1999,12 +2014,17 @@ COPY --chown=node:node .yarn /app/.yarn",
1999
2014
  },
2000
2015
  "script": [
2001
2016
  "ensureNodeDockerfile",
2017
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
2002
2018
  "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
2003
- "docker version",
2019
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
2020
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
2004
2021
  "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",
2022
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
2023
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
2005
2024
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
2006
2025
  "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
2007
2026
  "docker push $DOCKER_CACHE_IMAGE",
2027
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
2008
2028
  ],
2009
2029
  "services": [
2010
2030
  {
package/examples/__snapshots__/meteor-kubernetes.ts.snap CHANGED
@@ -264,12 +264,17 @@ mongodb:
264
264
  },
265
265
  "script": [
266
266
  "ensureMeteorDockerfile",
267
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
267
268
  "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
268
- "docker version",
269
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
270
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
269
271
  "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",
272
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
273
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
270
274
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
271
275
  "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
272
276
  "docker push $DOCKER_CACHE_IMAGE",
277
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
273
278
  ],
274
279
  "services": [
275
280
  {
@@ -987,12 +992,17 @@ mongodb:
987
992
  },
988
993
  "script": [
989
994
  "ensureMeteorDockerfile",
995
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
990
996
  "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
991
- "docker version",
997
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
998
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
992
999
  "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",
1000
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
1001
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
993
1002
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
994
1003
  "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
995
1004
  "docker push $DOCKER_CACHE_IMAGE",
1005
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
996
1006
  ],
997
1007
  "services": [
998
1008
  {
@@ -1873,12 +1883,17 @@ mongodb:
1873
1883
  },
1874
1884
  "script": [
1875
1885
  "ensureMeteorDockerfile",
1886
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
1876
1887
  "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
1877
- "docker version",
1888
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
1889
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
1878
1890
  "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",
1891
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
1892
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
1879
1893
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
1880
1894
  "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
1881
1895
  "docker push $DOCKER_CACHE_IMAGE",
1896
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
1882
1897
  ],
1883
1898
  "services": [
1884
1899
  {
@@ -1926,12 +1941,17 @@ mongodb:
1926
1941
  },
1927
1942
  "script": [
1928
1943
  "ensureMeteorDockerfile",
1944
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
1929
1945
  "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
1930
- "docker version",
1946
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
1947
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
1931
1948
  "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",
1949
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
1950
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
1932
1951
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
1933
1952
  "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
1934
1953
  "docker push $DOCKER_CACHE_IMAGE",
1954
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
1935
1955
  ],
1936
1956
  "services": [
1937
1957
  {
package/examples/__snapshots__/native-app.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
  {
@@ -1055,12 +1060,17 @@ EOF",
1055
1060
  },
1056
1061
  "script": [
1057
1062
  "ensureNodeDockerfile",
1063
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
1058
1064
  "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
1059
- "docker version",
1065
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
1066
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
1060
1067
  "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",
1068
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
1069
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
1061
1070
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
1062
1071
  "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
1063
1072
  "docker push $DOCKER_CACHE_IMAGE",
1073
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
1064
1074
  ],
1065
1075
  "services": [
1066
1076
  {
@@ -1993,12 +2003,17 @@ EOF",
1993
2003
  },
1994
2004
  "script": [
1995
2005
  "ensureNodeDockerfile",
2006
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
1996
2007
  "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
1997
- "docker version",
2008
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
2009
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
1998
2010
  "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",
2011
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
2012
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
1999
2013
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
2000
2014
  "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
2001
2015
  "docker push $DOCKER_CACHE_IMAGE",
2016
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
2002
2017
  ],
2003
2018
  "services": [
2004
2019
  {
@@ -2061,12 +2076,17 @@ COPY --chown=node:node .yarn /app/.yarn",
2061
2076
  },
2062
2077
  "script": [
2063
2078
  "ensureNodeDockerfile",
2079
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
2064
2080
  "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
2065
- "docker version",
2081
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
2082
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
2066
2083
  "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",
2084
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
2085
+ "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
2067
2086
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
2068
2087
  "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
2069
2088
  "docker push $DOCKER_CACHE_IMAGE",
2089
+ "echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
2070
2090
  ],
2071
2091
  "services": [
2072
2092
  {
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/examples/custom-deploy.ts CHANGED
@@ -15,6 +15,14 @@ const config: Config = {
15
15
  requiresDocker: true,
16
16
  jobVars: {
17
17
  secret: ["DEPLOY_API_KEY"],
18
+
19
+ public: {
20
+ // if your deploy job requires more memory and/or cpu, you can increase them with those variables:
21
+ KUBERNETES_CPU_REQUEST: "1",
22
+ KUBERNETES_CPU_LIMIT: "1",
23
+ KUBERNETES_MEMORY_REQUEST: "1024Mi",
24
+ KUBERNETES_MEMORY_LIMIT: "2048Mi",
25
+ },
18
26
  },
19
27
  script: ["echo 'would deploy'"],
20
28
  stopScript: ["echo 'would stop'"],
package/package.json CHANGED
@@ -52,7 +52,7 @@
52
52
  }
53
53
  ],
54
54
  "license": "MIT",
55
- "version": "1.123.0",
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) =>