@catladder/pipeline 0.0.0-fix-command-710f75f1 → 0.0.0-fix-error-sql-db-delete-b3878c2e
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 -0
- package/dist/build/docker.d.ts +4 -18
- package/dist/build/docker.js +15 -9
- package/dist/build/index.js +7 -1
- package/dist/build/rails/build.js +37 -16
- package/dist/build/rails/index.d.ts +2 -2
- package/dist/build/rails/test.js +1 -2
- package/dist/build/types.d.ts +36 -4
- package/dist/bundles/catladder-gitlab/index.js +543 -218
- package/dist/constants.js +1 -1
- package/dist/context/getEnvironment.js +1 -0
- package/dist/context/getEnvironmentContext.js +5 -3
- package/dist/context/getEnvironmentVariables.d.ts +5 -1
- package/dist/context/getEnvironmentVariables.js +7 -2
- package/dist/deploy/base.js +1 -1
- package/dist/deploy/cloudRun/index.js +14 -6
- package/dist/deploy/custom/deployJob.js +6 -3
- package/dist/deploy/index.d.ts +2 -1
- package/dist/deploy/kubernetes/additionalSecretKeys.d.ts +3 -1
- package/dist/deploy/kubernetes/additionalSecretKeys.js +5 -1
- package/dist/deploy/kubernetes/deployJob.js +4 -4
- package/dist/deploy/kubernetes/kubeValues.d.ts +1 -0
- package/dist/deploy/kubernetes/kubeValues.js +9 -6
- package/dist/deploy/kubernetes/processSecretsAsFiles.d.ts +1 -0
- package/dist/deploy/types/custom.d.ts +2 -1
- package/dist/deploy/types/googleCloudRun.d.ts +5 -1
- package/dist/deploy/types/kubernetes.d.ts +9 -0
- package/dist/pipeline/createAllJobs.d.ts +8 -0
- package/dist/pipeline/createAllJobs.js +164 -0
- package/dist/pipeline/createChildPipeline.js +24 -48
- package/dist/pipeline/createJobsForComponent.d.ts +3 -0
- package/dist/pipeline/{createJobs.js → createJobsForComponent.js} +8 -105
- package/dist/pipeline/gitlab/createGitlabJobs.d.ts +14 -0
- package/dist/pipeline/gitlab/createGitlabJobs.js +260 -0
- package/dist/pipeline/index.d.ts +1 -1
- package/dist/pipeline/index.js +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/types/config.d.ts +3 -3
- package/dist/types/context.d.ts +3 -1
- package/dist/types/environmentContext.d.ts +7 -0
- package/dist/types/gitlab-types.d.ts +5 -1
- package/dist/types/jobs.d.ts +9 -2
- package/dist/utils/gitlab.js +1 -1
- package/examples/__snapshots__/cloud-run-memory-limit.ts.snap +32 -32
- package/examples/__snapshots__/cloud-run-no-cpu-throttling.ts.snap +32 -32
- package/examples/__snapshots__/cloud-run-non-public.ts.snap +32 -32
- package/examples/__snapshots__/cloud-run-with-sql-reuse-db.ts.snap +3116 -0
- package/examples/__snapshots__/cloud-run-with-sql.ts.snap +65 -65
- package/examples/__snapshots__/custom-build-job.ts.snap +32 -32
- package/examples/__snapshots__/custom-deploy.ts.snap +1384 -0
- package/examples/__snapshots__/kubernetes-application-customization.ts.snap +2280 -0
- package/examples/__snapshots__/kubernetes-with-cloud-sql-legacy.ts.snap +2204 -0
- package/examples/__snapshots__/kubernetes-with-jobs.ts.snap +24 -24
- package/examples/__snapshots__/rails-k8s-with-worker.ts.snap +1911 -0
- package/examples/cloud-run-with-sql-reuse-db.ts +54 -0
- package/examples/custom-deploy.ts +25 -0
- package/examples/kubernetes-application-customization.ts +57 -0
- package/examples/kubernetes-with-cloud-sql-legacy.ts +33 -0
- package/examples/rails-k8s-with-worker.ts +95 -0
- package/package.json +1 -1
- package/src/build/custom/buildJob.ts +1 -0
- package/src/build/docker.ts +13 -6
- package/src/build/index.ts +7 -1
- package/src/build/node/cache.ts +2 -2
- package/src/build/rails/build.ts +20 -10
- package/src/build/rails/index.ts +2 -2
- package/src/build/rails/test.ts +43 -39
- package/src/build/types.ts +40 -5
- package/src/config/configruedEnvs.ts +2 -8
- package/src/context/getEnvironment.ts +1 -0
- package/src/context/getEnvironmentContext.ts +6 -6
- package/src/context/getEnvironmentVariables.ts +9 -4
- package/src/deploy/base.ts +1 -1
- package/src/deploy/cloudRun/deployJob.ts +1 -1
- package/src/deploy/cloudRun/index.ts +12 -4
- package/src/deploy/custom/deployJob.ts +9 -1
- package/src/deploy/index.ts +4 -1
- package/src/deploy/kubernetes/additionalSecretKeys.ts +1 -1
- package/src/deploy/kubernetes/deployJob.ts +2 -1
- package/src/deploy/kubernetes/kubeValues.ts +7 -5
- package/src/deploy/types/custom.ts +2 -1
- package/src/deploy/types/googleCloudRun.ts +6 -1
- package/src/deploy/types/kubernetes.ts +11 -1
- package/src/pipeline/createAllJobs.ts +38 -0
- package/src/pipeline/createChildPipeline.ts +6 -22
- package/src/pipeline/createJobsForComponent.ts +64 -0
- package/src/pipeline/gitlab/createGitlabJobs.ts +149 -0
- package/src/pipeline/index.ts +1 -1
- package/src/types/context.ts +3 -1
- package/src/types/environmentContext.ts +7 -0
- package/src/types/gitlab-types.ts +10 -3
- package/src/types/jobs.ts +11 -2
- package/src/utils/gitlab.ts +1 -1
- package/dist/pipeline/createJobs.d.ts +0 -3
- package/dist/pipeline/gitlab/makeGitlabJob.d.ts +0 -10
- package/dist/pipeline/gitlab/makeGitlabJob.js +0 -44
- package/src/pipeline/createJobs.ts +0 -199
- package/src/pipeline/gitlab/makeGitlabJob.ts +0 -23
|
@@ -114,6 +114,7 @@ exports[`matches snapshot 1`] = `
|
|
|
114
114
|
"ENV_SHORT": "dev",
|
|
115
115
|
"ENV_TYPE": "dev",
|
|
116
116
|
"GCLOUD_DEPLOY_credentialsKey": "$CL_dev_api_GCLOUD_DEPLOY_credentialsKey",
|
|
117
|
+
"GCLOUD_RUN_canonicalHostSuffix": "$CL_dev_api_GCLOUD_RUN_canonicalHostSuffix",
|
|
117
118
|
"HOST": "pan-test-app-dev-api-unknown-host.example.com",
|
|
118
119
|
"HOST_CANONICAL": "pan-test-app-dev-api-unknown-host.example.com",
|
|
119
120
|
"KUBERNETES_CPU_LIMIT": "2",
|
|
@@ -121,7 +122,7 @@ exports[`matches snapshot 1`] = `
|
|
|
121
122
|
"KUBERNETES_MEMORY_LIMIT": "4Gi",
|
|
122
123
|
"KUBERNETES_MEMORY_REQUEST": "2Gi",
|
|
123
124
|
"ROOT_URL": "https://pan-test-app-dev-api-unknown-host.example.com",
|
|
124
|
-
"_ALL_ENV_VAR_KEYS": "["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","CLOUD_SQL_INSTANCE_CONNECTION_NAME","DB_NAME","DB_USER","DB_PASSWORD","DATABASE_URL","DATABASE_JDBC_URL","CLOUD_RUN_JOB_TRIGGER_URL_migration","CLOUD_RUN_JOB_TRIGGER_URL_send_reminders","GCLOUD_DEPLOY_credentialsKey"]",
|
|
125
|
+
"_ALL_ENV_VAR_KEYS": "["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","CLOUD_SQL_INSTANCE_CONNECTION_NAME","DB_NAME","DB_USER","DB_PASSWORD","DATABASE_URL","DATABASE_JDBC_URL","CLOUD_RUN_JOB_TRIGGER_URL_migration","CLOUD_RUN_JOB_TRIGGER_URL_send_reminders","GCLOUD_DEPLOY_credentialsKey","GCLOUD_RUN_canonicalHostSuffix"]",
|
|
125
126
|
},
|
|
126
127
|
},
|
|
127
128
|
"api 🔨 docker | dev ": {
|
|
@@ -291,11 +292,8 @@ COPY --chown=node:node api/yarn.lock /app/api/yarn.lock",
|
|
|
291
292
|
"DB_NAME": "pan-test-app-dev-api",
|
|
292
293
|
"DB_PASSWORD": "$CL_dev_api_DB_PASSWORD",
|
|
293
294
|
"DB_USER": "my-user",
|
|
294
|
-
"DOCKERFILE_ADDITIONS": undefined,
|
|
295
|
-
"DOCKERFILE_ADDITIONS_END": undefined,
|
|
296
295
|
"DOCKER_BUILDKIT": "1",
|
|
297
296
|
"DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
|
|
298
|
-
"DOCKER_DIR": ".",
|
|
299
297
|
"DOCKER_DRIVER": "overlay2",
|
|
300
298
|
"DOCKER_HOST": "tcp://0.0.0.0:2375",
|
|
301
299
|
"DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
|
|
@@ -320,17 +318,19 @@ DATABASE_URL: 'postgresql://$DB_USER:$DB_PASSWORD@localhost/$DB_NAME?host=/cloud
|
|
|
320
318
|
DATABASE_JDBC_URL: 'jdbc:postgresql:///$DB_NAME?cloudSqlInstance=$CLOUD_SQL_INSTANCE_CONNECTION_NAME&socketFactory=com.google.cloud.sql.postgres.SocketFactory&user=$DB_USER&password=$DB_PASSWORD'
|
|
321
319
|
CLOUD_RUN_JOB_TRIGGER_URL_migration: 'https://europe-west6-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/google-project-id/jobs/pan-test-app-dev-api-migration:run'
|
|
322
320
|
CLOUD_RUN_JOB_TRIGGER_URL_send_reminders: 'https://europe-west6-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/google-project-id/jobs/pan-test-app-dev-api-send-reminders:run'
|
|
323
|
-
|
|
321
|
+
GCLOUD_RUN_canonicalHostSuffix: '$CL_dev_api_GCLOUD_RUN_canonicalHostSuffix'
|
|
322
|
+
_ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","CLOUD_SQL_INSTANCE_CONNECTION_NAME","DB_NAME","DB_USER","DB_PASSWORD","DATABASE_URL","DATABASE_JDBC_URL","CLOUD_RUN_JOB_TRIGGER_URL_migration","CLOUD_RUN_JOB_TRIGGER_URL_send_reminders","GCLOUD_DEPLOY_credentialsKey","GCLOUD_RUN_canonicalHostSuffix"]'
|
|
324
323
|
",
|
|
325
324
|
"GCLOUD_DEPLOY_credentialsKey": "$CL_dev_api_GCLOUD_DEPLOY_credentialsKey",
|
|
325
|
+
"GCLOUD_RUN_canonicalHostSuffix": "$CL_dev_api_GCLOUD_RUN_canonicalHostSuffix",
|
|
326
326
|
"HOST": "pan-test-app-dev-api-unknown-host.example.com",
|
|
327
327
|
"HOST_CANONICAL": "pan-test-app-dev-api-unknown-host.example.com",
|
|
328
328
|
"KUBERNETES_CPU_LIMIT": "1",
|
|
329
329
|
"KUBERNETES_CPU_REQUEST": "0.5",
|
|
330
|
-
"KUBERNETES_MEMORY_LIMIT": "
|
|
331
|
-
"KUBERNETES_MEMORY_REQUEST": "
|
|
330
|
+
"KUBERNETES_MEMORY_LIMIT": "500Mi",
|
|
331
|
+
"KUBERNETES_MEMORY_REQUEST": "200Mi",
|
|
332
332
|
"ROOT_URL": "https://pan-test-app-dev-api-unknown-host.example.com",
|
|
333
|
-
"_ALL_ENV_VAR_KEYS": "["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","CLOUD_SQL_INSTANCE_CONNECTION_NAME","DB_NAME","DB_USER","DB_PASSWORD","DATABASE_URL","DATABASE_JDBC_URL","CLOUD_RUN_JOB_TRIGGER_URL_migration","CLOUD_RUN_JOB_TRIGGER_URL_send_reminders","GCLOUD_DEPLOY_credentialsKey"]",
|
|
333
|
+
"_ALL_ENV_VAR_KEYS": "["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","CLOUD_SQL_INSTANCE_CONNECTION_NAME","DB_NAME","DB_USER","DB_PASSWORD","DATABASE_URL","DATABASE_JDBC_URL","CLOUD_RUN_JOB_TRIGGER_URL_migration","CLOUD_RUN_JOB_TRIGGER_URL_send_reminders","GCLOUD_DEPLOY_credentialsKey","GCLOUD_RUN_canonicalHostSuffix"]",
|
|
334
334
|
},
|
|
335
335
|
},
|
|
336
336
|
"api 🛑 Stop ⚠️ | dev ": {
|
|
@@ -552,6 +552,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
|
|
|
552
552
|
"ENV_SHORT": "dev",
|
|
553
553
|
"ENV_TYPE": "dev",
|
|
554
554
|
"GCLOUD_DEPLOY_credentialsKey": "$CL_dev_www_GCLOUD_DEPLOY_credentialsKey",
|
|
555
|
+
"GCLOUD_RUN_canonicalHostSuffix": "$CL_dev_www_GCLOUD_RUN_canonicalHostSuffix",
|
|
555
556
|
"HOST": "pan-test-app-dev-www-unknown-host.example.com",
|
|
556
557
|
"HOST_CANONICAL": "pan-test-app-dev-www-unknown-host.example.com",
|
|
557
558
|
"KUBERNETES_CPU_LIMIT": "2",
|
|
@@ -559,7 +560,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
|
|
|
559
560
|
"KUBERNETES_MEMORY_LIMIT": "4Gi",
|
|
560
561
|
"KUBERNETES_MEMORY_REQUEST": "2Gi",
|
|
561
562
|
"ROOT_URL": "https://pan-test-app-dev-www-unknown-host.example.com",
|
|
562
|
-
"_ALL_ENV_VAR_KEYS": "["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","GCLOUD_DEPLOY_credentialsKey","API_URL"]",
|
|
563
|
+
"_ALL_ENV_VAR_KEYS": "["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","GCLOUD_DEPLOY_credentialsKey","GCLOUD_RUN_canonicalHostSuffix","API_URL"]",
|
|
563
564
|
},
|
|
564
565
|
},
|
|
565
566
|
"www 🔨 docker | dev ": {
|
|
@@ -705,11 +706,8 @@ COPY --chown=node:node www/yarn.lock /app/www/yarn.lock",
|
|
|
705
706
|
"API_URL": "https://pan-test-app-dev-api-unknown-host.example.com/graphql",
|
|
706
707
|
"APP_DIR": "www",
|
|
707
708
|
"CLOUDSDK_CORE_DISABLE_PROMPTS": "1",
|
|
708
|
-
"DOCKERFILE_ADDITIONS": undefined,
|
|
709
|
-
"DOCKERFILE_ADDITIONS_END": undefined,
|
|
710
709
|
"DOCKER_BUILDKIT": "1",
|
|
711
710
|
"DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/www",
|
|
712
|
-
"DOCKER_DIR": ".",
|
|
713
711
|
"DOCKER_DRIVER": "overlay2",
|
|
714
712
|
"DOCKER_HOST": "tcp://0.0.0.0:2375",
|
|
715
713
|
"DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
|
|
@@ -726,18 +724,20 @@ ENV_TYPE: 'dev'
|
|
|
726
724
|
HOST: 'pan-test-app-dev-www-unknown-host.example.com'
|
|
727
725
|
ROOT_URL: 'https://pan-test-app-dev-www-unknown-host.example.com'
|
|
728
726
|
HOST_CANONICAL: 'pan-test-app-dev-www-unknown-host.example.com'
|
|
727
|
+
GCLOUD_RUN_canonicalHostSuffix: '$CL_dev_www_GCLOUD_RUN_canonicalHostSuffix'
|
|
729
728
|
API_URL: 'https://pan-test-app-dev-api-unknown-host.example.com/graphql'
|
|
730
|
-
_ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","GCLOUD_DEPLOY_credentialsKey","API_URL"]'
|
|
729
|
+
_ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","GCLOUD_DEPLOY_credentialsKey","GCLOUD_RUN_canonicalHostSuffix","API_URL"]'
|
|
731
730
|
",
|
|
732
731
|
"GCLOUD_DEPLOY_credentialsKey": "$CL_dev_www_GCLOUD_DEPLOY_credentialsKey",
|
|
732
|
+
"GCLOUD_RUN_canonicalHostSuffix": "$CL_dev_www_GCLOUD_RUN_canonicalHostSuffix",
|
|
733
733
|
"HOST": "pan-test-app-dev-www-unknown-host.example.com",
|
|
734
734
|
"HOST_CANONICAL": "pan-test-app-dev-www-unknown-host.example.com",
|
|
735
735
|
"KUBERNETES_CPU_LIMIT": "1",
|
|
736
736
|
"KUBERNETES_CPU_REQUEST": "0.5",
|
|
737
|
-
"KUBERNETES_MEMORY_LIMIT": "
|
|
738
|
-
"KUBERNETES_MEMORY_REQUEST": "
|
|
737
|
+
"KUBERNETES_MEMORY_LIMIT": "500Mi",
|
|
738
|
+
"KUBERNETES_MEMORY_REQUEST": "200Mi",
|
|
739
739
|
"ROOT_URL": "https://pan-test-app-dev-www-unknown-host.example.com",
|
|
740
|
-
"_ALL_ENV_VAR_KEYS": "["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","GCLOUD_DEPLOY_credentialsKey","API_URL"]",
|
|
740
|
+
"_ALL_ENV_VAR_KEYS": "["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","GCLOUD_DEPLOY_credentialsKey","GCLOUD_RUN_canonicalHostSuffix","API_URL"]",
|
|
741
741
|
},
|
|
742
742
|
},
|
|
743
743
|
"www 🛑 Stop ⚠️ | dev ": {
|
|
@@ -1033,6 +1033,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
|
|
|
1033
1033
|
"ENV_SHORT": "review",
|
|
1034
1034
|
"ENV_TYPE": "review",
|
|
1035
1035
|
"GCLOUD_DEPLOY_credentialsKey": "$CL_review_api_GCLOUD_DEPLOY_credentialsKey",
|
|
1036
|
+
"GCLOUD_RUN_canonicalHostSuffix": "$CL_review_api_GCLOUD_RUN_canonicalHostSuffix",
|
|
1036
1037
|
"HOST": "pan-test-app-review-mr1234-api-unknown-host.example.com",
|
|
1037
1038
|
"HOST_CANONICAL": "pan-test-app-review-mr1234-api-unknown-host.example.com",
|
|
1038
1039
|
"KUBERNETES_CPU_LIMIT": "2",
|
|
@@ -1040,7 +1041,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
|
|
|
1040
1041
|
"KUBERNETES_MEMORY_LIMIT": "4Gi",
|
|
1041
1042
|
"KUBERNETES_MEMORY_REQUEST": "2Gi",
|
|
1042
1043
|
"ROOT_URL": "https://pan-test-app-review-mr1234-api-unknown-host.example.com",
|
|
1043
|
-
"_ALL_ENV_VAR_KEYS": "["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","CLOUD_SQL_INSTANCE_CONNECTION_NAME","DB_NAME","DB_USER","DB_PASSWORD","DATABASE_URL","DATABASE_JDBC_URL","CLOUD_RUN_JOB_TRIGGER_URL_migration","CLOUD_RUN_JOB_TRIGGER_URL_send_reminders","GCLOUD_DEPLOY_credentialsKey"]",
|
|
1044
|
+
"_ALL_ENV_VAR_KEYS": "["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","CLOUD_SQL_INSTANCE_CONNECTION_NAME","DB_NAME","DB_USER","DB_PASSWORD","DATABASE_URL","DATABASE_JDBC_URL","CLOUD_RUN_JOB_TRIGGER_URL_migration","CLOUD_RUN_JOB_TRIGGER_URL_send_reminders","GCLOUD_DEPLOY_credentialsKey","GCLOUD_RUN_canonicalHostSuffix"]",
|
|
1044
1045
|
},
|
|
1045
1046
|
},
|
|
1046
1047
|
"api 🔨 docker | review ": {
|
|
@@ -1210,11 +1211,8 @@ COPY --chown=node:node api/yarn.lock /app/api/yarn.lock",
|
|
|
1210
1211
|
"DB_NAME": "pan-test-app-review-mr1234-api",
|
|
1211
1212
|
"DB_PASSWORD": "$CL_review_api_DB_PASSWORD",
|
|
1212
1213
|
"DB_USER": "my-user",
|
|
1213
|
-
"DOCKERFILE_ADDITIONS": undefined,
|
|
1214
|
-
"DOCKERFILE_ADDITIONS_END": undefined,
|
|
1215
1214
|
"DOCKER_BUILDKIT": "1",
|
|
1216
1215
|
"DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
|
|
1217
|
-
"DOCKER_DIR": ".",
|
|
1218
1216
|
"DOCKER_DRIVER": "overlay2",
|
|
1219
1217
|
"DOCKER_HOST": "tcp://0.0.0.0:2375",
|
|
1220
1218
|
"DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
|
|
@@ -1239,17 +1237,19 @@ DATABASE_URL: 'postgresql://$DB_USER:$DB_PASSWORD@localhost/$DB_NAME?host=/cloud
|
|
|
1239
1237
|
DATABASE_JDBC_URL: 'jdbc:postgresql:///$DB_NAME?cloudSqlInstance=$CLOUD_SQL_INSTANCE_CONNECTION_NAME&socketFactory=com.google.cloud.sql.postgres.SocketFactory&user=$DB_USER&password=$DB_PASSWORD'
|
|
1240
1238
|
CLOUD_RUN_JOB_TRIGGER_URL_migration: 'https://europe-west6-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/google-project-id/jobs/pan-test-app-review-mr1234-api-migration:run'
|
|
1241
1239
|
CLOUD_RUN_JOB_TRIGGER_URL_send_reminders: 'https://europe-west6-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/google-project-id/jobs/pan-test-app-review-mr1234-api-send-reminders:run'
|
|
1242
|
-
|
|
1240
|
+
GCLOUD_RUN_canonicalHostSuffix: '$CL_review_api_GCLOUD_RUN_canonicalHostSuffix'
|
|
1241
|
+
_ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","CLOUD_SQL_INSTANCE_CONNECTION_NAME","DB_NAME","DB_USER","DB_PASSWORD","DATABASE_URL","DATABASE_JDBC_URL","CLOUD_RUN_JOB_TRIGGER_URL_migration","CLOUD_RUN_JOB_TRIGGER_URL_send_reminders","GCLOUD_DEPLOY_credentialsKey","GCLOUD_RUN_canonicalHostSuffix"]'
|
|
1243
1242
|
",
|
|
1244
1243
|
"GCLOUD_DEPLOY_credentialsKey": "$CL_review_api_GCLOUD_DEPLOY_credentialsKey",
|
|
1244
|
+
"GCLOUD_RUN_canonicalHostSuffix": "$CL_review_api_GCLOUD_RUN_canonicalHostSuffix",
|
|
1245
1245
|
"HOST": "pan-test-app-review-mr1234-api-unknown-host.example.com",
|
|
1246
1246
|
"HOST_CANONICAL": "pan-test-app-review-mr1234-api-unknown-host.example.com",
|
|
1247
1247
|
"KUBERNETES_CPU_LIMIT": "1",
|
|
1248
1248
|
"KUBERNETES_CPU_REQUEST": "0.5",
|
|
1249
|
-
"KUBERNETES_MEMORY_LIMIT": "
|
|
1250
|
-
"KUBERNETES_MEMORY_REQUEST": "
|
|
1249
|
+
"KUBERNETES_MEMORY_LIMIT": "500Mi",
|
|
1250
|
+
"KUBERNETES_MEMORY_REQUEST": "200Mi",
|
|
1251
1251
|
"ROOT_URL": "https://pan-test-app-review-mr1234-api-unknown-host.example.com",
|
|
1252
|
-
"_ALL_ENV_VAR_KEYS": "["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","CLOUD_SQL_INSTANCE_CONNECTION_NAME","DB_NAME","DB_USER","DB_PASSWORD","DATABASE_URL","DATABASE_JDBC_URL","CLOUD_RUN_JOB_TRIGGER_URL_migration","CLOUD_RUN_JOB_TRIGGER_URL_send_reminders","GCLOUD_DEPLOY_credentialsKey"]",
|
|
1252
|
+
"_ALL_ENV_VAR_KEYS": "["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","CLOUD_SQL_INSTANCE_CONNECTION_NAME","DB_NAME","DB_USER","DB_PASSWORD","DATABASE_URL","DATABASE_JDBC_URL","CLOUD_RUN_JOB_TRIGGER_URL_migration","CLOUD_RUN_JOB_TRIGGER_URL_send_reminders","GCLOUD_DEPLOY_credentialsKey","GCLOUD_RUN_canonicalHostSuffix"]",
|
|
1253
1253
|
},
|
|
1254
1254
|
},
|
|
1255
1255
|
"api 🛑 Stop ⚠️ | review ": {
|
|
@@ -1292,7 +1292,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
|
|
|
1292
1292
|
"echo "deleting database pan-test-app-review-mr1234-api..."",
|
|
1293
1293
|
"echo "👆 this can take multiple attemps (3-5min), because google cloud run may still have a connection to the database after the cloud run service is shut down"",
|
|
1294
1294
|
"
|
|
1295
|
-
until gcloud sql databases delete pan-test-app-review-mr1234-api --instance=instancename --project projectId
|
|
1295
|
+
until gcloud sql databases delete pan-test-app-review-mr1234-api --instance=instancename --project projectId
|
|
1296
1296
|
do
|
|
1297
1297
|
echo "Trying again."
|
|
1298
1298
|
sleep 10
|
|
@@ -1480,6 +1480,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
|
|
|
1480
1480
|
"ENV_SHORT": "review",
|
|
1481
1481
|
"ENV_TYPE": "review",
|
|
1482
1482
|
"GCLOUD_DEPLOY_credentialsKey": "$CL_review_www_GCLOUD_DEPLOY_credentialsKey",
|
|
1483
|
+
"GCLOUD_RUN_canonicalHostSuffix": "$CL_review_www_GCLOUD_RUN_canonicalHostSuffix",
|
|
1483
1484
|
"HOST": "pan-test-app-review-mr1234-www-unknown-host.example.com",
|
|
1484
1485
|
"HOST_CANONICAL": "pan-test-app-review-mr1234-www-unknown-host.example.com",
|
|
1485
1486
|
"KUBERNETES_CPU_LIMIT": "2",
|
|
@@ -1487,7 +1488,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
|
|
|
1487
1488
|
"KUBERNETES_MEMORY_LIMIT": "4Gi",
|
|
1488
1489
|
"KUBERNETES_MEMORY_REQUEST": "2Gi",
|
|
1489
1490
|
"ROOT_URL": "https://pan-test-app-review-mr1234-www-unknown-host.example.com",
|
|
1490
|
-
"_ALL_ENV_VAR_KEYS": "["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","GCLOUD_DEPLOY_credentialsKey","API_URL"]",
|
|
1491
|
+
"_ALL_ENV_VAR_KEYS": "["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","GCLOUD_DEPLOY_credentialsKey","GCLOUD_RUN_canonicalHostSuffix","API_URL"]",
|
|
1491
1492
|
},
|
|
1492
1493
|
},
|
|
1493
1494
|
"www 🔨 docker | review ": {
|
|
@@ -1633,11 +1634,8 @@ COPY --chown=node:node www/yarn.lock /app/www/yarn.lock",
|
|
|
1633
1634
|
"API_URL": "https://pan-test-app-review-mr1234-api-unknown-host.example.com/graphql",
|
|
1634
1635
|
"APP_DIR": "www",
|
|
1635
1636
|
"CLOUDSDK_CORE_DISABLE_PROMPTS": "1",
|
|
1636
|
-
"DOCKERFILE_ADDITIONS": undefined,
|
|
1637
|
-
"DOCKERFILE_ADDITIONS_END": undefined,
|
|
1638
1637
|
"DOCKER_BUILDKIT": "1",
|
|
1639
1638
|
"DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/www",
|
|
1640
|
-
"DOCKER_DIR": ".",
|
|
1641
1639
|
"DOCKER_DRIVER": "overlay2",
|
|
1642
1640
|
"DOCKER_HOST": "tcp://0.0.0.0:2375",
|
|
1643
1641
|
"DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
|
|
@@ -1654,18 +1652,20 @@ ENV_TYPE: 'review'
|
|
|
1654
1652
|
HOST: 'pan-test-app-review-mr1234-www-unknown-host.example.com'
|
|
1655
1653
|
ROOT_URL: 'https://pan-test-app-review-mr1234-www-unknown-host.example.com'
|
|
1656
1654
|
HOST_CANONICAL: 'pan-test-app-review-mr1234-www-unknown-host.example.com'
|
|
1655
|
+
GCLOUD_RUN_canonicalHostSuffix: '$CL_review_www_GCLOUD_RUN_canonicalHostSuffix'
|
|
1657
1656
|
API_URL: 'https://pan-test-app-review-mr1234-api-unknown-host.example.com/graphql'
|
|
1658
|
-
_ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","GCLOUD_DEPLOY_credentialsKey","API_URL"]'
|
|
1657
|
+
_ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","GCLOUD_DEPLOY_credentialsKey","GCLOUD_RUN_canonicalHostSuffix","API_URL"]'
|
|
1659
1658
|
",
|
|
1660
1659
|
"GCLOUD_DEPLOY_credentialsKey": "$CL_review_www_GCLOUD_DEPLOY_credentialsKey",
|
|
1660
|
+
"GCLOUD_RUN_canonicalHostSuffix": "$CL_review_www_GCLOUD_RUN_canonicalHostSuffix",
|
|
1661
1661
|
"HOST": "pan-test-app-review-mr1234-www-unknown-host.example.com",
|
|
1662
1662
|
"HOST_CANONICAL": "pan-test-app-review-mr1234-www-unknown-host.example.com",
|
|
1663
1663
|
"KUBERNETES_CPU_LIMIT": "1",
|
|
1664
1664
|
"KUBERNETES_CPU_REQUEST": "0.5",
|
|
1665
|
-
"KUBERNETES_MEMORY_LIMIT": "
|
|
1666
|
-
"KUBERNETES_MEMORY_REQUEST": "
|
|
1665
|
+
"KUBERNETES_MEMORY_LIMIT": "500Mi",
|
|
1666
|
+
"KUBERNETES_MEMORY_REQUEST": "200Mi",
|
|
1667
1667
|
"ROOT_URL": "https://pan-test-app-review-mr1234-www-unknown-host.example.com",
|
|
1668
|
-
"_ALL_ENV_VAR_KEYS": "["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","GCLOUD_DEPLOY_credentialsKey","API_URL"]",
|
|
1668
|
+
"_ALL_ENV_VAR_KEYS": "["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","GCLOUD_DEPLOY_credentialsKey","GCLOUD_RUN_canonicalHostSuffix","API_URL"]",
|
|
1669
1669
|
},
|
|
1670
1670
|
},
|
|
1671
1671
|
"www 🛑 Stop ⚠️ | review ": {
|
|
@@ -1919,6 +1919,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
|
|
|
1919
1919
|
"ENV_SHORT": "prod",
|
|
1920
1920
|
"ENV_TYPE": "prod",
|
|
1921
1921
|
"GCLOUD_DEPLOY_credentialsKey": "$CL_prod_api_GCLOUD_DEPLOY_credentialsKey",
|
|
1922
|
+
"GCLOUD_RUN_canonicalHostSuffix": "$CL_prod_api_GCLOUD_RUN_canonicalHostSuffix",
|
|
1922
1923
|
"HOST": "pan-test-app-prod-api-unknown-host.example.com",
|
|
1923
1924
|
"HOST_CANONICAL": "pan-test-app-prod-api-unknown-host.example.com",
|
|
1924
1925
|
"KUBERNETES_CPU_LIMIT": "2",
|
|
@@ -1926,7 +1927,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
|
|
|
1926
1927
|
"KUBERNETES_MEMORY_LIMIT": "4Gi",
|
|
1927
1928
|
"KUBERNETES_MEMORY_REQUEST": "2Gi",
|
|
1928
1929
|
"ROOT_URL": "https://pan-test-app-prod-api-unknown-host.example.com",
|
|
1929
|
-
"_ALL_ENV_VAR_KEYS": "["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","CLOUD_SQL_INSTANCE_CONNECTION_NAME","DB_NAME","DB_USER","DB_PASSWORD","DATABASE_URL","DATABASE_JDBC_URL","CLOUD_RUN_JOB_TRIGGER_URL_migration","CLOUD_RUN_JOB_TRIGGER_URL_send_reminders","GCLOUD_DEPLOY_credentialsKey"]",
|
|
1930
|
+
"_ALL_ENV_VAR_KEYS": "["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","CLOUD_SQL_INSTANCE_CONNECTION_NAME","DB_NAME","DB_USER","DB_PASSWORD","DATABASE_URL","DATABASE_JDBC_URL","CLOUD_RUN_JOB_TRIGGER_URL_migration","CLOUD_RUN_JOB_TRIGGER_URL_send_reminders","GCLOUD_DEPLOY_credentialsKey","GCLOUD_RUN_canonicalHostSuffix"]",
|
|
1930
1931
|
},
|
|
1931
1932
|
},
|
|
1932
1933
|
"api 🔨 app | stage ": {
|
|
@@ -1996,6 +1997,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
|
|
|
1996
1997
|
"ENV_SHORT": "stage",
|
|
1997
1998
|
"ENV_TYPE": "stage",
|
|
1998
1999
|
"GCLOUD_DEPLOY_credentialsKey": "$CL_stage_api_GCLOUD_DEPLOY_credentialsKey",
|
|
2000
|
+
"GCLOUD_RUN_canonicalHostSuffix": "$CL_stage_api_GCLOUD_RUN_canonicalHostSuffix",
|
|
1999
2001
|
"HOST": "pan-test-app-stage-api-unknown-host.example.com",
|
|
2000
2002
|
"HOST_CANONICAL": "pan-test-app-stage-api-unknown-host.example.com",
|
|
2001
2003
|
"KUBERNETES_CPU_LIMIT": "2",
|
|
@@ -2003,7 +2005,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
|
|
|
2003
2005
|
"KUBERNETES_MEMORY_LIMIT": "4Gi",
|
|
2004
2006
|
"KUBERNETES_MEMORY_REQUEST": "2Gi",
|
|
2005
2007
|
"ROOT_URL": "https://pan-test-app-stage-api-unknown-host.example.com",
|
|
2006
|
-
"_ALL_ENV_VAR_KEYS": "["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","CLOUD_SQL_INSTANCE_CONNECTION_NAME","DB_NAME","DB_USER","DB_PASSWORD","DATABASE_URL","DATABASE_JDBC_URL","CLOUD_RUN_JOB_TRIGGER_URL_migration","CLOUD_RUN_JOB_TRIGGER_URL_send_reminders","GCLOUD_DEPLOY_credentialsKey"]",
|
|
2008
|
+
"_ALL_ENV_VAR_KEYS": "["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","CLOUD_SQL_INSTANCE_CONNECTION_NAME","DB_NAME","DB_USER","DB_PASSWORD","DATABASE_URL","DATABASE_JDBC_URL","CLOUD_RUN_JOB_TRIGGER_URL_migration","CLOUD_RUN_JOB_TRIGGER_URL_send_reminders","GCLOUD_DEPLOY_credentialsKey","GCLOUD_RUN_canonicalHostSuffix"]",
|
|
2007
2009
|
},
|
|
2008
2010
|
},
|
|
2009
2011
|
"api 🔨 docker | prod ": {
|
|
@@ -2227,11 +2229,8 @@ COPY --chown=node:node api/yarn.lock /app/api/yarn.lock",
|
|
|
2227
2229
|
"DB_NAME": "pan-test-app-prod-api",
|
|
2228
2230
|
"DB_PASSWORD": "$CL_prod_api_DB_PASSWORD",
|
|
2229
2231
|
"DB_USER": "my-user",
|
|
2230
|
-
"DOCKERFILE_ADDITIONS": undefined,
|
|
2231
|
-
"DOCKERFILE_ADDITIONS_END": undefined,
|
|
2232
2232
|
"DOCKER_BUILDKIT": "1",
|
|
2233
2233
|
"DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
|
|
2234
|
-
"DOCKER_DIR": ".",
|
|
2235
2234
|
"DOCKER_DRIVER": "overlay2",
|
|
2236
2235
|
"DOCKER_HOST": "tcp://0.0.0.0:2375",
|
|
2237
2236
|
"DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
|
|
@@ -2256,17 +2255,19 @@ DATABASE_URL: 'postgresql://$DB_USER:$DB_PASSWORD@localhost/$DB_NAME?host=/cloud
|
|
|
2256
2255
|
DATABASE_JDBC_URL: 'jdbc:postgresql:///$DB_NAME?cloudSqlInstance=$CLOUD_SQL_INSTANCE_CONNECTION_NAME&socketFactory=com.google.cloud.sql.postgres.SocketFactory&user=$DB_USER&password=$DB_PASSWORD'
|
|
2257
2256
|
CLOUD_RUN_JOB_TRIGGER_URL_migration: 'https://europe-west6-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/google-project-id/jobs/pan-test-app-prod-api-migration:run'
|
|
2258
2257
|
CLOUD_RUN_JOB_TRIGGER_URL_send_reminders: 'https://europe-west6-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/google-project-id/jobs/pan-test-app-prod-api-send-reminders:run'
|
|
2259
|
-
|
|
2258
|
+
GCLOUD_RUN_canonicalHostSuffix: '$CL_prod_api_GCLOUD_RUN_canonicalHostSuffix'
|
|
2259
|
+
_ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","CLOUD_SQL_INSTANCE_CONNECTION_NAME","DB_NAME","DB_USER","DB_PASSWORD","DATABASE_URL","DATABASE_JDBC_URL","CLOUD_RUN_JOB_TRIGGER_URL_migration","CLOUD_RUN_JOB_TRIGGER_URL_send_reminders","GCLOUD_DEPLOY_credentialsKey","GCLOUD_RUN_canonicalHostSuffix"]'
|
|
2260
2260
|
",
|
|
2261
2261
|
"GCLOUD_DEPLOY_credentialsKey": "$CL_prod_api_GCLOUD_DEPLOY_credentialsKey",
|
|
2262
|
+
"GCLOUD_RUN_canonicalHostSuffix": "$CL_prod_api_GCLOUD_RUN_canonicalHostSuffix",
|
|
2262
2263
|
"HOST": "pan-test-app-prod-api-unknown-host.example.com",
|
|
2263
2264
|
"HOST_CANONICAL": "pan-test-app-prod-api-unknown-host.example.com",
|
|
2264
2265
|
"KUBERNETES_CPU_LIMIT": "1",
|
|
2265
2266
|
"KUBERNETES_CPU_REQUEST": "0.5",
|
|
2266
|
-
"KUBERNETES_MEMORY_LIMIT": "
|
|
2267
|
-
"KUBERNETES_MEMORY_REQUEST": "
|
|
2267
|
+
"KUBERNETES_MEMORY_LIMIT": "500Mi",
|
|
2268
|
+
"KUBERNETES_MEMORY_REQUEST": "200Mi",
|
|
2268
2269
|
"ROOT_URL": "https://pan-test-app-prod-api-unknown-host.example.com",
|
|
2269
|
-
"_ALL_ENV_VAR_KEYS": "["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","CLOUD_SQL_INSTANCE_CONNECTION_NAME","DB_NAME","DB_USER","DB_PASSWORD","DATABASE_URL","DATABASE_JDBC_URL","CLOUD_RUN_JOB_TRIGGER_URL_migration","CLOUD_RUN_JOB_TRIGGER_URL_send_reminders","GCLOUD_DEPLOY_credentialsKey"]",
|
|
2270
|
+
"_ALL_ENV_VAR_KEYS": "["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","CLOUD_SQL_INSTANCE_CONNECTION_NAME","DB_NAME","DB_USER","DB_PASSWORD","DATABASE_URL","DATABASE_JDBC_URL","CLOUD_RUN_JOB_TRIGGER_URL_migration","CLOUD_RUN_JOB_TRIGGER_URL_send_reminders","GCLOUD_DEPLOY_credentialsKey","GCLOUD_RUN_canonicalHostSuffix"]",
|
|
2270
2271
|
},
|
|
2271
2272
|
},
|
|
2272
2273
|
"api 🚀 Deploy | stage ": {
|
|
@@ -2358,11 +2359,8 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
|
|
|
2358
2359
|
"DB_NAME": "pan-test-app-stage-api",
|
|
2359
2360
|
"DB_PASSWORD": "$CL_stage_api_DB_PASSWORD",
|
|
2360
2361
|
"DB_USER": "my-user",
|
|
2361
|
-
"DOCKERFILE_ADDITIONS": undefined,
|
|
2362
|
-
"DOCKERFILE_ADDITIONS_END": undefined,
|
|
2363
2362
|
"DOCKER_BUILDKIT": "1",
|
|
2364
2363
|
"DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
|
|
2365
|
-
"DOCKER_DIR": ".",
|
|
2366
2364
|
"DOCKER_DRIVER": "overlay2",
|
|
2367
2365
|
"DOCKER_HOST": "tcp://0.0.0.0:2375",
|
|
2368
2366
|
"DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
|
|
@@ -2387,17 +2385,19 @@ DATABASE_URL: 'postgresql://$DB_USER:$DB_PASSWORD@localhost/$DB_NAME?host=/cloud
|
|
|
2387
2385
|
DATABASE_JDBC_URL: 'jdbc:postgresql:///$DB_NAME?cloudSqlInstance=$CLOUD_SQL_INSTANCE_CONNECTION_NAME&socketFactory=com.google.cloud.sql.postgres.SocketFactory&user=$DB_USER&password=$DB_PASSWORD'
|
|
2388
2386
|
CLOUD_RUN_JOB_TRIGGER_URL_migration: 'https://europe-west6-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/google-project-id/jobs/pan-test-app-stage-api-migration:run'
|
|
2389
2387
|
CLOUD_RUN_JOB_TRIGGER_URL_send_reminders: 'https://europe-west6-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/google-project-id/jobs/pan-test-app-stage-api-send-reminders:run'
|
|
2390
|
-
|
|
2388
|
+
GCLOUD_RUN_canonicalHostSuffix: '$CL_stage_api_GCLOUD_RUN_canonicalHostSuffix'
|
|
2389
|
+
_ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","CLOUD_SQL_INSTANCE_CONNECTION_NAME","DB_NAME","DB_USER","DB_PASSWORD","DATABASE_URL","DATABASE_JDBC_URL","CLOUD_RUN_JOB_TRIGGER_URL_migration","CLOUD_RUN_JOB_TRIGGER_URL_send_reminders","GCLOUD_DEPLOY_credentialsKey","GCLOUD_RUN_canonicalHostSuffix"]'
|
|
2391
2390
|
",
|
|
2392
2391
|
"GCLOUD_DEPLOY_credentialsKey": "$CL_stage_api_GCLOUD_DEPLOY_credentialsKey",
|
|
2392
|
+
"GCLOUD_RUN_canonicalHostSuffix": "$CL_stage_api_GCLOUD_RUN_canonicalHostSuffix",
|
|
2393
2393
|
"HOST": "pan-test-app-stage-api-unknown-host.example.com",
|
|
2394
2394
|
"HOST_CANONICAL": "pan-test-app-stage-api-unknown-host.example.com",
|
|
2395
2395
|
"KUBERNETES_CPU_LIMIT": "1",
|
|
2396
2396
|
"KUBERNETES_CPU_REQUEST": "0.5",
|
|
2397
|
-
"KUBERNETES_MEMORY_LIMIT": "
|
|
2398
|
-
"KUBERNETES_MEMORY_REQUEST": "
|
|
2397
|
+
"KUBERNETES_MEMORY_LIMIT": "500Mi",
|
|
2398
|
+
"KUBERNETES_MEMORY_REQUEST": "200Mi",
|
|
2399
2399
|
"ROOT_URL": "https://pan-test-app-stage-api-unknown-host.example.com",
|
|
2400
|
-
"_ALL_ENV_VAR_KEYS": "["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","CLOUD_SQL_INSTANCE_CONNECTION_NAME","DB_NAME","DB_USER","DB_PASSWORD","DATABASE_URL","DATABASE_JDBC_URL","CLOUD_RUN_JOB_TRIGGER_URL_migration","CLOUD_RUN_JOB_TRIGGER_URL_send_reminders","GCLOUD_DEPLOY_credentialsKey"]",
|
|
2400
|
+
"_ALL_ENV_VAR_KEYS": "["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","CLOUD_SQL_INSTANCE_CONNECTION_NAME","DB_NAME","DB_USER","DB_PASSWORD","DATABASE_URL","DATABASE_JDBC_URL","CLOUD_RUN_JOB_TRIGGER_URL_migration","CLOUD_RUN_JOB_TRIGGER_URL_send_reminders","GCLOUD_DEPLOY_credentialsKey","GCLOUD_RUN_canonicalHostSuffix"]",
|
|
2401
2401
|
},
|
|
2402
2402
|
},
|
|
2403
2403
|
"api 🛑 Stop ⚠️ | prod ": {
|
|
@@ -2556,6 +2556,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
|
|
|
2556
2556
|
"ENV_SHORT": "prod",
|
|
2557
2557
|
"ENV_TYPE": "prod",
|
|
2558
2558
|
"GCLOUD_DEPLOY_credentialsKey": "$CL_prod_www_GCLOUD_DEPLOY_credentialsKey",
|
|
2559
|
+
"GCLOUD_RUN_canonicalHostSuffix": "$CL_prod_www_GCLOUD_RUN_canonicalHostSuffix",
|
|
2559
2560
|
"HOST": "pan-test-app-prod-www-unknown-host.example.com",
|
|
2560
2561
|
"HOST_CANONICAL": "pan-test-app-prod-www-unknown-host.example.com",
|
|
2561
2562
|
"KUBERNETES_CPU_LIMIT": "2",
|
|
@@ -2563,7 +2564,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
|
|
|
2563
2564
|
"KUBERNETES_MEMORY_LIMIT": "4Gi",
|
|
2564
2565
|
"KUBERNETES_MEMORY_REQUEST": "2Gi",
|
|
2565
2566
|
"ROOT_URL": "https://pan-test-app-prod-www-unknown-host.example.com",
|
|
2566
|
-
"_ALL_ENV_VAR_KEYS": "["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","GCLOUD_DEPLOY_credentialsKey","API_URL"]",
|
|
2567
|
+
"_ALL_ENV_VAR_KEYS": "["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","GCLOUD_DEPLOY_credentialsKey","GCLOUD_RUN_canonicalHostSuffix","API_URL"]",
|
|
2567
2568
|
},
|
|
2568
2569
|
},
|
|
2569
2570
|
"www 🔨 app | stage ": {
|
|
@@ -2626,6 +2627,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
|
|
|
2626
2627
|
"ENV_SHORT": "stage",
|
|
2627
2628
|
"ENV_TYPE": "stage",
|
|
2628
2629
|
"GCLOUD_DEPLOY_credentialsKey": "$CL_stage_www_GCLOUD_DEPLOY_credentialsKey",
|
|
2630
|
+
"GCLOUD_RUN_canonicalHostSuffix": "$CL_stage_www_GCLOUD_RUN_canonicalHostSuffix",
|
|
2629
2631
|
"HOST": "pan-test-app-stage-www-unknown-host.example.com",
|
|
2630
2632
|
"HOST_CANONICAL": "pan-test-app-stage-www-unknown-host.example.com",
|
|
2631
2633
|
"KUBERNETES_CPU_LIMIT": "2",
|
|
@@ -2633,7 +2635,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
|
|
|
2633
2635
|
"KUBERNETES_MEMORY_LIMIT": "4Gi",
|
|
2634
2636
|
"KUBERNETES_MEMORY_REQUEST": "2Gi",
|
|
2635
2637
|
"ROOT_URL": "https://pan-test-app-stage-www-unknown-host.example.com",
|
|
2636
|
-
"_ALL_ENV_VAR_KEYS": "["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","GCLOUD_DEPLOY_credentialsKey","API_URL"]",
|
|
2638
|
+
"_ALL_ENV_VAR_KEYS": "["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","GCLOUD_DEPLOY_credentialsKey","GCLOUD_RUN_canonicalHostSuffix","API_URL"]",
|
|
2637
2639
|
},
|
|
2638
2640
|
},
|
|
2639
2641
|
"www 🔨 docker | prod ": {
|
|
@@ -2833,11 +2835,8 @@ COPY --chown=node:node www/yarn.lock /app/www/yarn.lock",
|
|
|
2833
2835
|
"API_URL": "https://pan-test-app-prod-api-unknown-host.example.com/graphql",
|
|
2834
2836
|
"APP_DIR": "www",
|
|
2835
2837
|
"CLOUDSDK_CORE_DISABLE_PROMPTS": "1",
|
|
2836
|
-
"DOCKERFILE_ADDITIONS": undefined,
|
|
2837
|
-
"DOCKERFILE_ADDITIONS_END": undefined,
|
|
2838
2838
|
"DOCKER_BUILDKIT": "1",
|
|
2839
2839
|
"DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/www",
|
|
2840
|
-
"DOCKER_DIR": ".",
|
|
2841
2840
|
"DOCKER_DRIVER": "overlay2",
|
|
2842
2841
|
"DOCKER_HOST": "tcp://0.0.0.0:2375",
|
|
2843
2842
|
"DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
|
|
@@ -2854,18 +2853,20 @@ ENV_TYPE: 'prod'
|
|
|
2854
2853
|
HOST: 'pan-test-app-prod-www-unknown-host.example.com'
|
|
2855
2854
|
ROOT_URL: 'https://pan-test-app-prod-www-unknown-host.example.com'
|
|
2856
2855
|
HOST_CANONICAL: 'pan-test-app-prod-www-unknown-host.example.com'
|
|
2856
|
+
GCLOUD_RUN_canonicalHostSuffix: '$CL_prod_www_GCLOUD_RUN_canonicalHostSuffix'
|
|
2857
2857
|
API_URL: 'https://pan-test-app-prod-api-unknown-host.example.com/graphql'
|
|
2858
|
-
_ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","GCLOUD_DEPLOY_credentialsKey","API_URL"]'
|
|
2858
|
+
_ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","GCLOUD_DEPLOY_credentialsKey","GCLOUD_RUN_canonicalHostSuffix","API_URL"]'
|
|
2859
2859
|
",
|
|
2860
2860
|
"GCLOUD_DEPLOY_credentialsKey": "$CL_prod_www_GCLOUD_DEPLOY_credentialsKey",
|
|
2861
|
+
"GCLOUD_RUN_canonicalHostSuffix": "$CL_prod_www_GCLOUD_RUN_canonicalHostSuffix",
|
|
2861
2862
|
"HOST": "pan-test-app-prod-www-unknown-host.example.com",
|
|
2862
2863
|
"HOST_CANONICAL": "pan-test-app-prod-www-unknown-host.example.com",
|
|
2863
2864
|
"KUBERNETES_CPU_LIMIT": "1",
|
|
2864
2865
|
"KUBERNETES_CPU_REQUEST": "0.5",
|
|
2865
|
-
"KUBERNETES_MEMORY_LIMIT": "
|
|
2866
|
-
"KUBERNETES_MEMORY_REQUEST": "
|
|
2866
|
+
"KUBERNETES_MEMORY_LIMIT": "500Mi",
|
|
2867
|
+
"KUBERNETES_MEMORY_REQUEST": "200Mi",
|
|
2867
2868
|
"ROOT_URL": "https://pan-test-app-prod-www-unknown-host.example.com",
|
|
2868
|
-
"_ALL_ENV_VAR_KEYS": "["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","GCLOUD_DEPLOY_credentialsKey","API_URL"]",
|
|
2869
|
+
"_ALL_ENV_VAR_KEYS": "["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","GCLOUD_DEPLOY_credentialsKey","GCLOUD_RUN_canonicalHostSuffix","API_URL"]",
|
|
2869
2870
|
},
|
|
2870
2871
|
},
|
|
2871
2872
|
"www 🚀 Deploy | stage ": {
|
|
@@ -2933,11 +2934,8 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
|
|
|
2933
2934
|
"API_URL": "https://pan-test-app-stage-api-unknown-host.example.com/graphql",
|
|
2934
2935
|
"APP_DIR": "www",
|
|
2935
2936
|
"CLOUDSDK_CORE_DISABLE_PROMPTS": "1",
|
|
2936
|
-
"DOCKERFILE_ADDITIONS": undefined,
|
|
2937
|
-
"DOCKERFILE_ADDITIONS_END": undefined,
|
|
2938
2937
|
"DOCKER_BUILDKIT": "1",
|
|
2939
2938
|
"DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/www",
|
|
2940
|
-
"DOCKER_DIR": ".",
|
|
2941
2939
|
"DOCKER_DRIVER": "overlay2",
|
|
2942
2940
|
"DOCKER_HOST": "tcp://0.0.0.0:2375",
|
|
2943
2941
|
"DOCKER_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
|
|
@@ -2954,18 +2952,20 @@ ENV_TYPE: 'stage'
|
|
|
2954
2952
|
HOST: 'pan-test-app-stage-www-unknown-host.example.com'
|
|
2955
2953
|
ROOT_URL: 'https://pan-test-app-stage-www-unknown-host.example.com'
|
|
2956
2954
|
HOST_CANONICAL: 'pan-test-app-stage-www-unknown-host.example.com'
|
|
2955
|
+
GCLOUD_RUN_canonicalHostSuffix: '$CL_stage_www_GCLOUD_RUN_canonicalHostSuffix'
|
|
2957
2956
|
API_URL: 'https://pan-test-app-stage-api-unknown-host.example.com/graphql'
|
|
2958
|
-
_ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","GCLOUD_DEPLOY_credentialsKey","API_URL"]'
|
|
2957
|
+
_ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","GCLOUD_DEPLOY_credentialsKey","GCLOUD_RUN_canonicalHostSuffix","API_URL"]'
|
|
2959
2958
|
",
|
|
2960
2959
|
"GCLOUD_DEPLOY_credentialsKey": "$CL_stage_www_GCLOUD_DEPLOY_credentialsKey",
|
|
2960
|
+
"GCLOUD_RUN_canonicalHostSuffix": "$CL_stage_www_GCLOUD_RUN_canonicalHostSuffix",
|
|
2961
2961
|
"HOST": "pan-test-app-stage-www-unknown-host.example.com",
|
|
2962
2962
|
"HOST_CANONICAL": "pan-test-app-stage-www-unknown-host.example.com",
|
|
2963
2963
|
"KUBERNETES_CPU_LIMIT": "1",
|
|
2964
2964
|
"KUBERNETES_CPU_REQUEST": "0.5",
|
|
2965
|
-
"KUBERNETES_MEMORY_LIMIT": "
|
|
2966
|
-
"KUBERNETES_MEMORY_REQUEST": "
|
|
2965
|
+
"KUBERNETES_MEMORY_LIMIT": "500Mi",
|
|
2966
|
+
"KUBERNETES_MEMORY_REQUEST": "200Mi",
|
|
2967
2967
|
"ROOT_URL": "https://pan-test-app-stage-www-unknown-host.example.com",
|
|
2968
|
-
"_ALL_ENV_VAR_KEYS": "["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","GCLOUD_DEPLOY_credentialsKey","API_URL"]",
|
|
2968
|
+
"_ALL_ENV_VAR_KEYS": "["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","GCLOUD_DEPLOY_credentialsKey","GCLOUD_RUN_canonicalHostSuffix","API_URL"]",
|
|
2969
2969
|
},
|
|
2970
2970
|
},
|
|
2971
2971
|
"www 🛑 Stop ⚠️ | prod ": {
|