@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
|
@@ -155,12 +155,17 @@ exports[`matches snapshot 1`] = `
|
|
|
155
155
|
},
|
|
156
156
|
"script": [
|
|
157
157
|
"ensureNodeDockerfile",
|
|
158
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
|
|
158
159
|
"docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
|
|
159
|
-
"
|
|
160
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
|
|
161
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
|
|
160
162
|
"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",
|
|
163
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
|
|
164
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
|
|
161
165
|
"docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
|
|
162
166
|
"docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
|
|
163
167
|
"docker push $DOCKER_CACHE_IMAGE",
|
|
168
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
|
|
164
169
|
],
|
|
165
170
|
"services": [
|
|
166
171
|
{
|
|
@@ -176,7 +181,7 @@ exports[`matches snapshot 1`] = `
|
|
|
176
181
|
"DOCKERFILE_ADDITIONS": undefined,
|
|
177
182
|
"DOCKERFILE_ADDITIONS_END": undefined,
|
|
178
183
|
"DOCKER_BUILDKIT": "1",
|
|
179
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
184
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/www",
|
|
180
185
|
"DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
|
|
181
186
|
RUN yarn plugin import workspace-tools
|
|
182
187
|
RUN yarn workspaces focus --production && yarn rebuild",
|
|
@@ -187,11 +192,10 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
187
192
|
"DOCKER_DIR": ".",
|
|
188
193
|
"DOCKER_DRIVER": "overlay2",
|
|
189
194
|
"DOCKER_HOST": "tcp://0.0.0.0:2375",
|
|
190
|
-
"DOCKER_IMAGE": "$
|
|
195
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
191
196
|
"DOCKER_IMAGE_NAME": "dev/www",
|
|
192
197
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
193
198
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
194
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
195
199
|
"DOCKER_TLS_CERTDIR": "",
|
|
196
200
|
"KUBERNETES_CPU_LIMIT": "1",
|
|
197
201
|
"KUBERNETES_CPU_REQUEST": "0.5",
|
|
@@ -261,19 +265,18 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
261
265
|
"BUILD_INFO_CURRENT_VERSION": "3.2.1",
|
|
262
266
|
"BUILD_INFO_ID": "some-id",
|
|
263
267
|
"DEPLOY_API_KEY": "$CL_dev_www_DEPLOY_API_KEY",
|
|
264
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
265
|
-
"DOCKER_IMAGE": "$
|
|
268
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/www",
|
|
269
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
266
270
|
"DOCKER_IMAGE_NAME": "dev/www",
|
|
267
271
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
268
272
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
269
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
270
273
|
"ENV_SHORT": "dev",
|
|
271
274
|
"ENV_TYPE": "dev",
|
|
272
275
|
"HOST": "unknown-host.example.com",
|
|
273
276
|
"KUBERNETES_CPU_LIMIT": "1",
|
|
274
|
-
"KUBERNETES_CPU_REQUEST": "
|
|
275
|
-
"KUBERNETES_MEMORY_LIMIT": "
|
|
276
|
-
"KUBERNETES_MEMORY_REQUEST": "
|
|
277
|
+
"KUBERNETES_CPU_REQUEST": "1",
|
|
278
|
+
"KUBERNETES_MEMORY_LIMIT": "2048Mi",
|
|
279
|
+
"KUBERNETES_MEMORY_REQUEST": "1024Mi",
|
|
277
280
|
"ROOT_URL": "https://unknown-host.example.com",
|
|
278
281
|
"_ALL_ENV_VAR_KEYS": "["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INFO_BUILD_TIME","BUILD_INFO_CURRENT_VERSION","HOST","ROOT_URL"]",
|
|
279
282
|
},
|
|
@@ -315,9 +318,9 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
315
318
|
"DEPLOY_API_KEY": "$CL_dev_www_DEPLOY_API_KEY",
|
|
316
319
|
"GIT_STRATEGY": "none",
|
|
317
320
|
"KUBERNETES_CPU_LIMIT": "1",
|
|
318
|
-
"KUBERNETES_CPU_REQUEST": "
|
|
319
|
-
"KUBERNETES_MEMORY_LIMIT": "
|
|
320
|
-
"KUBERNETES_MEMORY_REQUEST": "
|
|
321
|
+
"KUBERNETES_CPU_REQUEST": "1",
|
|
322
|
+
"KUBERNETES_MEMORY_LIMIT": "2048Mi",
|
|
323
|
+
"KUBERNETES_MEMORY_REQUEST": "1024Mi",
|
|
321
324
|
},
|
|
322
325
|
},
|
|
323
326
|
"www ๐ก audit": {
|
|
@@ -638,12 +641,17 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
638
641
|
},
|
|
639
642
|
"script": [
|
|
640
643
|
"ensureNodeDockerfile",
|
|
644
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
|
|
641
645
|
"docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
|
|
642
|
-
"
|
|
646
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
|
|
647
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
|
|
643
648
|
"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",
|
|
649
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
|
|
650
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
|
|
644
651
|
"docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
|
|
645
652
|
"docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
|
|
646
653
|
"docker push $DOCKER_CACHE_IMAGE",
|
|
654
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
|
|
647
655
|
],
|
|
648
656
|
"services": [
|
|
649
657
|
{
|
|
@@ -659,7 +667,7 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
659
667
|
"DOCKERFILE_ADDITIONS": undefined,
|
|
660
668
|
"DOCKERFILE_ADDITIONS_END": undefined,
|
|
661
669
|
"DOCKER_BUILDKIT": "1",
|
|
662
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
670
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/www",
|
|
663
671
|
"DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
|
|
664
672
|
RUN yarn plugin import workspace-tools
|
|
665
673
|
RUN yarn workspaces focus --production && yarn rebuild",
|
|
@@ -670,11 +678,10 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
670
678
|
"DOCKER_DIR": ".",
|
|
671
679
|
"DOCKER_DRIVER": "overlay2",
|
|
672
680
|
"DOCKER_HOST": "tcp://0.0.0.0:2375",
|
|
673
|
-
"DOCKER_IMAGE": "$
|
|
681
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
674
682
|
"DOCKER_IMAGE_NAME": "review/www",
|
|
675
683
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
676
684
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
677
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
678
685
|
"DOCKER_TLS_CERTDIR": "",
|
|
679
686
|
"KUBERNETES_CPU_LIMIT": "1",
|
|
680
687
|
"KUBERNETES_CPU_REQUEST": "0.5",
|
|
@@ -686,7 +693,7 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
686
693
|
"allow_failure": false,
|
|
687
694
|
"cache": [],
|
|
688
695
|
"environment": {
|
|
689
|
-
"auto_stop_in": "
|
|
696
|
+
"auto_stop_in": "1 week",
|
|
690
697
|
"name": "review/some-commit/www",
|
|
691
698
|
"on_stop": "www ๐ Stop โ ๏ธ | review ",
|
|
692
699
|
"url": "https://unknown-host.example.com",
|
|
@@ -744,19 +751,18 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
744
751
|
"BUILD_INFO_CURRENT_VERSION": "3.2.1",
|
|
745
752
|
"BUILD_INFO_ID": "some-id",
|
|
746
753
|
"DEPLOY_API_KEY": "$CL_review_www_DEPLOY_API_KEY",
|
|
747
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
748
|
-
"DOCKER_IMAGE": "$
|
|
754
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/www",
|
|
755
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
749
756
|
"DOCKER_IMAGE_NAME": "review/www",
|
|
750
757
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
751
758
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
752
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
753
759
|
"ENV_SHORT": "review",
|
|
754
760
|
"ENV_TYPE": "review",
|
|
755
761
|
"HOST": "unknown-host.example.com",
|
|
756
762
|
"KUBERNETES_CPU_LIMIT": "1",
|
|
757
|
-
"KUBERNETES_CPU_REQUEST": "
|
|
758
|
-
"KUBERNETES_MEMORY_LIMIT": "
|
|
759
|
-
"KUBERNETES_MEMORY_REQUEST": "
|
|
763
|
+
"KUBERNETES_CPU_REQUEST": "1",
|
|
764
|
+
"KUBERNETES_MEMORY_LIMIT": "2048Mi",
|
|
765
|
+
"KUBERNETES_MEMORY_REQUEST": "1024Mi",
|
|
760
766
|
"ROOT_URL": "https://unknown-host.example.com",
|
|
761
767
|
"_ALL_ENV_VAR_KEYS": "["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INFO_BUILD_TIME","BUILD_INFO_CURRENT_VERSION","HOST","ROOT_URL"]",
|
|
762
768
|
},
|
|
@@ -798,9 +804,9 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
798
804
|
"DEPLOY_API_KEY": "$CL_review_www_DEPLOY_API_KEY",
|
|
799
805
|
"GIT_STRATEGY": "none",
|
|
800
806
|
"KUBERNETES_CPU_LIMIT": "1",
|
|
801
|
-
"KUBERNETES_CPU_REQUEST": "
|
|
802
|
-
"KUBERNETES_MEMORY_LIMIT": "
|
|
803
|
-
"KUBERNETES_MEMORY_REQUEST": "
|
|
807
|
+
"KUBERNETES_CPU_REQUEST": "1",
|
|
808
|
+
"KUBERNETES_MEMORY_LIMIT": "2048Mi",
|
|
809
|
+
"KUBERNETES_MEMORY_REQUEST": "1024Mi",
|
|
804
810
|
},
|
|
805
811
|
},
|
|
806
812
|
"www ๐ก audit": {
|
|
@@ -1153,12 +1159,17 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
1153
1159
|
},
|
|
1154
1160
|
"script": [
|
|
1155
1161
|
"ensureNodeDockerfile",
|
|
1162
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
|
|
1156
1163
|
"docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
|
|
1157
|
-
"
|
|
1164
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
|
|
1165
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
|
|
1158
1166
|
"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",
|
|
1167
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
|
|
1168
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
|
|
1159
1169
|
"docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
|
|
1160
1170
|
"docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
|
|
1161
1171
|
"docker push $DOCKER_CACHE_IMAGE",
|
|
1172
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
|
|
1162
1173
|
],
|
|
1163
1174
|
"services": [
|
|
1164
1175
|
{
|
|
@@ -1174,7 +1185,7 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
1174
1185
|
"DOCKERFILE_ADDITIONS": undefined,
|
|
1175
1186
|
"DOCKERFILE_ADDITIONS_END": undefined,
|
|
1176
1187
|
"DOCKER_BUILDKIT": "1",
|
|
1177
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
1188
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/www",
|
|
1178
1189
|
"DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
|
|
1179
1190
|
RUN yarn plugin import workspace-tools
|
|
1180
1191
|
RUN yarn workspaces focus --production && yarn rebuild",
|
|
@@ -1185,11 +1196,10 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
1185
1196
|
"DOCKER_DIR": ".",
|
|
1186
1197
|
"DOCKER_DRIVER": "overlay2",
|
|
1187
1198
|
"DOCKER_HOST": "tcp://0.0.0.0:2375",
|
|
1188
|
-
"DOCKER_IMAGE": "$
|
|
1199
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
1189
1200
|
"DOCKER_IMAGE_NAME": "prod/www",
|
|
1190
1201
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
1191
1202
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
1192
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
1193
1203
|
"DOCKER_TLS_CERTDIR": "",
|
|
1194
1204
|
"KUBERNETES_CPU_LIMIT": "1",
|
|
1195
1205
|
"KUBERNETES_CPU_REQUEST": "0.5",
|
|
@@ -1221,12 +1231,17 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
1221
1231
|
},
|
|
1222
1232
|
"script": [
|
|
1223
1233
|
"ensureNodeDockerfile",
|
|
1234
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
|
|
1224
1235
|
"docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
|
|
1225
|
-
"
|
|
1236
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
|
|
1237
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
|
|
1226
1238
|
"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",
|
|
1239
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
|
|
1240
|
+
"echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
|
|
1227
1241
|
"docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
|
|
1228
1242
|
"docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
|
|
1229
1243
|
"docker push $DOCKER_CACHE_IMAGE",
|
|
1244
|
+
"echo -e "\\e[0Ksection_end:$(date +%s):docker-push\\r\\e[0K"",
|
|
1230
1245
|
],
|
|
1231
1246
|
"services": [
|
|
1232
1247
|
{
|
|
@@ -1242,7 +1257,7 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
1242
1257
|
"DOCKERFILE_ADDITIONS": undefined,
|
|
1243
1258
|
"DOCKERFILE_ADDITIONS_END": undefined,
|
|
1244
1259
|
"DOCKER_BUILDKIT": "1",
|
|
1245
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
1260
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/www",
|
|
1246
1261
|
"DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
|
|
1247
1262
|
RUN yarn plugin import workspace-tools
|
|
1248
1263
|
RUN yarn workspaces focus --production && yarn rebuild",
|
|
@@ -1253,11 +1268,10 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
1253
1268
|
"DOCKER_DIR": ".",
|
|
1254
1269
|
"DOCKER_DRIVER": "overlay2",
|
|
1255
1270
|
"DOCKER_HOST": "tcp://0.0.0.0:2375",
|
|
1256
|
-
"DOCKER_IMAGE": "$
|
|
1271
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
1257
1272
|
"DOCKER_IMAGE_NAME": "stage/www",
|
|
1258
1273
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
1259
1274
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
1260
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
1261
1275
|
"DOCKER_TLS_CERTDIR": "",
|
|
1262
1276
|
"KUBERNETES_CPU_LIMIT": "1",
|
|
1263
1277
|
"KUBERNETES_CPU_REQUEST": "0.5",
|
|
@@ -1315,19 +1329,18 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
1315
1329
|
"BUILD_INFO_CURRENT_VERSION": "3.2.1",
|
|
1316
1330
|
"BUILD_INFO_ID": "some-id",
|
|
1317
1331
|
"DEPLOY_API_KEY": "$CL_prod_www_DEPLOY_API_KEY",
|
|
1318
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
1319
|
-
"DOCKER_IMAGE": "$
|
|
1332
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/www",
|
|
1333
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
1320
1334
|
"DOCKER_IMAGE_NAME": "prod/www",
|
|
1321
1335
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
1322
1336
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
1323
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
1324
1337
|
"ENV_SHORT": "prod",
|
|
1325
1338
|
"ENV_TYPE": "prod",
|
|
1326
1339
|
"HOST": "unknown-host.example.com",
|
|
1327
1340
|
"KUBERNETES_CPU_LIMIT": "1",
|
|
1328
|
-
"KUBERNETES_CPU_REQUEST": "
|
|
1329
|
-
"KUBERNETES_MEMORY_LIMIT": "
|
|
1330
|
-
"KUBERNETES_MEMORY_REQUEST": "
|
|
1341
|
+
"KUBERNETES_CPU_REQUEST": "1",
|
|
1342
|
+
"KUBERNETES_MEMORY_LIMIT": "2048Mi",
|
|
1343
|
+
"KUBERNETES_MEMORY_REQUEST": "1024Mi",
|
|
1331
1344
|
"ROOT_URL": "https://unknown-host.example.com",
|
|
1332
1345
|
"_ALL_ENV_VAR_KEYS": "["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INFO_BUILD_TIME","BUILD_INFO_CURRENT_VERSION","HOST","ROOT_URL"]",
|
|
1333
1346
|
},
|
|
@@ -1382,19 +1395,18 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
1382
1395
|
"BUILD_INFO_CURRENT_VERSION": "3.2.1",
|
|
1383
1396
|
"BUILD_INFO_ID": "some-id",
|
|
1384
1397
|
"DEPLOY_API_KEY": "$CL_stage_www_DEPLOY_API_KEY",
|
|
1385
|
-
"DOCKER_CACHE_IMAGE": "$
|
|
1386
|
-
"DOCKER_IMAGE": "$
|
|
1398
|
+
"DOCKER_CACHE_IMAGE": "$CI_REGISTRY_IMAGE/caches/www",
|
|
1399
|
+
"DOCKER_IMAGE": "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
1387
1400
|
"DOCKER_IMAGE_NAME": "stage/www",
|
|
1388
1401
|
"DOCKER_IMAGE_TAG": "$CI_COMMIT_SHA",
|
|
1389
1402
|
"DOCKER_REGISTRY": "$CI_REGISTRY",
|
|
1390
|
-
"DOCKER_REGISTRY_IMAGE_PATH": "$CI_REGISTRY_IMAGE",
|
|
1391
1403
|
"ENV_SHORT": "stage",
|
|
1392
1404
|
"ENV_TYPE": "stage",
|
|
1393
1405
|
"HOST": "unknown-host.example.com",
|
|
1394
1406
|
"KUBERNETES_CPU_LIMIT": "1",
|
|
1395
|
-
"KUBERNETES_CPU_REQUEST": "
|
|
1396
|
-
"KUBERNETES_MEMORY_LIMIT": "
|
|
1397
|
-
"KUBERNETES_MEMORY_REQUEST": "
|
|
1407
|
+
"KUBERNETES_CPU_REQUEST": "1",
|
|
1408
|
+
"KUBERNETES_MEMORY_LIMIT": "2048Mi",
|
|
1409
|
+
"KUBERNETES_MEMORY_REQUEST": "1024Mi",
|
|
1398
1410
|
"ROOT_URL": "https://unknown-host.example.com",
|
|
1399
1411
|
"_ALL_ENV_VAR_KEYS": "["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INFO_BUILD_TIME","BUILD_INFO_CURRENT_VERSION","HOST","ROOT_URL"]",
|
|
1400
1412
|
},
|
|
@@ -1436,9 +1448,9 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
1436
1448
|
"DEPLOY_API_KEY": "$CL_prod_www_DEPLOY_API_KEY",
|
|
1437
1449
|
"GIT_STRATEGY": "none",
|
|
1438
1450
|
"KUBERNETES_CPU_LIMIT": "1",
|
|
1439
|
-
"KUBERNETES_CPU_REQUEST": "
|
|
1440
|
-
"KUBERNETES_MEMORY_LIMIT": "
|
|
1441
|
-
"KUBERNETES_MEMORY_REQUEST": "
|
|
1451
|
+
"KUBERNETES_CPU_REQUEST": "1",
|
|
1452
|
+
"KUBERNETES_MEMORY_LIMIT": "2048Mi",
|
|
1453
|
+
"KUBERNETES_MEMORY_REQUEST": "1024Mi",
|
|
1442
1454
|
},
|
|
1443
1455
|
},
|
|
1444
1456
|
"www ๐ Stop โ ๏ธ | stage ": {
|
|
@@ -1478,9 +1490,9 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
1478
1490
|
"DEPLOY_API_KEY": "$CL_stage_www_DEPLOY_API_KEY",
|
|
1479
1491
|
"GIT_STRATEGY": "none",
|
|
1480
1492
|
"KUBERNETES_CPU_LIMIT": "1",
|
|
1481
|
-
"KUBERNETES_CPU_REQUEST": "
|
|
1482
|
-
"KUBERNETES_MEMORY_LIMIT": "
|
|
1483
|
-
"KUBERNETES_MEMORY_REQUEST": "
|
|
1493
|
+
"KUBERNETES_CPU_REQUEST": "1",
|
|
1494
|
+
"KUBERNETES_MEMORY_LIMIT": "2048Mi",
|
|
1495
|
+
"KUBERNETES_MEMORY_REQUEST": "1024Mi",
|
|
1484
1496
|
},
|
|
1485
1497
|
},
|
|
1486
1498
|
"www ๐งพ sbom | prod ": {
|