@catladder/pipeline 1.123.1 → 1.124.1
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.
- package/dist/build/custom/buildJob.js +1 -1
- package/dist/build/docker.d.ts +26 -6
- package/dist/build/docker.js +53 -8
- package/dist/build/node/buildJob.js +1 -1
- package/dist/build/node/meteor.js +1 -1
- package/dist/build/rails/build.js +12 -3
- package/dist/bundles/catladder-gitlab/index.js +3 -3
- package/dist/constants.js +1 -1
- package/dist/deploy/cloudRun/artifactsRegistry.d.ts +7 -4
- package/dist/deploy/cloudRun/artifactsRegistry.js +30 -23
- package/dist/deploy/cloudRun/deployJob.js +1 -1
- package/dist/deploy/dockerTag/deployJob.js +32 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/examples/__snapshots__/cloud-run-memory-limit.ts.snap +72 -76
- package/examples/__snapshots__/cloud-run-no-cpu-throttling.ts.snap +72 -76
- package/examples/__snapshots__/cloud-run-non-public.ts.snap +72 -76
- package/examples/__snapshots__/cloud-run-with-sql-reuse-db.ts.snap +144 -152
- package/examples/__snapshots__/cloud-run-with-sql.ts.snap +144 -152
- package/examples/__snapshots__/custom-build-job-with-tests.ts.snap +72 -76
- package/examples/__snapshots__/custom-build-job.ts.snap +72 -76
- package/examples/__snapshots__/custom-deploy.ts.snap +40 -28
- package/examples/__snapshots__/custom-sbom-java.ts.snap +72 -76
- package/examples/__snapshots__/kubernetes-application-customization.ts.snap +40 -28
- package/examples/__snapshots__/kubernetes-with-cloud-sql-legacy.ts.snap +40 -28
- package/examples/__snapshots__/kubernetes-with-cloud-sql.ts.snap +40 -28
- package/examples/__snapshots__/kubernetes-with-jobs.ts.snap +80 -56
- package/examples/__snapshots__/kubernetes-with-mongodb.ts.snap +40 -28
- package/examples/__snapshots__/meteor-kubernetes.ts.snap +40 -28
- package/examples/__snapshots__/native-app.ts.snap +72 -76
- package/examples/__snapshots__/node-build-with-custom-image.ts.snap +72 -76
- package/examples/__snapshots__/rails-k8s-with-worker.ts.snap +56 -52
- package/package.json +1 -1
- package/src/build/custom/buildJob.ts +1 -0
- package/src/build/docker.ts +56 -16
- package/src/build/node/buildJob.ts +1 -0
- package/src/build/node/meteor.ts +1 -1
- package/src/build/rails/build.ts +2 -2
- package/src/deploy/cloudRun/artifactsRegistry.ts +35 -32
- package/src/deploy/cloudRun/deployJob.ts +1 -8
- package/src/deploy/dockerTag/deployJob.ts +1 -1
|
@@ -253,12 +253,17 @@ cronjobs:
|
|
|
253
253
|
},
|
|
254
254
|
"script": [
|
|
255
255
|
"ensureNodeDockerfile",
|
|
256
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
|
|
256
257
|
"docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
|
|
257
|
-
"
|
|
258
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
|
|
259
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
|
|
258
260
|
"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",
|
|
261
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
|
|
262
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
|
|
259
263
|
"docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
|
|
260
264
|
"docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
|
|
261
265
|
"docker push $DOCKER_CACHE_IMAGE",
|
|
266
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
|
|
262
267
|
],
|
|
263
268
|
"services": [
|
|
264
269
|
{
|
|
@@ -274,7 +279,7 @@ cronjobs:
|
|
|
274
279
|
"DOCKERFILE_ADDITIONS": undefined,
|
|
275
280
|
"DOCKERFILE_ADDITIONS_END": undefined,
|
|
276
281
|
"DOCKER_BUILDKIT": "1",
|
|
277
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
282
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
|
|
278
283
|
"DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
|
|
279
284
|
RUN yarn plugin import workspace-tools
|
|
280
285
|
RUN yarn workspaces focus --production && yarn rebuild",
|
|
@@ -285,11 +290,10 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
285
290
|
"DOCKER_DIR": ".",
|
|
286
291
|
"DOCKER_DRIVER": "overlay2",
|
|
287
292
|
"DOCKER_HOST": "tcp://0.0.0.0:2375",
|
|
288
|
-
"DOCKER_IMAGE": "$
|
|
293
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
289
294
|
"DOCKER_IMAGE_NAME": "dev/api",
|
|
290
295
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
291
296
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
292
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
293
297
|
"DOCKER_TLS_CERTDIR": "",
|
|
294
298
|
"KUBERNETES_CPU_LIMIT": "1",
|
|
295
299
|
"KUBERNETES_CPU_REQUEST": "0.5",
|
|
@@ -364,12 +368,11 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
364
368
|
"BUILD_INFO_CURRENT_VERSION": "3.2.1",
|
|
365
369
|
"BUILD_INFO_ID": "some-id",
|
|
366
370
|
"COMPONENT_NAME": "api",
|
|
367
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
368
|
-
"DOCKER_IMAGE": "$
|
|
371
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
|
|
372
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
369
373
|
"DOCKER_IMAGE_NAME": "dev/api",
|
|
370
374
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
371
375
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
372
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
373
376
|
"ENV_SHORT": "dev",
|
|
374
377
|
"ENV_TYPE": "dev",
|
|
375
378
|
"HELM_ARGS": "",
|
|
@@ -863,12 +866,17 @@ application:
|
|
|
863
866
|
},
|
|
864
867
|
"script": [
|
|
865
868
|
"ensureNodeDockerfile",
|
|
869
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
|
|
866
870
|
"docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
|
|
867
|
-
"
|
|
871
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
|
|
872
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
|
|
868
873
|
"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",
|
|
874
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
|
|
875
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
|
|
869
876
|
"docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
|
|
870
877
|
"docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
|
|
871
878
|
"docker push $DOCKER_CACHE_IMAGE",
|
|
879
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
|
|
872
880
|
],
|
|
873
881
|
"services": [
|
|
874
882
|
{
|
|
@@ -884,7 +892,7 @@ application:
|
|
|
884
892
|
"DOCKERFILE_ADDITIONS": undefined,
|
|
885
893
|
"DOCKERFILE_ADDITIONS_END": undefined,
|
|
886
894
|
"DOCKER_BUILDKIT": "1",
|
|
887
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
895
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/www",
|
|
888
896
|
"DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
|
|
889
897
|
RUN yarn plugin import workspace-tools
|
|
890
898
|
RUN yarn workspaces focus --production && yarn rebuild",
|
|
@@ -895,11 +903,10 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
895
903
|
"DOCKER_DIR": ".",
|
|
896
904
|
"DOCKER_DRIVER": "overlay2",
|
|
897
905
|
"DOCKER_HOST": "tcp://0.0.0.0:2375",
|
|
898
|
-
"DOCKER_IMAGE": "$
|
|
906
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
899
907
|
"DOCKER_IMAGE_NAME": "dev/www",
|
|
900
908
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
901
909
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
902
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
903
910
|
"DOCKER_TLS_CERTDIR": "",
|
|
904
911
|
"KUBERNETES_CPU_LIMIT": "1",
|
|
905
912
|
"KUBERNETES_CPU_REQUEST": "0.5",
|
|
@@ -974,12 +981,11 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
974
981
|
"BUILD_INFO_CURRENT_VERSION": "3.2.1",
|
|
975
982
|
"BUILD_INFO_ID": "some-id",
|
|
976
983
|
"COMPONENT_NAME": "www",
|
|
977
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
978
|
-
"DOCKER_IMAGE": "$
|
|
984
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/www",
|
|
985
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
979
986
|
"DOCKER_IMAGE_NAME": "dev/www",
|
|
980
987
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
981
988
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
982
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
983
989
|
"ENV_SHORT": "dev",
|
|
984
990
|
"ENV_TYPE": "dev",
|
|
985
991
|
"HELM_ARGS": "",
|
|
@@ -1536,12 +1542,17 @@ cronjobs: {}
|
|
|
1536
1542
|
},
|
|
1537
1543
|
"script": [
|
|
1538
1544
|
"ensureNodeDockerfile",
|
|
1545
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
|
|
1539
1546
|
"docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
|
|
1540
|
-
"
|
|
1547
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
|
|
1548
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
|
|
1541
1549
|
"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",
|
|
1550
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
|
|
1551
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
|
|
1542
1552
|
"docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
|
|
1543
1553
|
"docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
|
|
1544
1554
|
"docker push $DOCKER_CACHE_IMAGE",
|
|
1555
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
|
|
1545
1556
|
],
|
|
1546
1557
|
"services": [
|
|
1547
1558
|
{
|
|
@@ -1557,7 +1568,7 @@ cronjobs: {}
|
|
|
1557
1568
|
"DOCKERFILE_ADDITIONS": undefined,
|
|
1558
1569
|
"DOCKERFILE_ADDITIONS_END": undefined,
|
|
1559
1570
|
"DOCKER_BUILDKIT": "1",
|
|
1560
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
1571
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
|
|
1561
1572
|
"DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
|
|
1562
1573
|
RUN yarn plugin import workspace-tools
|
|
1563
1574
|
RUN yarn workspaces focus --production && yarn rebuild",
|
|
@@ -1568,11 +1579,10 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
1568
1579
|
"DOCKER_DIR": ".",
|
|
1569
1580
|
"DOCKER_DRIVER": "overlay2",
|
|
1570
1581
|
"DOCKER_HOST": "tcp://0.0.0.0:2375",
|
|
1571
|
-
"DOCKER_IMAGE": "$
|
|
1582
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
1572
1583
|
"DOCKER_IMAGE_NAME": "review/api",
|
|
1573
1584
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
1574
1585
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
1575
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
1576
1586
|
"DOCKER_TLS_CERTDIR": "",
|
|
1577
1587
|
"KUBERNETES_CPU_LIMIT": "1",
|
|
1578
1588
|
"KUBERNETES_CPU_REQUEST": "0.5",
|
|
@@ -1647,12 +1657,11 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
1647
1657
|
"BUILD_INFO_CURRENT_VERSION": "3.2.1",
|
|
1648
1658
|
"BUILD_INFO_ID": "some-id",
|
|
1649
1659
|
"COMPONENT_NAME": "api",
|
|
1650
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
1651
|
-
"DOCKER_IMAGE": "$
|
|
1660
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
|
|
1661
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
1652
1662
|
"DOCKER_IMAGE_NAME": "review/api",
|
|
1653
1663
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
1654
1664
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
1655
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
1656
1665
|
"ENV_SHORT": "review",
|
|
1657
1666
|
"ENV_TYPE": "review",
|
|
1658
1667
|
"HELM_ARGS": "",
|
|
@@ -2140,12 +2149,17 @@ application:
|
|
|
2140
2149
|
},
|
|
2141
2150
|
"script": [
|
|
2142
2151
|
"ensureNodeDockerfile",
|
|
2152
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
|
|
2143
2153
|
"docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
|
|
2144
|
-
"
|
|
2154
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
|
|
2155
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
|
|
2145
2156
|
"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",
|
|
2157
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
|
|
2158
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
|
|
2146
2159
|
"docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
|
|
2147
2160
|
"docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
|
|
2148
2161
|
"docker push $DOCKER_CACHE_IMAGE",
|
|
2162
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
|
|
2149
2163
|
],
|
|
2150
2164
|
"services": [
|
|
2151
2165
|
{
|
|
@@ -2161,7 +2175,7 @@ application:
|
|
|
2161
2175
|
"DOCKERFILE_ADDITIONS": undefined,
|
|
2162
2176
|
"DOCKERFILE_ADDITIONS_END": undefined,
|
|
2163
2177
|
"DOCKER_BUILDKIT": "1",
|
|
2164
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
2178
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/www",
|
|
2165
2179
|
"DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
|
|
2166
2180
|
RUN yarn plugin import workspace-tools
|
|
2167
2181
|
RUN yarn workspaces focus --production && yarn rebuild",
|
|
@@ -2172,11 +2186,10 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
2172
2186
|
"DOCKER_DIR": ".",
|
|
2173
2187
|
"DOCKER_DRIVER": "overlay2",
|
|
2174
2188
|
"DOCKER_HOST": "tcp://0.0.0.0:2375",
|
|
2175
|
-
"DOCKER_IMAGE": "$
|
|
2189
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
2176
2190
|
"DOCKER_IMAGE_NAME": "review/www",
|
|
2177
2191
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
2178
2192
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
2179
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
2180
2193
|
"DOCKER_TLS_CERTDIR": "",
|
|
2181
2194
|
"KUBERNETES_CPU_LIMIT": "1",
|
|
2182
2195
|
"KUBERNETES_CPU_REQUEST": "0.5",
|
|
@@ -2251,12 +2264,11 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
2251
2264
|
"BUILD_INFO_CURRENT_VERSION": "3.2.1",
|
|
2252
2265
|
"BUILD_INFO_ID": "some-id",
|
|
2253
2266
|
"COMPONENT_NAME": "www",
|
|
2254
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
2255
|
-
"DOCKER_IMAGE": "$
|
|
2267
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/www",
|
|
2268
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
2256
2269
|
"DOCKER_IMAGE_NAME": "review/www",
|
|
2257
2270
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
2258
2271
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
2259
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
2260
2272
|
"ENV_SHORT": "review",
|
|
2261
2273
|
"ENV_TYPE": "review",
|
|
2262
2274
|
"HELM_ARGS": "",
|
|
@@ -2946,12 +2958,17 @@ cronjobs:
|
|
|
2946
2958
|
},
|
|
2947
2959
|
"script": [
|
|
2948
2960
|
"ensureNodeDockerfile",
|
|
2961
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
|
|
2949
2962
|
"docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
|
|
2950
|
-
"
|
|
2963
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
|
|
2964
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
|
|
2951
2965
|
"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",
|
|
2966
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
|
|
2967
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
|
|
2952
2968
|
"docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
|
|
2953
2969
|
"docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
|
|
2954
2970
|
"docker push $DOCKER_CACHE_IMAGE",
|
|
2971
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
|
|
2955
2972
|
],
|
|
2956
2973
|
"services": [
|
|
2957
2974
|
{
|
|
@@ -2967,7 +2984,7 @@ cronjobs:
|
|
|
2967
2984
|
"DOCKERFILE_ADDITIONS": undefined,
|
|
2968
2985
|
"DOCKERFILE_ADDITIONS_END": undefined,
|
|
2969
2986
|
"DOCKER_BUILDKIT": "1",
|
|
2970
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
2987
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
|
|
2971
2988
|
"DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
|
|
2972
2989
|
RUN yarn plugin import workspace-tools
|
|
2973
2990
|
RUN yarn workspaces focus --production && yarn rebuild",
|
|
@@ -2978,11 +2995,10 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
2978
2995
|
"DOCKER_DIR": ".",
|
|
2979
2996
|
"DOCKER_DRIVER": "overlay2",
|
|
2980
2997
|
"DOCKER_HOST": "tcp://0.0.0.0:2375",
|
|
2981
|
-
"DOCKER_IMAGE": "$
|
|
2998
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
2982
2999
|
"DOCKER_IMAGE_NAME": "prod/api",
|
|
2983
3000
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
2984
3001
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
2985
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
2986
3002
|
"DOCKER_TLS_CERTDIR": "",
|
|
2987
3003
|
"KUBERNETES_CPU_LIMIT": "1",
|
|
2988
3004
|
"KUBERNETES_CPU_REQUEST": "0.5",
|
|
@@ -3014,12 +3030,17 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
3014
3030
|
},
|
|
3015
3031
|
"script": [
|
|
3016
3032
|
"ensureNodeDockerfile",
|
|
3033
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
|
|
3017
3034
|
"docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
|
|
3018
|
-
"
|
|
3035
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
|
|
3036
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
|
|
3019
3037
|
"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",
|
|
3038
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
|
|
3039
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
|
|
3020
3040
|
"docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
|
|
3021
3041
|
"docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
|
|
3022
3042
|
"docker push $DOCKER_CACHE_IMAGE",
|
|
3043
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
|
|
3023
3044
|
],
|
|
3024
3045
|
"services": [
|
|
3025
3046
|
{
|
|
@@ -3035,7 +3056,7 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
3035
3056
|
"DOCKERFILE_ADDITIONS": undefined,
|
|
3036
3057
|
"DOCKERFILE_ADDITIONS_END": undefined,
|
|
3037
3058
|
"DOCKER_BUILDKIT": "1",
|
|
3038
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
3059
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
|
|
3039
3060
|
"DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
|
|
3040
3061
|
RUN yarn plugin import workspace-tools
|
|
3041
3062
|
RUN yarn workspaces focus --production && yarn rebuild",
|
|
@@ -3046,11 +3067,10 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
3046
3067
|
"DOCKER_DIR": ".",
|
|
3047
3068
|
"DOCKER_DRIVER": "overlay2",
|
|
3048
3069
|
"DOCKER_HOST": "tcp://0.0.0.0:2375",
|
|
3049
|
-
"DOCKER_IMAGE": "$
|
|
3070
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
3050
3071
|
"DOCKER_IMAGE_NAME": "stage/api",
|
|
3051
3072
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
3052
3073
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
3053
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
3054
3074
|
"DOCKER_TLS_CERTDIR": "",
|
|
3055
3075
|
"KUBERNETES_CPU_LIMIT": "1",
|
|
3056
3076
|
"KUBERNETES_CPU_REQUEST": "0.5",
|
|
@@ -3113,12 +3133,11 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
3113
3133
|
"BUILD_INFO_CURRENT_VERSION": "3.2.1",
|
|
3114
3134
|
"BUILD_INFO_ID": "some-id",
|
|
3115
3135
|
"COMPONENT_NAME": "api",
|
|
3116
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
3117
|
-
"DOCKER_IMAGE": "$
|
|
3136
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
|
|
3137
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
3118
3138
|
"DOCKER_IMAGE_NAME": "prod/api",
|
|
3119
3139
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
3120
3140
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
3121
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
3122
3141
|
"ENV_SHORT": "prod",
|
|
3123
3142
|
"ENV_TYPE": "prod",
|
|
3124
3143
|
"HELM_ARGS": "",
|
|
@@ -3230,12 +3249,11 @@ cronjobs:
|
|
|
3230
3249
|
"BUILD_INFO_CURRENT_VERSION": "3.2.1",
|
|
3231
3250
|
"BUILD_INFO_ID": "some-id",
|
|
3232
3251
|
"COMPONENT_NAME": "api",
|
|
3233
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
3234
|
-
"DOCKER_IMAGE": "$
|
|
3252
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
|
|
3253
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
3235
3254
|
"DOCKER_IMAGE_NAME": "stage/api",
|
|
3236
3255
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
3237
3256
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
3238
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
3239
3257
|
"ENV_SHORT": "stage",
|
|
3240
3258
|
"ENV_TYPE": "stage",
|
|
3241
3259
|
"HELM_ARGS": "",
|
|
@@ -3904,12 +3922,17 @@ application:
|
|
|
3904
3922
|
},
|
|
3905
3923
|
"script": [
|
|
3906
3924
|
"ensureNodeDockerfile",
|
|
3925
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
|
|
3907
3926
|
"docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
|
|
3908
|
-
"
|
|
3927
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
|
|
3928
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
|
|
3909
3929
|
"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",
|
|
3930
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
|
|
3931
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
|
|
3910
3932
|
"docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
|
|
3911
3933
|
"docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
|
|
3912
3934
|
"docker push $DOCKER_CACHE_IMAGE",
|
|
3935
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
|
|
3913
3936
|
],
|
|
3914
3937
|
"services": [
|
|
3915
3938
|
{
|
|
@@ -3925,7 +3948,7 @@ application:
|
|
|
3925
3948
|
"DOCKERFILE_ADDITIONS": undefined,
|
|
3926
3949
|
"DOCKERFILE_ADDITIONS_END": undefined,
|
|
3927
3950
|
"DOCKER_BUILDKIT": "1",
|
|
3928
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
3951
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/www",
|
|
3929
3952
|
"DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
|
|
3930
3953
|
RUN yarn plugin import workspace-tools
|
|
3931
3954
|
RUN yarn workspaces focus --production && yarn rebuild",
|
|
@@ -3936,11 +3959,10 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
3936
3959
|
"DOCKER_DIR": ".",
|
|
3937
3960
|
"DOCKER_DRIVER": "overlay2",
|
|
3938
3961
|
"DOCKER_HOST": "tcp://0.0.0.0:2375",
|
|
3939
|
-
"DOCKER_IMAGE": "$
|
|
3962
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
3940
3963
|
"DOCKER_IMAGE_NAME": "prod/www",
|
|
3941
3964
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
3942
3965
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
3943
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
3944
3966
|
"DOCKER_TLS_CERTDIR": "",
|
|
3945
3967
|
"KUBERNETES_CPU_LIMIT": "1",
|
|
3946
3968
|
"KUBERNETES_CPU_REQUEST": "0.5",
|
|
@@ -3972,12 +3994,17 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
3972
3994
|
},
|
|
3973
3995
|
"script": [
|
|
3974
3996
|
"ensureNodeDockerfile",
|
|
3997
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
|
|
3975
3998
|
"docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
|
|
3976
|
-
"
|
|
3999
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
|
|
4000
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
|
|
3977
4001
|
"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",
|
|
4002
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
|
|
4003
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
|
|
3978
4004
|
"docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
|
|
3979
4005
|
"docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
|
|
3980
4006
|
"docker push $DOCKER_CACHE_IMAGE",
|
|
4007
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
|
|
3981
4008
|
],
|
|
3982
4009
|
"services": [
|
|
3983
4010
|
{
|
|
@@ -3993,7 +4020,7 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
3993
4020
|
"DOCKERFILE_ADDITIONS": undefined,
|
|
3994
4021
|
"DOCKERFILE_ADDITIONS_END": undefined,
|
|
3995
4022
|
"DOCKER_BUILDKIT": "1",
|
|
3996
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
4023
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/www",
|
|
3997
4024
|
"DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
|
|
3998
4025
|
RUN yarn plugin import workspace-tools
|
|
3999
4026
|
RUN yarn workspaces focus --production && yarn rebuild",
|
|
@@ -4004,11 +4031,10 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
4004
4031
|
"DOCKER_DIR": ".",
|
|
4005
4032
|
"DOCKER_DRIVER": "overlay2",
|
|
4006
4033
|
"DOCKER_HOST": "tcp://0.0.0.0:2375",
|
|
4007
|
-
"DOCKER_IMAGE": "$
|
|
4034
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
4008
4035
|
"DOCKER_IMAGE_NAME": "stage/www",
|
|
4009
4036
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
4010
4037
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
4011
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
4012
4038
|
"DOCKER_TLS_CERTDIR": "",
|
|
4013
4039
|
"KUBERNETES_CPU_LIMIT": "1",
|
|
4014
4040
|
"KUBERNETES_CPU_REQUEST": "0.5",
|
|
@@ -4071,12 +4097,11 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
4071
4097
|
"BUILD_INFO_CURRENT_VERSION": "3.2.1",
|
|
4072
4098
|
"BUILD_INFO_ID": "some-id",
|
|
4073
4099
|
"COMPONENT_NAME": "www",
|
|
4074
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
4075
|
-
"DOCKER_IMAGE": "$
|
|
4100
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/www",
|
|
4101
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
4076
4102
|
"DOCKER_IMAGE_NAME": "prod/www",
|
|
4077
4103
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
4078
4104
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
4079
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
4080
4105
|
"ENV_SHORT": "prod",
|
|
4081
4106
|
"ENV_TYPE": "prod",
|
|
4082
4107
|
"HELM_ARGS": "",
|
|
@@ -4181,12 +4206,11 @@ application:
|
|
|
4181
4206
|
"BUILD_INFO_CURRENT_VERSION": "3.2.1",
|
|
4182
4207
|
"BUILD_INFO_ID": "some-id",
|
|
4183
4208
|
"COMPONENT_NAME": "www",
|
|
4184
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
4185
|
-
"DOCKER_IMAGE": "$
|
|
4209
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/www",
|
|
4210
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
4186
4211
|
"DOCKER_IMAGE_NAME": "stage/www",
|
|
4187
4212
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
4188
4213
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
4189
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
4190
4214
|
"ENV_SHORT": "stage",
|
|
4191
4215
|
"ENV_TYPE": "stage",
|
|
4192
4216
|
"HELM_ARGS": "",
|