@catladder/pipeline 0.0.0-update-docker-for-apps-e047cc44 → 0.0.0-update-node-b0c7282d
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 +146 -49
- package/dist/constants.js +1 -1
- package/dist/deploy/base/deploy.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 +14 -9
- package/dist/deploy/dockerTag/deployJob.js +32 -1
- package/dist/deploy/types/googleCloudRun.d.ts +10 -6
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/examples/__snapshots__/cloud-run-memory-limit.ts.snap +73 -77
- package/examples/__snapshots__/cloud-run-meteor-with-worker.ts.snap +1813 -0
- package/examples/__snapshots__/cloud-run-no-cpu-throttling.ts.snap +73 -77
- package/examples/__snapshots__/cloud-run-non-public.ts.snap +73 -77
- package/examples/__snapshots__/cloud-run-post-stop-job.ts.snap +1855 -0
- package/examples/__snapshots__/cloud-run-with-sql-reuse-db.ts.snap +146 -154
- package/examples/__snapshots__/cloud-run-with-sql.ts.snap +146 -154
- package/examples/__snapshots__/cloud-run-with-worker.ts.snap +1853 -0
- package/examples/__snapshots__/custom-build-job-with-tests.ts.snap +73 -77
- package/examples/__snapshots__/custom-build-job.ts.snap +73 -77
- package/examples/__snapshots__/custom-deploy.ts.snap +65 -53
- package/examples/__snapshots__/custom-sbom-java.ts.snap +73 -77
- package/examples/__snapshots__/kubernetes-application-customization.ts.snap +41 -29
- package/examples/__snapshots__/kubernetes-with-cloud-sql-legacy.ts.snap +41 -29
- package/examples/__snapshots__/kubernetes-with-cloud-sql.ts.snap +41 -29
- package/examples/__snapshots__/kubernetes-with-jobs.ts.snap +82 -58
- package/examples/__snapshots__/kubernetes-with-mongodb.ts.snap +41 -29
- package/examples/__snapshots__/meteor-kubernetes.ts.snap +41 -29
- package/examples/__snapshots__/native-app.ts.snap +73 -77
- package/examples/__snapshots__/node-build-with-custom-image.ts.snap +73 -77
- package/examples/__snapshots__/rails-k8s-with-worker.ts.snap +58 -54
- package/examples/cloud-run-meteor-with-worker.ts +35 -0
- package/examples/cloud-run-post-stop-job.ts +40 -0
- package/examples/cloud-run-with-worker.ts +35 -0
- package/examples/custom-deploy.ts +8 -0
- 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/base/deploy.ts +1 -1
- package/src/deploy/cloudRun/artifactsRegistry.ts +35 -32
- package/src/deploy/cloudRun/deployJob.ts +30 -15
- package/src/deploy/dockerTag/deployJob.ts +1 -1
- package/src/deploy/types/googleCloudRun.ts +11 -6
|
@@ -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
|
-
"
|
|
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
|
{
|
|
@@ -296,7 +301,7 @@ mongodb:
|
|
|
296
301
|
"DOCKERFILE_ADDITIONS": undefined,
|
|
297
302
|
"DOCKERFILE_ADDITIONS_END": undefined,
|
|
298
303
|
"DOCKER_BUILDKIT": "1",
|
|
299
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
304
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
|
|
300
305
|
"DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
|
|
301
306
|
RUN yarn plugin import workspace-tools
|
|
302
307
|
RUN yarn workspaces focus --production && yarn rebuild",
|
|
@@ -307,11 +312,10 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
307
312
|
"DOCKER_DIR": ".",
|
|
308
313
|
"DOCKER_DRIVER": "overlay2",
|
|
309
314
|
"DOCKER_HOST": "tcp://0.0.0.0:2375",
|
|
310
|
-
"DOCKER_IMAGE": "$
|
|
315
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
311
316
|
"DOCKER_IMAGE_NAME": "dev/api",
|
|
312
317
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
313
318
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
314
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
315
319
|
"DOCKER_TLS_CERTDIR": "",
|
|
316
320
|
"KUBERNETES_CPU_LIMIT": "1",
|
|
317
321
|
"KUBERNETES_CPU_REQUEST": "0.5",
|
|
@@ -386,12 +390,11 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
386
390
|
"BUILD_INFO_CURRENT_VERSION": "3.2.1",
|
|
387
391
|
"BUILD_INFO_ID": "some-id",
|
|
388
392
|
"COMPONENT_NAME": "api",
|
|
389
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
390
|
-
"DOCKER_IMAGE": "$
|
|
393
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
|
|
394
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
391
395
|
"DOCKER_IMAGE_NAME": "dev/api",
|
|
392
396
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
393
397
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
394
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
395
398
|
"ENV_SHORT": "dev",
|
|
396
399
|
"ENV_TYPE": "dev",
|
|
397
400
|
"HELM_ARGS": "",
|
|
@@ -1027,12 +1030,17 @@ mongodb:
|
|
|
1027
1030
|
},
|
|
1028
1031
|
"script": [
|
|
1029
1032
|
"ensureNodeDockerfile",
|
|
1033
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
|
|
1030
1034
|
"docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
|
|
1031
|
-
"
|
|
1035
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
|
|
1036
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
|
|
1032
1037
|
"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",
|
|
1038
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
|
|
1039
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
|
|
1033
1040
|
"docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
|
|
1034
1041
|
"docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
|
|
1035
1042
|
"docker push $DOCKER_CACHE_IMAGE",
|
|
1043
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
|
|
1036
1044
|
],
|
|
1037
1045
|
"services": [
|
|
1038
1046
|
{
|
|
@@ -1048,7 +1056,7 @@ mongodb:
|
|
|
1048
1056
|
"DOCKERFILE_ADDITIONS": undefined,
|
|
1049
1057
|
"DOCKERFILE_ADDITIONS_END": undefined,
|
|
1050
1058
|
"DOCKER_BUILDKIT": "1",
|
|
1051
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
1059
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
|
|
1052
1060
|
"DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
|
|
1053
1061
|
RUN yarn plugin import workspace-tools
|
|
1054
1062
|
RUN yarn workspaces focus --production && yarn rebuild",
|
|
@@ -1059,11 +1067,10 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
1059
1067
|
"DOCKER_DIR": ".",
|
|
1060
1068
|
"DOCKER_DRIVER": "overlay2",
|
|
1061
1069
|
"DOCKER_HOST": "tcp://0.0.0.0:2375",
|
|
1062
|
-
"DOCKER_IMAGE": "$
|
|
1070
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
1063
1071
|
"DOCKER_IMAGE_NAME": "review/api",
|
|
1064
1072
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
1065
1073
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
1066
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
1067
1074
|
"DOCKER_TLS_CERTDIR": "",
|
|
1068
1075
|
"KUBERNETES_CPU_LIMIT": "1",
|
|
1069
1076
|
"KUBERNETES_CPU_REQUEST": "0.5",
|
|
@@ -1074,7 +1081,7 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
1074
1081
|
"api 🚀 Deploy | review ": {
|
|
1075
1082
|
"allow_failure": false,
|
|
1076
1083
|
"environment": {
|
|
1077
|
-
"auto_stop_in": "
|
|
1084
|
+
"auto_stop_in": "1 week",
|
|
1078
1085
|
"name": "review/some-commit/api",
|
|
1079
1086
|
"on_stop": "api 🛑 Stop ⚠️ | review ",
|
|
1080
1087
|
"url": "https://api.mr1234.review.test-app.pan.panter.cloud",
|
|
@@ -1138,12 +1145,11 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
1138
1145
|
"BUILD_INFO_CURRENT_VERSION": "3.2.1",
|
|
1139
1146
|
"BUILD_INFO_ID": "some-id",
|
|
1140
1147
|
"COMPONENT_NAME": "api",
|
|
1141
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
1142
|
-
"DOCKER_IMAGE": "$
|
|
1148
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
|
|
1149
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
1143
1150
|
"DOCKER_IMAGE_NAME": "review/api",
|
|
1144
1151
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
1145
1152
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
1146
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
1147
1153
|
"ENV_SHORT": "review",
|
|
1148
1154
|
"ENV_TYPE": "review",
|
|
1149
1155
|
"HELM_ARGS": "",
|
|
@@ -1931,12 +1937,17 @@ mongodb:
|
|
|
1931
1937
|
},
|
|
1932
1938
|
"script": [
|
|
1933
1939
|
"ensureNodeDockerfile",
|
|
1940
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
|
|
1934
1941
|
"docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
|
|
1935
|
-
"
|
|
1942
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
|
|
1943
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
|
|
1936
1944
|
"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",
|
|
1945
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
|
|
1946
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
|
|
1937
1947
|
"docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
|
|
1938
1948
|
"docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
|
|
1939
1949
|
"docker push $DOCKER_CACHE_IMAGE",
|
|
1950
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
|
|
1940
1951
|
],
|
|
1941
1952
|
"services": [
|
|
1942
1953
|
{
|
|
@@ -1952,7 +1963,7 @@ mongodb:
|
|
|
1952
1963
|
"DOCKERFILE_ADDITIONS": undefined,
|
|
1953
1964
|
"DOCKERFILE_ADDITIONS_END": undefined,
|
|
1954
1965
|
"DOCKER_BUILDKIT": "1",
|
|
1955
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
1966
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
|
|
1956
1967
|
"DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
|
|
1957
1968
|
RUN yarn plugin import workspace-tools
|
|
1958
1969
|
RUN yarn workspaces focus --production && yarn rebuild",
|
|
@@ -1963,11 +1974,10 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
1963
1974
|
"DOCKER_DIR": ".",
|
|
1964
1975
|
"DOCKER_DRIVER": "overlay2",
|
|
1965
1976
|
"DOCKER_HOST": "tcp://0.0.0.0:2375",
|
|
1966
|
-
"DOCKER_IMAGE": "$
|
|
1977
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
1967
1978
|
"DOCKER_IMAGE_NAME": "prod/api",
|
|
1968
1979
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
1969
1980
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
1970
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
1971
1981
|
"DOCKER_TLS_CERTDIR": "",
|
|
1972
1982
|
"KUBERNETES_CPU_LIMIT": "1",
|
|
1973
1983
|
"KUBERNETES_CPU_REQUEST": "0.5",
|
|
@@ -1999,12 +2009,17 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
1999
2009
|
},
|
|
2000
2010
|
"script": [
|
|
2001
2011
|
"ensureNodeDockerfile",
|
|
2012
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
|
|
2002
2013
|
"docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
|
|
2003
|
-
"
|
|
2014
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
|
|
2015
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
|
|
2004
2016
|
"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",
|
|
2017
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
|
|
2018
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
|
|
2005
2019
|
"docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
|
|
2006
2020
|
"docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
|
|
2007
2021
|
"docker push $DOCKER_CACHE_IMAGE",
|
|
2022
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
|
|
2008
2023
|
],
|
|
2009
2024
|
"services": [
|
|
2010
2025
|
{
|
|
@@ -2020,7 +2035,7 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
2020
2035
|
"DOCKERFILE_ADDITIONS": undefined,
|
|
2021
2036
|
"DOCKERFILE_ADDITIONS_END": undefined,
|
|
2022
2037
|
"DOCKER_BUILDKIT": "1",
|
|
2023
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
2038
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
|
|
2024
2039
|
"DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
|
|
2025
2040
|
RUN yarn plugin import workspace-tools
|
|
2026
2041
|
RUN yarn workspaces focus --production && yarn rebuild",
|
|
@@ -2031,11 +2046,10 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
2031
2046
|
"DOCKER_DIR": ".",
|
|
2032
2047
|
"DOCKER_DRIVER": "overlay2",
|
|
2033
2048
|
"DOCKER_HOST": "tcp://0.0.0.0:2375",
|
|
2034
|
-
"DOCKER_IMAGE": "$
|
|
2049
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
2035
2050
|
"DOCKER_IMAGE_NAME": "stage/api",
|
|
2036
2051
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
2037
2052
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
2038
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
2039
2053
|
"DOCKER_TLS_CERTDIR": "",
|
|
2040
2054
|
"KUBERNETES_CPU_LIMIT": "1",
|
|
2041
2055
|
"KUBERNETES_CPU_REQUEST": "0.5",
|
|
@@ -2098,12 +2112,11 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
2098
2112
|
"BUILD_INFO_CURRENT_VERSION": "3.2.1",
|
|
2099
2113
|
"BUILD_INFO_ID": "some-id",
|
|
2100
2114
|
"COMPONENT_NAME": "api",
|
|
2101
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
2102
|
-
"DOCKER_IMAGE": "$
|
|
2115
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
|
|
2116
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
2103
2117
|
"DOCKER_IMAGE_NAME": "prod/api",
|
|
2104
2118
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
2105
2119
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
2106
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
2107
2120
|
"ENV_SHORT": "prod",
|
|
2108
2121
|
"ENV_TYPE": "prod",
|
|
2109
2122
|
"HELM_ARGS": "",
|
|
@@ -2235,12 +2248,11 @@ mongodb:
|
|
|
2235
2248
|
"BUILD_INFO_CURRENT_VERSION": "3.2.1",
|
|
2236
2249
|
"BUILD_INFO_ID": "some-id",
|
|
2237
2250
|
"COMPONENT_NAME": "api",
|
|
2238
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
2239
|
-
"DOCKER_IMAGE": "$
|
|
2251
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/api",
|
|
2252
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
2240
2253
|
"DOCKER_IMAGE_NAME": "stage/api",
|
|
2241
2254
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
2242
2255
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
2243
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
2244
2256
|
"ENV_SHORT": "stage",
|
|
2245
2257
|
"ENV_TYPE": "stage",
|
|
2246
2258
|
"HELM_ARGS": "",
|
|
@@ -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
|
-
"
|
|
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
|
{
|
|
@@ -285,15 +290,14 @@ mongodb:
|
|
|
285
290
|
"DOCKERFILE_ADDITIONS": undefined,
|
|
286
291
|
"DOCKERFILE_ADDITIONS_END": undefined,
|
|
287
292
|
"DOCKER_BUILDKIT": "1",
|
|
288
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
293
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/web",
|
|
289
294
|
"DOCKER_DIR": ".",
|
|
290
295
|
"DOCKER_DRIVER": "overlay2",
|
|
291
296
|
"DOCKER_HOST": "tcp://0.0.0.0:2375",
|
|
292
|
-
"DOCKER_IMAGE": "$
|
|
297
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
293
298
|
"DOCKER_IMAGE_NAME": "dev/web",
|
|
294
299
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
295
300
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
296
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
297
301
|
"DOCKER_TLS_CERTDIR": "",
|
|
298
302
|
"KUBERNETES_CPU_LIMIT": "1",
|
|
299
303
|
"KUBERNETES_CPU_REQUEST": "0.5",
|
|
@@ -369,12 +373,11 @@ mongodb:
|
|
|
369
373
|
"BUILD_INFO_CURRENT_VERSION": "3.2.1",
|
|
370
374
|
"BUILD_INFO_ID": "some-id",
|
|
371
375
|
"COMPONENT_NAME": "web",
|
|
372
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
373
|
-
"DOCKER_IMAGE": "$
|
|
376
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/web",
|
|
377
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
374
378
|
"DOCKER_IMAGE_NAME": "dev/web",
|
|
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": "",
|
|
@@ -987,12 +990,17 @@ mongodb:
|
|
|
987
990
|
},
|
|
988
991
|
"script": [
|
|
989
992
|
"ensureMeteorDockerfile",
|
|
993
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
|
|
990
994
|
"docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
|
|
991
|
-
"
|
|
995
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
|
|
996
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
|
|
992
997
|
"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",
|
|
998
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
|
|
999
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
|
|
993
1000
|
"docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
|
|
994
1001
|
"docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
|
|
995
1002
|
"docker push $DOCKER_CACHE_IMAGE",
|
|
1003
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
|
|
996
1004
|
],
|
|
997
1005
|
"services": [
|
|
998
1006
|
{
|
|
@@ -1008,15 +1016,14 @@ mongodb:
|
|
|
1008
1016
|
"DOCKERFILE_ADDITIONS": undefined,
|
|
1009
1017
|
"DOCKERFILE_ADDITIONS_END": undefined,
|
|
1010
1018
|
"DOCKER_BUILDKIT": "1",
|
|
1011
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
1019
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/web",
|
|
1012
1020
|
"DOCKER_DIR": ".",
|
|
1013
1021
|
"DOCKER_DRIVER": "overlay2",
|
|
1014
1022
|
"DOCKER_HOST": "tcp://0.0.0.0:2375",
|
|
1015
|
-
"DOCKER_IMAGE": "$
|
|
1023
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
1016
1024
|
"DOCKER_IMAGE_NAME": "review/web",
|
|
1017
1025
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
1018
1026
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
1019
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
1020
1027
|
"DOCKER_TLS_CERTDIR": "",
|
|
1021
1028
|
"KUBERNETES_CPU_LIMIT": "1",
|
|
1022
1029
|
"KUBERNETES_CPU_REQUEST": "0.5",
|
|
@@ -1028,7 +1035,7 @@ mongodb:
|
|
|
1028
1035
|
"web 🚀 Deploy | review ": {
|
|
1029
1036
|
"allow_failure": false,
|
|
1030
1037
|
"environment": {
|
|
1031
|
-
"auto_stop_in": "
|
|
1038
|
+
"auto_stop_in": "1 week",
|
|
1032
1039
|
"name": "review/some-commit/web",
|
|
1033
1040
|
"on_stop": "web 🛑 Stop ⚠️ | review ",
|
|
1034
1041
|
"url": "https://web.mr1234.review.my-app.pan.panter.cloud",
|
|
@@ -1092,12 +1099,11 @@ mongodb:
|
|
|
1092
1099
|
"BUILD_INFO_CURRENT_VERSION": "3.2.1",
|
|
1093
1100
|
"BUILD_INFO_ID": "some-id",
|
|
1094
1101
|
"COMPONENT_NAME": "web",
|
|
1095
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
1096
|
-
"DOCKER_IMAGE": "$
|
|
1102
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/web",
|
|
1103
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
1097
1104
|
"DOCKER_IMAGE_NAME": "review/web",
|
|
1098
1105
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
1099
1106
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
1100
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
1101
1107
|
"ENV_SHORT": "review",
|
|
1102
1108
|
"ENV_TYPE": "review",
|
|
1103
1109
|
"HELM_ARGS": "",
|
|
@@ -1873,12 +1879,17 @@ mongodb:
|
|
|
1873
1879
|
},
|
|
1874
1880
|
"script": [
|
|
1875
1881
|
"ensureMeteorDockerfile",
|
|
1882
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
|
|
1876
1883
|
"docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
|
|
1877
|
-
"
|
|
1884
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
|
|
1885
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
|
|
1878
1886
|
"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",
|
|
1887
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
|
|
1888
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
|
|
1879
1889
|
"docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
|
|
1880
1890
|
"docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
|
|
1881
1891
|
"docker push $DOCKER_CACHE_IMAGE",
|
|
1892
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
|
|
1882
1893
|
],
|
|
1883
1894
|
"services": [
|
|
1884
1895
|
{
|
|
@@ -1894,15 +1905,14 @@ mongodb:
|
|
|
1894
1905
|
"DOCKERFILE_ADDITIONS": undefined,
|
|
1895
1906
|
"DOCKERFILE_ADDITIONS_END": undefined,
|
|
1896
1907
|
"DOCKER_BUILDKIT": "1",
|
|
1897
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
1908
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/web",
|
|
1898
1909
|
"DOCKER_DIR": ".",
|
|
1899
1910
|
"DOCKER_DRIVER": "overlay2",
|
|
1900
1911
|
"DOCKER_HOST": "tcp://0.0.0.0:2375",
|
|
1901
|
-
"DOCKER_IMAGE": "$
|
|
1912
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
1902
1913
|
"DOCKER_IMAGE_NAME": "prod/web",
|
|
1903
1914
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
1904
1915
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
1905
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
1906
1916
|
"DOCKER_TLS_CERTDIR": "",
|
|
1907
1917
|
"KUBERNETES_CPU_LIMIT": "1",
|
|
1908
1918
|
"KUBERNETES_CPU_REQUEST": "0.5",
|
|
@@ -1926,12 +1936,17 @@ mongodb:
|
|
|
1926
1936
|
},
|
|
1927
1937
|
"script": [
|
|
1928
1938
|
"ensureMeteorDockerfile",
|
|
1939
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
|
|
1929
1940
|
"docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
|
|
1930
|
-
"
|
|
1941
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
|
|
1942
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
|
|
1931
1943
|
"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",
|
|
1944
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
|
|
1945
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
|
|
1932
1946
|
"docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
|
|
1933
1947
|
"docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
|
|
1934
1948
|
"docker push $DOCKER_CACHE_IMAGE",
|
|
1949
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
|
|
1935
1950
|
],
|
|
1936
1951
|
"services": [
|
|
1937
1952
|
{
|
|
@@ -1947,15 +1962,14 @@ mongodb:
|
|
|
1947
1962
|
"DOCKERFILE_ADDITIONS": undefined,
|
|
1948
1963
|
"DOCKERFILE_ADDITIONS_END": undefined,
|
|
1949
1964
|
"DOCKER_BUILDKIT": "1",
|
|
1950
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
1965
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/web",
|
|
1951
1966
|
"DOCKER_DIR": ".",
|
|
1952
1967
|
"DOCKER_DRIVER": "overlay2",
|
|
1953
1968
|
"DOCKER_HOST": "tcp://0.0.0.0:2375",
|
|
1954
|
-
"DOCKER_IMAGE": "$
|
|
1969
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
1955
1970
|
"DOCKER_IMAGE_NAME": "stage/web",
|
|
1956
1971
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
1957
1972
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
1958
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
1959
1973
|
"DOCKER_TLS_CERTDIR": "",
|
|
1960
1974
|
"KUBERNETES_CPU_LIMIT": "1",
|
|
1961
1975
|
"KUBERNETES_CPU_REQUEST": "0.5",
|
|
@@ -2019,12 +2033,11 @@ mongodb:
|
|
|
2019
2033
|
"BUILD_INFO_CURRENT_VERSION": "3.2.1",
|
|
2020
2034
|
"BUILD_INFO_ID": "some-id",
|
|
2021
2035
|
"COMPONENT_NAME": "web",
|
|
2022
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
2023
|
-
"DOCKER_IMAGE": "$
|
|
2036
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/web",
|
|
2037
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
2024
2038
|
"DOCKER_IMAGE_NAME": "prod/web",
|
|
2025
2039
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
2026
2040
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
2027
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
2028
2041
|
"ENV_SHORT": "prod",
|
|
2029
2042
|
"ENV_TYPE": "prod",
|
|
2030
2043
|
"HELM_ARGS": "",
|
|
@@ -2162,12 +2175,11 @@ mongodb:
|
|
|
2162
2175
|
"BUILD_INFO_CURRENT_VERSION": "3.2.1",
|
|
2163
2176
|
"BUILD_INFO_ID": "some-id",
|
|
2164
2177
|
"COMPONENT_NAME": "web",
|
|
2165
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
2166
|
-
"DOCKER_IMAGE": "$
|
|
2178
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/web",
|
|
2179
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
2167
2180
|
"DOCKER_IMAGE_NAME": "stage/web",
|
|
2168
2181
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
2169
2182
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
2170
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
2171
2183
|
"ENV_SHORT": "stage",
|
|
2172
2184
|
"ENV_TYPE": "stage",
|
|
2173
2185
|
"HELM_ARGS": "",
|