@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
|
@@ -258,12 +258,17 @@ cloudsql:
|
|
|
258
258
|
},
|
|
259
259
|
"script": [
|
|
260
260
|
"ensureNodeDockerfile",
|
|
261
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
|
|
261
262
|
"docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
|
|
262
|
-
"
|
|
263
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
|
|
264
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
|
|
263
265
|
"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",
|
|
266
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
|
|
267
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
|
|
264
268
|
"docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
|
|
265
269
|
"docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
|
|
266
270
|
"docker push $DOCKER_CACHE_IMAGE",
|
|
271
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
|
|
267
272
|
],
|
|
268
273
|
"services": [
|
|
269
274
|
{
|
|
@@ -279,7 +284,7 @@ cloudsql:
|
|
|
279
284
|
"DOCKERFILE_ADDITIONS": undefined,
|
|
280
285
|
"DOCKERFILE_ADDITIONS_END": undefined,
|
|
281
286
|
"DOCKER_BUILDKIT": "1",
|
|
282
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
287
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
|
|
283
288
|
"DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
|
|
284
289
|
RUN yarn plugin import workspace-tools
|
|
285
290
|
RUN yarn workspaces focus --production && yarn rebuild",
|
|
@@ -290,11 +295,10 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
290
295
|
"DOCKER_DIR": ".",
|
|
291
296
|
"DOCKER_DRIVER": "overlay2",
|
|
292
297
|
"DOCKER_HOST": "tcp://0.0.0.0:2375",
|
|
293
|
-
"DOCKER_IMAGE": "$
|
|
298
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
294
299
|
"DOCKER_IMAGE_NAME": "dev/api",
|
|
295
300
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
296
301
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
297
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
298
302
|
"DOCKER_TLS_CERTDIR": "",
|
|
299
303
|
"KUBERNETES_CPU_LIMIT": "1",
|
|
300
304
|
"KUBERNETES_CPU_REQUEST": "0.5",
|
|
@@ -369,12 +373,11 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
369
373
|
"BUILD_INFO_CURRENT_VERSION": "3.2.1",
|
|
370
374
|
"BUILD_INFO_ID": "some-id",
|
|
371
375
|
"COMPONENT_NAME": "api",
|
|
372
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
373
|
-
"DOCKER_IMAGE": "$
|
|
376
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
|
|
377
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
374
378
|
"DOCKER_IMAGE_NAME": "dev/api",
|
|
375
379
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
376
380
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
377
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
378
381
|
"ENV_SHORT": "dev",
|
|
379
382
|
"ENV_TYPE": "dev",
|
|
380
383
|
"HELM_ARGS": "",
|
|
@@ -959,12 +962,17 @@ cloudsql:
|
|
|
959
962
|
},
|
|
960
963
|
"script": [
|
|
961
964
|
"ensureNodeDockerfile",
|
|
965
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
|
|
962
966
|
"docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
|
|
963
|
-
"
|
|
967
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
|
|
968
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
|
|
964
969
|
"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",
|
|
970
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
|
|
971
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
|
|
965
972
|
"docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
|
|
966
973
|
"docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
|
|
967
974
|
"docker push $DOCKER_CACHE_IMAGE",
|
|
975
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
|
|
968
976
|
],
|
|
969
977
|
"services": [
|
|
970
978
|
{
|
|
@@ -980,7 +988,7 @@ cloudsql:
|
|
|
980
988
|
"DOCKERFILE_ADDITIONS": undefined,
|
|
981
989
|
"DOCKERFILE_ADDITIONS_END": undefined,
|
|
982
990
|
"DOCKER_BUILDKIT": "1",
|
|
983
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
991
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
|
|
984
992
|
"DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
|
|
985
993
|
RUN yarn plugin import workspace-tools
|
|
986
994
|
RUN yarn workspaces focus --production && yarn rebuild",
|
|
@@ -991,11 +999,10 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
991
999
|
"DOCKER_DIR": ".",
|
|
992
1000
|
"DOCKER_DRIVER": "overlay2",
|
|
993
1001
|
"DOCKER_HOST": "tcp://0.0.0.0:2375",
|
|
994
|
-
"DOCKER_IMAGE": "$
|
|
1002
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
995
1003
|
"DOCKER_IMAGE_NAME": "review/api",
|
|
996
1004
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
997
1005
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
998
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
999
1006
|
"DOCKER_TLS_CERTDIR": "",
|
|
1000
1007
|
"KUBERNETES_CPU_LIMIT": "1",
|
|
1001
1008
|
"KUBERNETES_CPU_REQUEST": "0.5",
|
|
@@ -1070,12 +1077,11 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
1070
1077
|
"BUILD_INFO_CURRENT_VERSION": "3.2.1",
|
|
1071
1078
|
"BUILD_INFO_ID": "some-id",
|
|
1072
1079
|
"COMPONENT_NAME": "api",
|
|
1073
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
1074
|
-
"DOCKER_IMAGE": "$
|
|
1080
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
|
|
1081
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
1075
1082
|
"DOCKER_IMAGE_NAME": "review/api",
|
|
1076
1083
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
1077
1084
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
1078
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
1079
1085
|
"ENV_SHORT": "review",
|
|
1080
1086
|
"ENV_TYPE": "review",
|
|
1081
1087
|
"HELM_ARGS": "",
|
|
@@ -1795,12 +1801,17 @@ cloudsql:
|
|
|
1795
1801
|
},
|
|
1796
1802
|
"script": [
|
|
1797
1803
|
"ensureNodeDockerfile",
|
|
1804
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
|
|
1798
1805
|
"docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
|
|
1799
|
-
"
|
|
1806
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
|
|
1807
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
|
|
1800
1808
|
"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",
|
|
1809
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
|
|
1810
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
|
|
1801
1811
|
"docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
|
|
1802
1812
|
"docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
|
|
1803
1813
|
"docker push $DOCKER_CACHE_IMAGE",
|
|
1814
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
|
|
1804
1815
|
],
|
|
1805
1816
|
"services": [
|
|
1806
1817
|
{
|
|
@@ -1816,7 +1827,7 @@ cloudsql:
|
|
|
1816
1827
|
"DOCKERFILE_ADDITIONS": undefined,
|
|
1817
1828
|
"DOCKERFILE_ADDITIONS_END": undefined,
|
|
1818
1829
|
"DOCKER_BUILDKIT": "1",
|
|
1819
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
1830
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
|
|
1820
1831
|
"DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
|
|
1821
1832
|
RUN yarn plugin import workspace-tools
|
|
1822
1833
|
RUN yarn workspaces focus --production && yarn rebuild",
|
|
@@ -1827,11 +1838,10 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
1827
1838
|
"DOCKER_DIR": ".",
|
|
1828
1839
|
"DOCKER_DRIVER": "overlay2",
|
|
1829
1840
|
"DOCKER_HOST": "tcp://0.0.0.0:2375",
|
|
1830
|
-
"DOCKER_IMAGE": "$
|
|
1841
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
1831
1842
|
"DOCKER_IMAGE_NAME": "prod/api",
|
|
1832
1843
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
1833
1844
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
1834
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
1835
1845
|
"DOCKER_TLS_CERTDIR": "",
|
|
1836
1846
|
"KUBERNETES_CPU_LIMIT": "1",
|
|
1837
1847
|
"KUBERNETES_CPU_REQUEST": "0.5",
|
|
@@ -1863,12 +1873,17 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
1863
1873
|
},
|
|
1864
1874
|
"script": [
|
|
1865
1875
|
"ensureNodeDockerfile",
|
|
1876
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
|
|
1866
1877
|
"docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
|
|
1867
|
-
"
|
|
1878
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
|
|
1879
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
|
|
1868
1880
|
"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",
|
|
1881
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
|
|
1882
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
|
|
1869
1883
|
"docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
|
|
1870
1884
|
"docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
|
|
1871
1885
|
"docker push $DOCKER_CACHE_IMAGE",
|
|
1886
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
|
|
1872
1887
|
],
|
|
1873
1888
|
"services": [
|
|
1874
1889
|
{
|
|
@@ -1884,7 +1899,7 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
1884
1899
|
"DOCKERFILE_ADDITIONS": undefined,
|
|
1885
1900
|
"DOCKERFILE_ADDITIONS_END": undefined,
|
|
1886
1901
|
"DOCKER_BUILDKIT": "1",
|
|
1887
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
1902
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
|
|
1888
1903
|
"DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
|
|
1889
1904
|
RUN yarn plugin import workspace-tools
|
|
1890
1905
|
RUN yarn workspaces focus --production && yarn rebuild",
|
|
@@ -1895,11 +1910,10 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
1895
1910
|
"DOCKER_DIR": ".",
|
|
1896
1911
|
"DOCKER_DRIVER": "overlay2",
|
|
1897
1912
|
"DOCKER_HOST": "tcp://0.0.0.0:2375",
|
|
1898
|
-
"DOCKER_IMAGE": "$
|
|
1913
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
1899
1914
|
"DOCKER_IMAGE_NAME": "stage/api",
|
|
1900
1915
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
1901
1916
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
1902
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
1903
1917
|
"DOCKER_TLS_CERTDIR": "",
|
|
1904
1918
|
"KUBERNETES_CPU_LIMIT": "1",
|
|
1905
1919
|
"KUBERNETES_CPU_REQUEST": "0.5",
|
|
@@ -1962,12 +1976,11 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
1962
1976
|
"BUILD_INFO_CURRENT_VERSION": "3.2.1",
|
|
1963
1977
|
"BUILD_INFO_ID": "some-id",
|
|
1964
1978
|
"COMPONENT_NAME": "api",
|
|
1965
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
1966
|
-
"DOCKER_IMAGE": "$
|
|
1979
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
|
|
1980
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
1967
1981
|
"DOCKER_IMAGE_NAME": "prod/api",
|
|
1968
1982
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
1969
1983
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
1970
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
1971
1984
|
"ENV_SHORT": "prod",
|
|
1972
1985
|
"ENV_TYPE": "prod",
|
|
1973
1986
|
"HELM_ARGS": "",
|
|
@@ -2082,12 +2095,11 @@ cloudsql:
|
|
|
2082
2095
|
"BUILD_INFO_CURRENT_VERSION": "3.2.1",
|
|
2083
2096
|
"BUILD_INFO_ID": "some-id",
|
|
2084
2097
|
"COMPONENT_NAME": "api",
|
|
2085
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
2086
|
-
"DOCKER_IMAGE": "$
|
|
2098
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
|
|
2099
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
2087
2100
|
"DOCKER_IMAGE_NAME": "stage/api",
|
|
2088
2101
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
2089
2102
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
2090
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
2091
2103
|
"ENV_SHORT": "stage",
|
|
2092
2104
|
"ENV_TYPE": "stage",
|
|
2093
2105
|
"HELM_ARGS": "",
|
|
@@ -259,12 +259,17 @@ cloudsql:
|
|
|
259
259
|
},
|
|
260
260
|
"script": [
|
|
261
261
|
"ensureNodeDockerfile",
|
|
262
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
|
|
262
263
|
"docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
|
|
263
|
-
"
|
|
264
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
|
|
265
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
|
|
264
266
|
"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",
|
|
267
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
|
|
268
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
|
|
265
269
|
"docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
|
|
266
270
|
"docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
|
|
267
271
|
"docker push $DOCKER_CACHE_IMAGE",
|
|
272
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
|
|
268
273
|
],
|
|
269
274
|
"services": [
|
|
270
275
|
{
|
|
@@ -280,7 +285,7 @@ cloudsql:
|
|
|
280
285
|
"DOCKERFILE_ADDITIONS": undefined,
|
|
281
286
|
"DOCKERFILE_ADDITIONS_END": undefined,
|
|
282
287
|
"DOCKER_BUILDKIT": "1",
|
|
283
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
288
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
|
|
284
289
|
"DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
|
|
285
290
|
RUN yarn plugin import workspace-tools
|
|
286
291
|
RUN yarn workspaces focus --production && yarn rebuild",
|
|
@@ -291,11 +296,10 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
291
296
|
"DOCKER_DIR": ".",
|
|
292
297
|
"DOCKER_DRIVER": "overlay2",
|
|
293
298
|
"DOCKER_HOST": "tcp://0.0.0.0:2375",
|
|
294
|
-
"DOCKER_IMAGE": "$
|
|
299
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
295
300
|
"DOCKER_IMAGE_NAME": "dev/api",
|
|
296
301
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
297
302
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
298
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
299
303
|
"DOCKER_TLS_CERTDIR": "",
|
|
300
304
|
"KUBERNETES_CPU_LIMIT": "1",
|
|
301
305
|
"KUBERNETES_CPU_REQUEST": "0.5",
|
|
@@ -370,12 +374,11 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
370
374
|
"BUILD_INFO_CURRENT_VERSION": "3.2.1",
|
|
371
375
|
"BUILD_INFO_ID": "some-id",
|
|
372
376
|
"COMPONENT_NAME": "api",
|
|
373
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
374
|
-
"DOCKER_IMAGE": "$
|
|
377
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
|
|
378
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
375
379
|
"DOCKER_IMAGE_NAME": "dev/api",
|
|
376
380
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
377
381
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
378
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
379
382
|
"ENV_SHORT": "dev",
|
|
380
383
|
"ENV_TYPE": "dev",
|
|
381
384
|
"HELM_ARGS": "",
|
|
@@ -963,12 +966,17 @@ cloudsql:
|
|
|
963
966
|
},
|
|
964
967
|
"script": [
|
|
965
968
|
"ensureNodeDockerfile",
|
|
969
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
|
|
966
970
|
"docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
|
|
967
|
-
"
|
|
971
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
|
|
972
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
|
|
968
973
|
"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",
|
|
974
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
|
|
975
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
|
|
969
976
|
"docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
|
|
970
977
|
"docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
|
|
971
978
|
"docker push $DOCKER_CACHE_IMAGE",
|
|
979
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
|
|
972
980
|
],
|
|
973
981
|
"services": [
|
|
974
982
|
{
|
|
@@ -984,7 +992,7 @@ cloudsql:
|
|
|
984
992
|
"DOCKERFILE_ADDITIONS": undefined,
|
|
985
993
|
"DOCKERFILE_ADDITIONS_END": undefined,
|
|
986
994
|
"DOCKER_BUILDKIT": "1",
|
|
987
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
995
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
|
|
988
996
|
"DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
|
|
989
997
|
RUN yarn plugin import workspace-tools
|
|
990
998
|
RUN yarn workspaces focus --production && yarn rebuild",
|
|
@@ -995,11 +1003,10 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
995
1003
|
"DOCKER_DIR": ".",
|
|
996
1004
|
"DOCKER_DRIVER": "overlay2",
|
|
997
1005
|
"DOCKER_HOST": "tcp://0.0.0.0:2375",
|
|
998
|
-
"DOCKER_IMAGE": "$
|
|
1006
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
999
1007
|
"DOCKER_IMAGE_NAME": "review/api",
|
|
1000
1008
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
1001
1009
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
1002
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
1003
1010
|
"DOCKER_TLS_CERTDIR": "",
|
|
1004
1011
|
"KUBERNETES_CPU_LIMIT": "1",
|
|
1005
1012
|
"KUBERNETES_CPU_REQUEST": "0.5",
|
|
@@ -1074,12 +1081,11 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
1074
1081
|
"BUILD_INFO_CURRENT_VERSION": "3.2.1",
|
|
1075
1082
|
"BUILD_INFO_ID": "some-id",
|
|
1076
1083
|
"COMPONENT_NAME": "api",
|
|
1077
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
1078
|
-
"DOCKER_IMAGE": "$
|
|
1084
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
|
|
1085
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
1079
1086
|
"DOCKER_IMAGE_NAME": "review/api",
|
|
1080
1087
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
1081
1088
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
1082
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
1083
1089
|
"ENV_SHORT": "review",
|
|
1084
1090
|
"ENV_TYPE": "review",
|
|
1085
1091
|
"HELM_ARGS": "",
|
|
@@ -1803,12 +1809,17 @@ cloudsql:
|
|
|
1803
1809
|
},
|
|
1804
1810
|
"script": [
|
|
1805
1811
|
"ensureNodeDockerfile",
|
|
1812
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
|
|
1806
1813
|
"docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
|
|
1807
|
-
"
|
|
1814
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
|
|
1815
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
|
|
1808
1816
|
"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",
|
|
1817
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
|
|
1818
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
|
|
1809
1819
|
"docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
|
|
1810
1820
|
"docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
|
|
1811
1821
|
"docker push $DOCKER_CACHE_IMAGE",
|
|
1822
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
|
|
1812
1823
|
],
|
|
1813
1824
|
"services": [
|
|
1814
1825
|
{
|
|
@@ -1824,7 +1835,7 @@ cloudsql:
|
|
|
1824
1835
|
"DOCKERFILE_ADDITIONS": undefined,
|
|
1825
1836
|
"DOCKERFILE_ADDITIONS_END": undefined,
|
|
1826
1837
|
"DOCKER_BUILDKIT": "1",
|
|
1827
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
1838
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
|
|
1828
1839
|
"DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
|
|
1829
1840
|
RUN yarn plugin import workspace-tools
|
|
1830
1841
|
RUN yarn workspaces focus --production && yarn rebuild",
|
|
@@ -1835,11 +1846,10 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
1835
1846
|
"DOCKER_DIR": ".",
|
|
1836
1847
|
"DOCKER_DRIVER": "overlay2",
|
|
1837
1848
|
"DOCKER_HOST": "tcp://0.0.0.0:2375",
|
|
1838
|
-
"DOCKER_IMAGE": "$
|
|
1849
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
1839
1850
|
"DOCKER_IMAGE_NAME": "prod/api",
|
|
1840
1851
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
1841
1852
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
1842
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
1843
1853
|
"DOCKER_TLS_CERTDIR": "",
|
|
1844
1854
|
"KUBERNETES_CPU_LIMIT": "1",
|
|
1845
1855
|
"KUBERNETES_CPU_REQUEST": "0.5",
|
|
@@ -1871,12 +1881,17 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
1871
1881
|
},
|
|
1872
1882
|
"script": [
|
|
1873
1883
|
"ensureNodeDockerfile",
|
|
1884
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
|
|
1874
1885
|
"docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
|
|
1875
|
-
"
|
|
1886
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
|
|
1887
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
|
|
1876
1888
|
"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",
|
|
1889
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
|
|
1890
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
|
|
1877
1891
|
"docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
|
|
1878
1892
|
"docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
|
|
1879
1893
|
"docker push $DOCKER_CACHE_IMAGE",
|
|
1894
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
|
|
1880
1895
|
],
|
|
1881
1896
|
"services": [
|
|
1882
1897
|
{
|
|
@@ -1892,7 +1907,7 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
1892
1907
|
"DOCKERFILE_ADDITIONS": undefined,
|
|
1893
1908
|
"DOCKERFILE_ADDITIONS_END": undefined,
|
|
1894
1909
|
"DOCKER_BUILDKIT": "1",
|
|
1895
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
1910
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
|
|
1896
1911
|
"DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
|
|
1897
1912
|
RUN yarn plugin import workspace-tools
|
|
1898
1913
|
RUN yarn workspaces focus --production && yarn rebuild",
|
|
@@ -1903,11 +1918,10 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
1903
1918
|
"DOCKER_DIR": ".",
|
|
1904
1919
|
"DOCKER_DRIVER": "overlay2",
|
|
1905
1920
|
"DOCKER_HOST": "tcp://0.0.0.0:2375",
|
|
1906
|
-
"DOCKER_IMAGE": "$
|
|
1921
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
1907
1922
|
"DOCKER_IMAGE_NAME": "stage/api",
|
|
1908
1923
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
1909
1924
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
1910
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
1911
1925
|
"DOCKER_TLS_CERTDIR": "",
|
|
1912
1926
|
"KUBERNETES_CPU_LIMIT": "1",
|
|
1913
1927
|
"KUBERNETES_CPU_REQUEST": "0.5",
|
|
@@ -1970,12 +1984,11 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
1970
1984
|
"BUILD_INFO_CURRENT_VERSION": "3.2.1",
|
|
1971
1985
|
"BUILD_INFO_ID": "some-id",
|
|
1972
1986
|
"COMPONENT_NAME": "api",
|
|
1973
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
1974
|
-
"DOCKER_IMAGE": "$
|
|
1987
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
|
|
1988
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
1975
1989
|
"DOCKER_IMAGE_NAME": "prod/api",
|
|
1976
1990
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
1977
1991
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
1978
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
1979
1992
|
"ENV_SHORT": "prod",
|
|
1980
1993
|
"ENV_TYPE": "prod",
|
|
1981
1994
|
"HELM_ARGS": "",
|
|
@@ -2091,12 +2104,11 @@ cloudsql:
|
|
|
2091
2104
|
"BUILD_INFO_CURRENT_VERSION": "3.2.1",
|
|
2092
2105
|
"BUILD_INFO_ID": "some-id",
|
|
2093
2106
|
"COMPONENT_NAME": "api",
|
|
2094
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
2095
|
-
"DOCKER_IMAGE": "$
|
|
2107
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
|
|
2108
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
2096
2109
|
"DOCKER_IMAGE_NAME": "stage/api",
|
|
2097
2110
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
2098
2111
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
2099
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
2100
2112
|
"ENV_SHORT": "stage",
|
|
2101
2113
|
"ENV_TYPE": "stage",
|
|
2102
2114
|
"HELM_ARGS": "",
|