@catladder/pipeline 1.133.5 → 1.133.7
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/bundles/catladder-gitlab/index.js +1 -1
- package/dist/constants.js +1 -1
- package/dist/deploy/cloudRun/utils/gcloudServiceAccountLoginCommands.js +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/examples/__snapshots__/cloud-run-memory-limit.ts.snap +12 -36
- package/examples/__snapshots__/cloud-run-meteor-with-worker.ts.snap +12 -36
- package/examples/__snapshots__/cloud-run-no-cpu-throttling.ts.snap +12 -36
- package/examples/__snapshots__/cloud-run-non-public.ts.snap +12 -36
- package/examples/__snapshots__/cloud-run-post-stop-job.ts.snap +12 -36
- package/examples/__snapshots__/cloud-run-with-sql-reuse-db.ts.snap +24 -72
- package/examples/__snapshots__/cloud-run-with-sql.ts.snap +24 -72
- package/examples/__snapshots__/cloud-run-with-worker.ts.snap +12 -36
- package/examples/__snapshots__/custom-build-job-with-tests.ts.snap +12 -36
- package/examples/__snapshots__/custom-build-job.ts.snap +12 -36
- package/examples/__snapshots__/custom-sbom-java.ts.snap +12 -36
- package/examples/__snapshots__/native-app.ts.snap +12 -36
- package/examples/__snapshots__/node-build-with-custom-image.ts.snap +12 -36
- package/package.json +1 -1
- package/src/deploy/cloudRun/utils/gcloudServiceAccountLoginCommands.ts +6 -10
|
@@ -163,9 +163,7 @@ exports[`matches snapshot 1`] = `
|
|
|
163
163
|
"script": [
|
|
164
164
|
"ensureNodeDockerfile",
|
|
165
165
|
"echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
|
|
166
|
-
"echo $CL_dev_api_GCLOUD_DEPLOY_credentialsKey
|
|
167
|
-
",
|
|
168
|
-
"gcloud auth activate-service-account --key-file="./____keyfile.json"",
|
|
166
|
+
"gcloud auth activate-service-account --key-file=<(echo "$CL_dev_api_GCLOUD_DEPLOY_credentialsKey")",
|
|
169
167
|
"gcloud auth configure-docker asia-east1-docker.pkg.dev",
|
|
170
168
|
"echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
|
|
171
169
|
"echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
|
|
@@ -266,9 +264,7 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
266
264
|
],
|
|
267
265
|
"script": [
|
|
268
266
|
"echo -e "\\e[0Ksection_start:$(date +%s):prepare[collapsed=true]\\r\\e[0KPrepare..."",
|
|
269
|
-
"echo $CL_dev_api_GCLOUD_DEPLOY_credentialsKey
|
|
270
|
-
",
|
|
271
|
-
"gcloud auth activate-service-account --key-file="./____keyfile.json"",
|
|
267
|
+
"gcloud auth activate-service-account --key-file=<(echo "$CL_dev_api_GCLOUD_DEPLOY_credentialsKey")",
|
|
272
268
|
"export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe asdf --format="value(projectNumber)")",
|
|
273
269
|
"echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
|
|
274
270
|
"echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
|
|
@@ -365,9 +361,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
|
|
|
365
361
|
],
|
|
366
362
|
"script": [
|
|
367
363
|
"set +e",
|
|
368
|
-
"echo $CL_dev_api_GCLOUD_DEPLOY_credentialsKey
|
|
369
|
-
",
|
|
370
|
-
"gcloud auth activate-service-account --key-file="./____keyfile.json"",
|
|
364
|
+
"gcloud auth activate-service-account --key-file=<(echo "$CL_dev_api_GCLOUD_DEPLOY_credentialsKey")",
|
|
371
365
|
"gcloud run services delete pan-test-app-dev-api --project=asdf --region=asia-east1",
|
|
372
366
|
"gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/api --quiet --delete-tags",
|
|
373
367
|
"gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/api --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/api@$version --quiet --delete-tags; done",
|
|
@@ -1075,9 +1069,7 @@ EOF",
|
|
|
1075
1069
|
"script": [
|
|
1076
1070
|
"ensureNodeDockerfile",
|
|
1077
1071
|
"echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
|
|
1078
|
-
"echo $CL_review_api_GCLOUD_DEPLOY_credentialsKey
|
|
1079
|
-
",
|
|
1080
|
-
"gcloud auth activate-service-account --key-file="./____keyfile.json"",
|
|
1072
|
+
"gcloud auth activate-service-account --key-file=<(echo "$CL_review_api_GCLOUD_DEPLOY_credentialsKey")",
|
|
1081
1073
|
"gcloud auth configure-docker asia-east1-docker.pkg.dev",
|
|
1082
1074
|
"echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
|
|
1083
1075
|
"echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
|
|
@@ -1178,9 +1170,7 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
1178
1170
|
],
|
|
1179
1171
|
"script": [
|
|
1180
1172
|
"echo -e "\\e[0Ksection_start:$(date +%s):prepare[collapsed=true]\\r\\e[0KPrepare..."",
|
|
1181
|
-
"echo $CL_review_api_GCLOUD_DEPLOY_credentialsKey
|
|
1182
|
-
",
|
|
1183
|
-
"gcloud auth activate-service-account --key-file="./____keyfile.json"",
|
|
1173
|
+
"gcloud auth activate-service-account --key-file=<(echo "$CL_review_api_GCLOUD_DEPLOY_credentialsKey")",
|
|
1184
1174
|
"export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe asdf --format="value(projectNumber)")",
|
|
1185
1175
|
"echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
|
|
1186
1176
|
"echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
|
|
@@ -1280,9 +1270,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
|
|
|
1280
1270
|
],
|
|
1281
1271
|
"script": [
|
|
1282
1272
|
"set +e",
|
|
1283
|
-
"echo $CL_review_api_GCLOUD_DEPLOY_credentialsKey
|
|
1284
|
-
",
|
|
1285
|
-
"gcloud auth activate-service-account --key-file="./____keyfile.json"",
|
|
1273
|
+
"gcloud auth activate-service-account --key-file=<(echo "$CL_review_api_GCLOUD_DEPLOY_credentialsKey")",
|
|
1286
1274
|
"gcloud run services delete pan-test-app-review-mr1234-api --project=asdf --region=asia-east1",
|
|
1287
1275
|
"gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/api/mr1234 --quiet --delete-tags",
|
|
1288
1276
|
"gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/api --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/api@$version --quiet --delete-tags; done",
|
|
@@ -2026,9 +2014,7 @@ EOF",
|
|
|
2026
2014
|
"script": [
|
|
2027
2015
|
"ensureNodeDockerfile",
|
|
2028
2016
|
"echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
|
|
2029
|
-
"echo $CL_prod_api_GCLOUD_DEPLOY_credentialsKey
|
|
2030
|
-
",
|
|
2031
|
-
"gcloud auth activate-service-account --key-file="./____keyfile.json"",
|
|
2017
|
+
"gcloud auth activate-service-account --key-file=<(echo "$CL_prod_api_GCLOUD_DEPLOY_credentialsKey")",
|
|
2032
2018
|
"gcloud auth configure-docker asia-east1-docker.pkg.dev",
|
|
2033
2019
|
"echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
|
|
2034
2020
|
"echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
|
|
@@ -2099,9 +2085,7 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
2099
2085
|
"script": [
|
|
2100
2086
|
"ensureNodeDockerfile",
|
|
2101
2087
|
"echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
|
|
2102
|
-
"echo $CL_stage_api_GCLOUD_DEPLOY_credentialsKey
|
|
2103
|
-
",
|
|
2104
|
-
"gcloud auth activate-service-account --key-file="./____keyfile.json"",
|
|
2088
|
+
"gcloud auth activate-service-account --key-file=<(echo "$CL_stage_api_GCLOUD_DEPLOY_credentialsKey")",
|
|
2105
2089
|
"gcloud auth configure-docker asia-east1-docker.pkg.dev",
|
|
2106
2090
|
"echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
|
|
2107
2091
|
"echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
|
|
@@ -2190,9 +2174,7 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
2190
2174
|
],
|
|
2191
2175
|
"script": [
|
|
2192
2176
|
"echo -e "\\e[0Ksection_start:$(date +%s):prepare[collapsed=true]\\r\\e[0KPrepare..."",
|
|
2193
|
-
"echo $CL_prod_api_GCLOUD_DEPLOY_credentialsKey
|
|
2194
|
-
",
|
|
2195
|
-
"gcloud auth activate-service-account --key-file="./____keyfile.json"",
|
|
2177
|
+
"gcloud auth activate-service-account --key-file=<(echo "$CL_prod_api_GCLOUD_DEPLOY_credentialsKey")",
|
|
2196
2178
|
"export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe asdf --format="value(projectNumber)")",
|
|
2197
2179
|
"echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
|
|
2198
2180
|
"echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
|
|
@@ -2303,9 +2285,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
|
|
|
2303
2285
|
],
|
|
2304
2286
|
"script": [
|
|
2305
2287
|
"echo -e "\\e[0Ksection_start:$(date +%s):prepare[collapsed=true]\\r\\e[0KPrepare..."",
|
|
2306
|
-
"echo $CL_stage_api_GCLOUD_DEPLOY_credentialsKey
|
|
2307
|
-
",
|
|
2308
|
-
"gcloud auth activate-service-account --key-file="./____keyfile.json"",
|
|
2288
|
+
"gcloud auth activate-service-account --key-file=<(echo "$CL_stage_api_GCLOUD_DEPLOY_credentialsKey")",
|
|
2309
2289
|
"export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe asdf --format="value(projectNumber)")",
|
|
2310
2290
|
"echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
|
|
2311
2291
|
"echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
|
|
@@ -2402,9 +2382,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
|
|
|
2402
2382
|
],
|
|
2403
2383
|
"script": [
|
|
2404
2384
|
"set +e",
|
|
2405
|
-
"echo $CL_prod_api_GCLOUD_DEPLOY_credentialsKey
|
|
2406
|
-
",
|
|
2407
|
-
"gcloud auth activate-service-account --key-file="./____keyfile.json"",
|
|
2385
|
+
"gcloud auth activate-service-account --key-file=<(echo "$CL_prod_api_GCLOUD_DEPLOY_credentialsKey")",
|
|
2408
2386
|
"gcloud run services delete pan-test-app-prod-api --project=asdf --region=asia-east1",
|
|
2409
2387
|
"gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/api --quiet --delete-tags",
|
|
2410
2388
|
"gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/api --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/api@$version --quiet --delete-tags; done",
|
|
@@ -2450,9 +2428,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
|
|
|
2450
2428
|
],
|
|
2451
2429
|
"script": [
|
|
2452
2430
|
"set +e",
|
|
2453
|
-
"echo $CL_stage_api_GCLOUD_DEPLOY_credentialsKey
|
|
2454
|
-
",
|
|
2455
|
-
"gcloud auth activate-service-account --key-file="./____keyfile.json"",
|
|
2431
|
+
"gcloud auth activate-service-account --key-file=<(echo "$CL_stage_api_GCLOUD_DEPLOY_credentialsKey")",
|
|
2456
2432
|
"gcloud run services delete pan-test-app-stage-api --project=asdf --region=asia-east1",
|
|
2457
2433
|
"gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/api --quiet --delete-tags",
|
|
2458
2434
|
"gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/api --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/api@$version --quiet --delete-tags; done",
|
|
@@ -163,9 +163,7 @@ exports[`matches snapshot 1`] = `
|
|
|
163
163
|
"script": [
|
|
164
164
|
"ensureNodeDockerfile",
|
|
165
165
|
"echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
|
|
166
|
-
"echo $CL_dev_www_GCLOUD_DEPLOY_credentialsKey
|
|
167
|
-
",
|
|
168
|
-
"gcloud auth activate-service-account --key-file="./____keyfile.json"",
|
|
166
|
+
"gcloud auth activate-service-account --key-file=<(echo "$CL_dev_www_GCLOUD_DEPLOY_credentialsKey")",
|
|
169
167
|
"gcloud auth configure-docker asia-east1-docker.pkg.dev",
|
|
170
168
|
"echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
|
|
171
169
|
"echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
|
|
@@ -266,9 +264,7 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
266
264
|
],
|
|
267
265
|
"script": [
|
|
268
266
|
"echo -e "\\e[0Ksection_start:$(date +%s):prepare[collapsed=true]\\r\\e[0KPrepare..."",
|
|
269
|
-
"echo $CL_dev_www_GCLOUD_DEPLOY_credentialsKey
|
|
270
|
-
",
|
|
271
|
-
"gcloud auth activate-service-account --key-file="./____keyfile.json"",
|
|
267
|
+
"gcloud auth activate-service-account --key-file=<(echo "$CL_dev_www_GCLOUD_DEPLOY_credentialsKey")",
|
|
272
268
|
"export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe asdf --format="value(projectNumber)")",
|
|
273
269
|
"echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
|
|
274
270
|
"echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
|
|
@@ -365,9 +361,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
|
|
|
365
361
|
],
|
|
366
362
|
"script": [
|
|
367
363
|
"set +e",
|
|
368
|
-
"echo $CL_dev_www_GCLOUD_DEPLOY_credentialsKey
|
|
369
|
-
",
|
|
370
|
-
"gcloud auth activate-service-account --key-file="./____keyfile.json"",
|
|
364
|
+
"gcloud auth activate-service-account --key-file=<(echo "$CL_dev_www_GCLOUD_DEPLOY_credentialsKey")",
|
|
371
365
|
"gcloud run services delete pan-test-app-dev-www --project=asdf --region=asia-east1",
|
|
372
366
|
"gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/www --quiet --delete-tags",
|
|
373
367
|
"gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www@$version --quiet --delete-tags; done",
|
|
@@ -712,9 +706,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
|
|
|
712
706
|
"script": [
|
|
713
707
|
"ensureNodeDockerfile",
|
|
714
708
|
"echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
|
|
715
|
-
"echo $CL_review_www_GCLOUD_DEPLOY_credentialsKey
|
|
716
|
-
",
|
|
717
|
-
"gcloud auth activate-service-account --key-file="./____keyfile.json"",
|
|
709
|
+
"gcloud auth activate-service-account --key-file=<(echo "$CL_review_www_GCLOUD_DEPLOY_credentialsKey")",
|
|
718
710
|
"gcloud auth configure-docker asia-east1-docker.pkg.dev",
|
|
719
711
|
"echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
|
|
720
712
|
"echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
|
|
@@ -815,9 +807,7 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
815
807
|
],
|
|
816
808
|
"script": [
|
|
817
809
|
"echo -e "\\e[0Ksection_start:$(date +%s):prepare[collapsed=true]\\r\\e[0KPrepare..."",
|
|
818
|
-
"echo $CL_review_www_GCLOUD_DEPLOY_credentialsKey
|
|
819
|
-
",
|
|
820
|
-
"gcloud auth activate-service-account --key-file="./____keyfile.json"",
|
|
810
|
+
"gcloud auth activate-service-account --key-file=<(echo "$CL_review_www_GCLOUD_DEPLOY_credentialsKey")",
|
|
821
811
|
"export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe asdf --format="value(projectNumber)")",
|
|
822
812
|
"echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
|
|
823
813
|
"echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
|
|
@@ -917,9 +907,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
|
|
|
917
907
|
],
|
|
918
908
|
"script": [
|
|
919
909
|
"set +e",
|
|
920
|
-
"echo $CL_review_www_GCLOUD_DEPLOY_credentialsKey
|
|
921
|
-
",
|
|
922
|
-
"gcloud auth activate-service-account --key-file="./____keyfile.json"",
|
|
910
|
+
"gcloud auth activate-service-account --key-file=<(echo "$CL_review_www_GCLOUD_DEPLOY_credentialsKey")",
|
|
923
911
|
"gcloud run services delete pan-test-app-review-mr1234-www --project=asdf --region=asia-east1",
|
|
924
912
|
"gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/www/mr1234 --quiet --delete-tags",
|
|
925
913
|
"gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www@$version --quiet --delete-tags; done",
|
|
@@ -1300,9 +1288,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
|
|
|
1300
1288
|
"script": [
|
|
1301
1289
|
"ensureNodeDockerfile",
|
|
1302
1290
|
"echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
|
|
1303
|
-
"echo $CL_prod_www_GCLOUD_DEPLOY_credentialsKey
|
|
1304
|
-
",
|
|
1305
|
-
"gcloud auth activate-service-account --key-file="./____keyfile.json"",
|
|
1291
|
+
"gcloud auth activate-service-account --key-file=<(echo "$CL_prod_www_GCLOUD_DEPLOY_credentialsKey")",
|
|
1306
1292
|
"gcloud auth configure-docker asia-east1-docker.pkg.dev",
|
|
1307
1293
|
"echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
|
|
1308
1294
|
"echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
|
|
@@ -1373,9 +1359,7 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
1373
1359
|
"script": [
|
|
1374
1360
|
"ensureNodeDockerfile",
|
|
1375
1361
|
"echo -e "\\e[0Ksection_start:$(date +%s):docker-login[collapsed=true]\\r\\e[0KDocker Login"",
|
|
1376
|
-
"echo $CL_stage_www_GCLOUD_DEPLOY_credentialsKey
|
|
1377
|
-
",
|
|
1378
|
-
"gcloud auth activate-service-account --key-file="./____keyfile.json"",
|
|
1362
|
+
"gcloud auth activate-service-account --key-file=<(echo "$CL_stage_www_GCLOUD_DEPLOY_credentialsKey")",
|
|
1379
1363
|
"gcloud auth configure-docker asia-east1-docker.pkg.dev",
|
|
1380
1364
|
"echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
|
|
1381
1365
|
"echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
|
|
@@ -1464,9 +1448,7 @@ COPY --chown=node:node .yarn /app/.yarn",
|
|
|
1464
1448
|
],
|
|
1465
1449
|
"script": [
|
|
1466
1450
|
"echo -e "\\e[0Ksection_start:$(date +%s):prepare[collapsed=true]\\r\\e[0KPrepare..."",
|
|
1467
|
-
"echo $CL_prod_www_GCLOUD_DEPLOY_credentialsKey
|
|
1468
|
-
",
|
|
1469
|
-
"gcloud auth activate-service-account --key-file="./____keyfile.json"",
|
|
1451
|
+
"gcloud auth activate-service-account --key-file=<(echo "$CL_prod_www_GCLOUD_DEPLOY_credentialsKey")",
|
|
1470
1452
|
"export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe asdf --format="value(projectNumber)")",
|
|
1471
1453
|
"echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
|
|
1472
1454
|
"echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
|
|
@@ -1577,9 +1559,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
|
|
|
1577
1559
|
],
|
|
1578
1560
|
"script": [
|
|
1579
1561
|
"echo -e "\\e[0Ksection_start:$(date +%s):prepare[collapsed=true]\\r\\e[0KPrepare..."",
|
|
1580
|
-
"echo $CL_stage_www_GCLOUD_DEPLOY_credentialsKey
|
|
1581
|
-
",
|
|
1582
|
-
"gcloud auth activate-service-account --key-file="./____keyfile.json"",
|
|
1562
|
+
"gcloud auth activate-service-account --key-file=<(echo "$CL_stage_www_GCLOUD_DEPLOY_credentialsKey")",
|
|
1583
1563
|
"export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe asdf --format="value(projectNumber)")",
|
|
1584
1564
|
"echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"",
|
|
1585
1565
|
"echo -e "\\e[0Ksection_end:$(date +%s):prepare\\r\\e[0K"",
|
|
@@ -1676,9 +1656,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
|
|
|
1676
1656
|
],
|
|
1677
1657
|
"script": [
|
|
1678
1658
|
"set +e",
|
|
1679
|
-
"echo $CL_prod_www_GCLOUD_DEPLOY_credentialsKey
|
|
1680
|
-
",
|
|
1681
|
-
"gcloud auth activate-service-account --key-file="./____keyfile.json"",
|
|
1659
|
+
"gcloud auth activate-service-account --key-file=<(echo "$CL_prod_www_GCLOUD_DEPLOY_credentialsKey")",
|
|
1682
1660
|
"gcloud run services delete pan-test-app-prod-www --project=asdf --region=asia-east1",
|
|
1683
1661
|
"gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/www --quiet --delete-tags",
|
|
1684
1662
|
"gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www@$version --quiet --delete-tags; done",
|
|
@@ -1724,9 +1702,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
|
|
|
1724
1702
|
],
|
|
1725
1703
|
"script": [
|
|
1726
1704
|
"set +e",
|
|
1727
|
-
"echo $CL_stage_www_GCLOUD_DEPLOY_credentialsKey
|
|
1728
|
-
",
|
|
1729
|
-
"gcloud auth activate-service-account --key-file="./____keyfile.json"",
|
|
1705
|
+
"gcloud auth activate-service-account --key-file=<(echo "$CL_stage_www_GCLOUD_DEPLOY_credentialsKey")",
|
|
1730
1706
|
"gcloud run services delete pan-test-app-stage-www --project=asdf --region=asia-east1",
|
|
1731
1707
|
"gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/www --quiet --delete-tags",
|
|
1732
1708
|
"gcloud artifacts docker images list asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www --sort-by=~CREATE_TIME --format="value(version)" | tail -n +2 | while read -r version; do gcloud artifacts docker images delete asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www@$version --quiet --delete-tags; done",
|
package/package.json
CHANGED
|
@@ -2,13 +2,9 @@ import { GCLOUD_DEPLOY_CREDENTIALS_KEY } from "..";
|
|
|
2
2
|
import { getSecretVarNameForContext } from "../../../context";
|
|
3
3
|
import type { Context } from "../../../types";
|
|
4
4
|
|
|
5
|
-
export const gcloudServiceAccountLoginCommands = (context: Context) =>
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
`,
|
|
12
|
-
`gcloud auth activate-service-account --key-file="./____keyfile.json"`,
|
|
13
|
-
];
|
|
14
|
-
};
|
|
5
|
+
export const gcloudServiceAccountLoginCommands = (context: Context) => [
|
|
6
|
+
`gcloud auth activate-service-account --key-file=<(echo "$${getSecretVarNameForContext(
|
|
7
|
+
context,
|
|
8
|
+
GCLOUD_DEPLOY_CREDENTIALS_KEY
|
|
9
|
+
)}")`,
|
|
10
|
+
];
|