@catladder/pipeline 1.156.4 → 1.157.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (48) hide show
  1. package/dist/build/docker.d.ts +4 -4
  2. package/dist/build/docker.js +3 -2
  3. package/dist/build/types.d.ts +6 -0
  4. package/dist/bundles/catladder-gitlab/index.js +1 -1
  5. package/dist/constants.js +1 -1
  6. package/dist/pipeline/createChildPipeline.js +2 -1
  7. package/dist/pipeline/createMainPipeline.js +2 -1
  8. package/dist/tsconfig.tsbuildinfo +1 -1
  9. package/dist/types/config.d.ts +4 -0
  10. package/examples/__snapshots__/cloud-run-memory-limit.ts.snap +8 -8
  11. package/examples/__snapshots__/cloud-run-meteor-with-worker.ts.snap +8 -8
  12. package/examples/__snapshots__/cloud-run-no-cpu-throttling.ts.snap +8 -8
  13. package/examples/__snapshots__/cloud-run-no-service.ts.snap +8 -8
  14. package/examples/__snapshots__/cloud-run-non-public.ts.snap +8 -8
  15. package/examples/__snapshots__/cloud-run-post-stop-job.ts.snap +8 -8
  16. package/examples/__snapshots__/cloud-run-service-gen2.ts.snap +8 -8
  17. package/examples/__snapshots__/cloud-run-service-increase-timout.ts.snap +8 -8
  18. package/examples/__snapshots__/cloud-run-service-with-volumes.ts.snap +8 -8
  19. package/examples/__snapshots__/cloud-run-storybook.ts.snap +8 -8
  20. package/examples/__snapshots__/cloud-run-with-ngnix.ts.snap +8 -8
  21. package/examples/__snapshots__/cloud-run-with-sql-reuse-db.ts.snap +16 -16
  22. package/examples/__snapshots__/cloud-run-with-sql.ts.snap +16 -16
  23. package/examples/__snapshots__/cloud-run-with-worker.ts.snap +8 -8
  24. package/examples/__snapshots__/custom-build-job-with-tests.ts.snap +8 -8
  25. package/examples/__snapshots__/custom-build-job.ts.snap +8 -8
  26. package/examples/__snapshots__/custom-deploy.ts.snap +8 -8
  27. package/examples/__snapshots__/custom-sbom-java.ts.snap +40 -40
  28. package/examples/__snapshots__/git-submodule.ts.snap +1962 -0
  29. package/examples/__snapshots__/kubernetes-application-customization.ts.snap +8 -8
  30. package/examples/__snapshots__/kubernetes-with-cloud-sql-legacy.ts.snap +8 -8
  31. package/examples/__snapshots__/kubernetes-with-cloud-sql.ts.snap +8 -8
  32. package/examples/__snapshots__/kubernetes-with-jobs.ts.snap +16 -16
  33. package/examples/__snapshots__/kubernetes-with-mongodb.ts.snap +8 -8
  34. package/examples/__snapshots__/local-dot-env.ts.snap +8 -8
  35. package/examples/__snapshots__/meteor-kubernetes.ts.snap +8 -8
  36. package/examples/__snapshots__/multiline-var.ts.snap +16 -16
  37. package/examples/__snapshots__/native-app.ts.snap +8 -8
  38. package/examples/__snapshots__/node-build-with-custom-image.ts.snap +8 -8
  39. package/examples/__snapshots__/node-build-with-docker-additions.ts.snap +8 -8
  40. package/examples/__snapshots__/rails-k8s-with-worker.ts.snap +12 -12
  41. package/examples/custom-sbom-java.ts +5 -2
  42. package/examples/git-submodule.ts +29 -0
  43. package/package.json +1 -1
  44. package/src/build/docker.ts +8 -2
  45. package/src/build/types.ts +7 -0
  46. package/src/pipeline/createChildPipeline.ts +1 -0
  47. package/src/pipeline/createMainPipeline.ts +1 -0
  48. package/src/types/config.ts +5 -0
package/examples/__snapshots__/custom-build-job.ts.snap CHANGED
@@ -77,7 +77,7 @@ exports[`matches snapshot 1`] = `
77
77
  "script": [
78
78
  "echo -e "\\e[0Ksection_start:$(date +%s):injectvars[collapsed=true]\\r\\e[0KInjecting variables"",
79
79
  "export APP_DIR="www"",
80
- "export DOCKER_DIR="."",
80
+ "export DOCKER_BUILD_CONTEXT="."",
81
81
  "export DOCKER_REGISTRY="asia-east1-docker.pkg.dev"",
82
82
  "export DOCKER_IMAGE="asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/www"",
83
83
  "export DOCKER_CACHE_IMAGE="asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www"",
@@ -89,7 +89,7 @@ exports[`matches snapshot 1`] = `
89
89
  "gcloud auth configure-docker asia-east1-docker.pkg.dev",
90
90
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
91
91
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
92
- "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",
92
+ "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile $DOCKER_BUILD_CONTEXT --build-arg BUILDKIT_INLINE_CACHE=1",
93
93
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
94
94
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
95
95
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
@@ -464,7 +464,7 @@ EOF
464
464
  "script": [
465
465
  "echo -e "\\e[0Ksection_start:$(date +%s):injectvars[collapsed=true]\\r\\e[0KInjecting variables"",
466
466
  "export APP_DIR="www"",
467
- "export DOCKER_DIR="."",
467
+ "export DOCKER_BUILD_CONTEXT="."",
468
468
  "export DOCKER_REGISTRY="asia-east1-docker.pkg.dev"",
469
469
  "export DOCKER_IMAGE="asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/www/$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; })"",
470
470
  "export DOCKER_CACHE_IMAGE="asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www"",
@@ -476,7 +476,7 @@ EOF
476
476
  "gcloud auth configure-docker asia-east1-docker.pkg.dev",
477
477
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
478
478
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
479
- "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",
479
+ "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile $DOCKER_BUILD_CONTEXT --build-arg BUILDKIT_INLINE_CACHE=1",
480
480
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
481
481
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
482
482
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
@@ -913,7 +913,7 @@ EOF
913
913
  "script": [
914
914
  "echo -e "\\e[0Ksection_start:$(date +%s):injectvars[collapsed=true]\\r\\e[0KInjecting variables"",
915
915
  "export APP_DIR="www"",
916
- "export DOCKER_DIR="."",
916
+ "export DOCKER_BUILD_CONTEXT="."",
917
917
  "export DOCKER_REGISTRY="asia-east1-docker.pkg.dev"",
918
918
  "export DOCKER_IMAGE="asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/www"",
919
919
  "export DOCKER_CACHE_IMAGE="asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www"",
@@ -925,7 +925,7 @@ EOF
925
925
  "gcloud auth configure-docker asia-east1-docker.pkg.dev",
926
926
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
927
927
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
928
- "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",
928
+ "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile $DOCKER_BUILD_CONTEXT --build-arg BUILDKIT_INLINE_CACHE=1",
929
929
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
930
930
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
931
931
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
@@ -968,7 +968,7 @@ EOF
968
968
  "script": [
969
969
  "echo -e "\\e[0Ksection_start:$(date +%s):injectvars[collapsed=true]\\r\\e[0KInjecting variables"",
970
970
  "export APP_DIR="www"",
971
- "export DOCKER_DIR="."",
971
+ "export DOCKER_BUILD_CONTEXT="."",
972
972
  "export DOCKER_REGISTRY="asia-east1-docker.pkg.dev"",
973
973
  "export DOCKER_IMAGE="asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/www"",
974
974
  "export DOCKER_CACHE_IMAGE="asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/www"",
@@ -980,7 +980,7 @@ EOF
980
980
  "gcloud auth configure-docker asia-east1-docker.pkg.dev",
981
981
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
982
982
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
983
- "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",
983
+ "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile $DOCKER_BUILD_CONTEXT --build-arg BUILDKIT_INLINE_CACHE=1",
984
984
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
985
985
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
986
986
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
package/examples/__snapshots__/custom-deploy.ts.snap CHANGED
@@ -165,7 +165,7 @@ exports[`matches snapshot 1`] = `
165
165
  "script": [
166
166
  "echo -e "\\e[0Ksection_start:$(date +%s):injectvars[collapsed=true]\\r\\e[0KInjecting variables"",
167
167
  "export APP_DIR="www"",
168
- "export DOCKER_DIR="."",
168
+ "export DOCKER_BUILD_CONTEXT="."",
169
169
  "export DOCKER_REGISTRY="$CI_REGISTRY"",
170
170
  "export DOCKER_CACHE_IMAGE="$CI_REGISTRY_IMAGE/caches/www"",
171
171
  "export DOCKER_IMAGE_NAME="dev/www"",
@@ -184,7 +184,7 @@ COPY --chown=node:node .yarn /app/.yarn"",
184
184
  "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
185
185
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
186
186
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
187
- "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",
187
+ "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile $DOCKER_BUILD_CONTEXT --build-arg BUILDKIT_INLINE_CACHE=1",
188
188
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
189
189
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
190
190
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
@@ -683,7 +683,7 @@ COPY --chown=node:node .yarn /app/.yarn"",
683
683
  "script": [
684
684
  "echo -e "\\e[0Ksection_start:$(date +%s):injectvars[collapsed=true]\\r\\e[0KInjecting variables"",
685
685
  "export APP_DIR="www"",
686
- "export DOCKER_DIR="."",
686
+ "export DOCKER_BUILD_CONTEXT="."",
687
687
  "export DOCKER_REGISTRY="$CI_REGISTRY"",
688
688
  "export DOCKER_CACHE_IMAGE="$CI_REGISTRY_IMAGE/caches/www"",
689
689
  "export DOCKER_IMAGE_NAME="review/www"",
@@ -702,7 +702,7 @@ COPY --chown=node:node .yarn /app/.yarn"",
702
702
  "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
703
703
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
704
704
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
705
- "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",
705
+ "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile $DOCKER_BUILD_CONTEXT --build-arg BUILDKIT_INLINE_CACHE=1",
706
706
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
707
707
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
708
708
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
@@ -1232,7 +1232,7 @@ COPY --chown=node:node .yarn /app/.yarn"",
1232
1232
  "script": [
1233
1233
  "echo -e "\\e[0Ksection_start:$(date +%s):injectvars[collapsed=true]\\r\\e[0KInjecting variables"",
1234
1234
  "export APP_DIR="www"",
1235
- "export DOCKER_DIR="."",
1235
+ "export DOCKER_BUILD_CONTEXT="."",
1236
1236
  "export DOCKER_REGISTRY="$CI_REGISTRY"",
1237
1237
  "export DOCKER_CACHE_IMAGE="$CI_REGISTRY_IMAGE/caches/www"",
1238
1238
  "export DOCKER_IMAGE_NAME="prod/www"",
@@ -1251,7 +1251,7 @@ COPY --chown=node:node .yarn /app/.yarn"",
1251
1251
  "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
1252
1252
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
1253
1253
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
1254
- "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",
1254
+ "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile $DOCKER_BUILD_CONTEXT --build-arg BUILDKIT_INLINE_CACHE=1",
1255
1255
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
1256
1256
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
1257
1257
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
@@ -1303,7 +1303,7 @@ COPY --chown=node:node .yarn /app/.yarn"",
1303
1303
  "script": [
1304
1304
  "echo -e "\\e[0Ksection_start:$(date +%s):injectvars[collapsed=true]\\r\\e[0KInjecting variables"",
1305
1305
  "export APP_DIR="www"",
1306
- "export DOCKER_DIR="."",
1306
+ "export DOCKER_BUILD_CONTEXT="."",
1307
1307
  "export DOCKER_REGISTRY="$CI_REGISTRY"",
1308
1308
  "export DOCKER_CACHE_IMAGE="$CI_REGISTRY_IMAGE/caches/www"",
1309
1309
  "export DOCKER_IMAGE_NAME="stage/www"",
@@ -1322,7 +1322,7 @@ COPY --chown=node:node .yarn /app/.yarn"",
1322
1322
  "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
1323
1323
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
1324
1324
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
1325
- "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",
1325
+ "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile $DOCKER_BUILD_CONTEXT --build-arg BUILDKIT_INLINE_CACHE=1",
1326
1326
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
1327
1327
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
1328
1328
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
package/examples/__snapshots__/custom-sbom-java.ts.snap CHANGED
@@ -9,8 +9,8 @@ exports[`matches snapshot 1`] = `
9
9
  "artifacts": {
10
10
  "expire_in": "1 day",
11
11
  "paths": [
12
- "__build_info.json",
13
- "dist",
12
+ "app/__build_info.json",
13
+ "app/dist",
14
14
  ],
15
15
  "reports": {
16
16
  "junit": undefined,
@@ -31,7 +31,7 @@ exports[`matches snapshot 1`] = `
31
31
  "script": [
32
32
  "echo -e "\\e[0Ksection_start:$(date +%s):injectvars[collapsed=true]\\r\\e[0KInjecting variables"",
33
33
  "export ENV_SHORT="dev"",
34
- "export APP_DIR="."",
34
+ "export APP_DIR="app"",
35
35
  "export ENV_TYPE="dev"",
36
36
  "export BUILD_INFO_BUILD_ID="$(git describe --tags 2>/dev/null || git rev-parse HEAD)"",
37
37
  "export BUILD_INFO_BUILD_TIME="$CI_JOB_STARTED_AT"",
@@ -47,12 +47,12 @@ exports[`matches snapshot 1`] = `
47
47
  "export GCLOUD_RUN_canonicalHostSuffix="$CL_dev_app_GCLOUD_RUN_canonicalHostSuffix"",
48
48
  "export _ALL_ENV_VAR_KEYS="[\\"ENV_SHORT\\",\\"APP_DIR\\",\\"ENV_TYPE\\",\\"BUILD_INFO_BUILD_ID\\",\\"BUILD_INFO_BUILD_TIME\\",\\"BUILD_INFO_CURRENT_VERSION\\",\\"HOST\\",\\"ROOT_URL\\",\\"HOST_INTERNAL\\",\\"HOST_CANONICAL\\",\\"ROOT_URL_INTERNAL\\",\\"DEPLOY_CLOUD_RUN_PROJECT_ID\\",\\"DEPLOY_CLOUD_RUN_REGION\\",\\"GCLOUD_DEPLOY_credentialsKey\\",\\"GCLOUD_RUN_canonicalHostSuffix\\"]"",
49
49
  "echo -e "\\e[0Ksection_end:$(date +%s):injectvars\\r\\e[0K"",
50
- "echo '{"id":"$(git describe --tags 2>/dev/null || git rev-parse HEAD)","time":"$CI_JOB_STARTED_AT"}' > ./__build_info.json",
50
+ "echo '{"id":"$(git describe --tags 2>/dev/null || git rev-parse HEAD)","time":"$CI_JOB_STARTED_AT"}' > app/__build_info.json",
51
51
  "echo -e "\\e[0Ksection_start:$(date +%s):nodeinstall[collapsed=true]\\r\\e[0KEnsure node version"",
52
52
  "if [ -f ~/.nvm/nvm.sh ]; then source ~/.nvm/nvm.sh; fi",
53
53
  "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
54
54
  "echo -e "\\e[0Ksection_end:$(date +%s):nodeinstall\\r\\e[0K"",
55
- "cd .",
55
+ "cd app",
56
56
  "mvn package",
57
57
  "cp -r target dist",
58
58
  ],
@@ -78,8 +78,8 @@ exports[`matches snapshot 1`] = `
78
78
  },
79
79
  "script": [
80
80
  "echo -e "\\e[0Ksection_start:$(date +%s):injectvars[collapsed=true]\\r\\e[0KInjecting variables"",
81
- "export APP_DIR="."",
82
- "export DOCKER_DIR="."",
81
+ "export APP_DIR="app"",
82
+ "export DOCKER_BUILD_CONTEXT="app"",
83
83
  "export DOCKER_REGISTRY="asia-east1-docker.pkg.dev"",
84
84
  "export DOCKER_IMAGE="asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/dev/app"",
85
85
  "export DOCKER_CACHE_IMAGE="asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/app"",
@@ -90,7 +90,7 @@ exports[`matches snapshot 1`] = `
90
90
  "gcloud auth configure-docker asia-east1-docker.pkg.dev",
91
91
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
92
92
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
93
- "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",
93
+ "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile $DOCKER_BUILD_CONTEXT --build-arg BUILDKIT_INLINE_CACHE=1",
94
94
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
95
95
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
96
96
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
@@ -161,7 +161,7 @@ exports[`matches snapshot 1`] = `
161
161
  "script": [
162
162
  "echo -e "\\e[0Ksection_start:$(date +%s):injectvars[collapsed=true]\\r\\e[0KInjecting variables"",
163
163
  "export ENV_SHORT="dev"",
164
- "export APP_DIR="."",
164
+ "export APP_DIR="app"",
165
165
  "export ENV_TYPE="dev"",
166
166
  "export BUILD_INFO_BUILD_ID="$(git describe --tags 2>/dev/null || git rev-parse HEAD)"",
167
167
  "export BUILD_INFO_BUILD_TIME="$CI_JOB_STARTED_AT"",
@@ -192,7 +192,7 @@ exports[`matches snapshot 1`] = `
192
192
  ENV_SHORT: |-
193
193
  dev
194
194
  APP_DIR: |-
195
- .
195
+ app
196
196
  ENV_TYPE: |-
197
197
  dev
198
198
  BUILD_INFO_BUILD_ID: |-
@@ -398,8 +398,8 @@ EOF
398
398
  "artifacts": {
399
399
  "expire_in": "1 day",
400
400
  "paths": [
401
- "__build_info.json",
402
- "dist",
401
+ "app/__build_info.json",
402
+ "app/dist",
403
403
  ],
404
404
  "reports": {
405
405
  "junit": undefined,
@@ -420,7 +420,7 @@ EOF
420
420
  "script": [
421
421
  "echo -e "\\e[0Ksection_start:$(date +%s):injectvars[collapsed=true]\\r\\e[0KInjecting variables"",
422
422
  "export ENV_SHORT="review"",
423
- "export APP_DIR="."",
423
+ "export APP_DIR="app"",
424
424
  "export ENV_TYPE="review"",
425
425
  "export BUILD_INFO_BUILD_ID="$(git describe --tags 2>/dev/null || git rev-parse HEAD)"",
426
426
  "export BUILD_INFO_BUILD_TIME="$CI_JOB_STARTED_AT"",
@@ -436,12 +436,12 @@ EOF
436
436
  "export GCLOUD_RUN_canonicalHostSuffix="$CL_review_app_GCLOUD_RUN_canonicalHostSuffix"",
437
437
  "export _ALL_ENV_VAR_KEYS="[\\"ENV_SHORT\\",\\"APP_DIR\\",\\"ENV_TYPE\\",\\"BUILD_INFO_BUILD_ID\\",\\"BUILD_INFO_BUILD_TIME\\",\\"BUILD_INFO_CURRENT_VERSION\\",\\"HOST\\",\\"ROOT_URL\\",\\"HOST_INTERNAL\\",\\"HOST_CANONICAL\\",\\"ROOT_URL_INTERNAL\\",\\"DEPLOY_CLOUD_RUN_PROJECT_ID\\",\\"DEPLOY_CLOUD_RUN_REGION\\",\\"GCLOUD_DEPLOY_credentialsKey\\",\\"GCLOUD_RUN_canonicalHostSuffix\\"]"",
438
438
  "echo -e "\\e[0Ksection_end:$(date +%s):injectvars\\r\\e[0K"",
439
- "echo '{"id":"$(git describe --tags 2>/dev/null || git rev-parse HEAD)","time":"$CI_JOB_STARTED_AT"}' > ./__build_info.json",
439
+ "echo '{"id":"$(git describe --tags 2>/dev/null || git rev-parse HEAD)","time":"$CI_JOB_STARTED_AT"}' > app/__build_info.json",
440
440
  "echo -e "\\e[0Ksection_start:$(date +%s):nodeinstall[collapsed=true]\\r\\e[0KEnsure node version"",
441
441
  "if [ -f ~/.nvm/nvm.sh ]; then source ~/.nvm/nvm.sh; fi",
442
442
  "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
443
443
  "echo -e "\\e[0Ksection_end:$(date +%s):nodeinstall\\r\\e[0K"",
444
- "cd .",
444
+ "cd app",
445
445
  "mvn package",
446
446
  "cp -r target dist",
447
447
  ],
@@ -467,8 +467,8 @@ EOF
467
467
  },
468
468
  "script": [
469
469
  "echo -e "\\e[0Ksection_start:$(date +%s):injectvars[collapsed=true]\\r\\e[0KInjecting variables"",
470
- "export APP_DIR="."",
471
- "export DOCKER_DIR="."",
470
+ "export APP_DIR="app"",
471
+ "export DOCKER_BUILD_CONTEXT="app"",
472
472
  "export DOCKER_REGISTRY="asia-east1-docker.pkg.dev"",
473
473
  "export DOCKER_IMAGE="asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/review/app/$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; })"",
474
474
  "export DOCKER_CACHE_IMAGE="asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/app"",
@@ -479,7 +479,7 @@ EOF
479
479
  "gcloud auth configure-docker asia-east1-docker.pkg.dev",
480
480
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
481
481
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
482
- "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",
482
+ "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile $DOCKER_BUILD_CONTEXT --build-arg BUILDKIT_INLINE_CACHE=1",
483
483
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
484
484
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
485
485
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
@@ -550,7 +550,7 @@ EOF
550
550
  "script": [
551
551
  "echo -e "\\e[0Ksection_start:$(date +%s):injectvars[collapsed=true]\\r\\e[0KInjecting variables"",
552
552
  "export ENV_SHORT="review"",
553
- "export APP_DIR="."",
553
+ "export APP_DIR="app"",
554
554
  "export ENV_TYPE="review"",
555
555
  "export BUILD_INFO_BUILD_ID="$(git describe --tags 2>/dev/null || git rev-parse HEAD)"",
556
556
  "export BUILD_INFO_BUILD_TIME="$CI_JOB_STARTED_AT"",
@@ -581,7 +581,7 @@ EOF
581
581
  ENV_SHORT: |-
582
582
  review
583
583
  APP_DIR: |-
584
- .
584
+ app
585
585
  ENV_TYPE: |-
586
586
  review
587
587
  BUILD_INFO_BUILD_ID: |-
@@ -793,8 +793,8 @@ EOF
793
793
  "artifacts": {
794
794
  "expire_in": "1 day",
795
795
  "paths": [
796
- "__build_info.json",
797
- "dist",
796
+ "app/__build_info.json",
797
+ "app/dist",
798
798
  ],
799
799
  "reports": {
800
800
  "junit": undefined,
@@ -815,7 +815,7 @@ EOF
815
815
  "script": [
816
816
  "echo -e "\\e[0Ksection_start:$(date +%s):injectvars[collapsed=true]\\r\\e[0KInjecting variables"",
817
817
  "export ENV_SHORT="prod"",
818
- "export APP_DIR="."",
818
+ "export APP_DIR="app"",
819
819
  "export ENV_TYPE="prod"",
820
820
  "export BUILD_INFO_BUILD_ID="$(git describe --tags 2>/dev/null || git rev-parse HEAD)"",
821
821
  "export BUILD_INFO_BUILD_TIME="$CI_JOB_STARTED_AT"",
@@ -831,12 +831,12 @@ EOF
831
831
  "export GCLOUD_RUN_canonicalHostSuffix="$CL_prod_app_GCLOUD_RUN_canonicalHostSuffix"",
832
832
  "export _ALL_ENV_VAR_KEYS="[\\"ENV_SHORT\\",\\"APP_DIR\\",\\"ENV_TYPE\\",\\"BUILD_INFO_BUILD_ID\\",\\"BUILD_INFO_BUILD_TIME\\",\\"BUILD_INFO_CURRENT_VERSION\\",\\"HOST\\",\\"ROOT_URL\\",\\"HOST_INTERNAL\\",\\"HOST_CANONICAL\\",\\"ROOT_URL_INTERNAL\\",\\"DEPLOY_CLOUD_RUN_PROJECT_ID\\",\\"DEPLOY_CLOUD_RUN_REGION\\",\\"GCLOUD_DEPLOY_credentialsKey\\",\\"GCLOUD_RUN_canonicalHostSuffix\\"]"",
833
833
  "echo -e "\\e[0Ksection_end:$(date +%s):injectvars\\r\\e[0K"",
834
- "echo '{"id":"$(git describe --tags 2>/dev/null || git rev-parse HEAD)","time":"$CI_JOB_STARTED_AT"}' > ./__build_info.json",
834
+ "echo '{"id":"$(git describe --tags 2>/dev/null || git rev-parse HEAD)","time":"$CI_JOB_STARTED_AT"}' > app/__build_info.json",
835
835
  "echo -e "\\e[0Ksection_start:$(date +%s):nodeinstall[collapsed=true]\\r\\e[0KEnsure node version"",
836
836
  "if [ -f ~/.nvm/nvm.sh ]; then source ~/.nvm/nvm.sh; fi",
837
837
  "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
838
838
  "echo -e "\\e[0Ksection_end:$(date +%s):nodeinstall\\r\\e[0K"",
839
- "cd .",
839
+ "cd app",
840
840
  "mvn package",
841
841
  "cp -r target dist",
842
842
  ],
@@ -851,8 +851,8 @@ EOF
851
851
  "artifacts": {
852
852
  "expire_in": "1 day",
853
853
  "paths": [
854
- "__build_info.json",
855
- "dist",
854
+ "app/__build_info.json",
855
+ "app/dist",
856
856
  ],
857
857
  "reports": {
858
858
  "junit": undefined,
@@ -873,7 +873,7 @@ EOF
873
873
  "script": [
874
874
  "echo -e "\\e[0Ksection_start:$(date +%s):injectvars[collapsed=true]\\r\\e[0KInjecting variables"",
875
875
  "export ENV_SHORT="stage"",
876
- "export APP_DIR="."",
876
+ "export APP_DIR="app"",
877
877
  "export ENV_TYPE="stage"",
878
878
  "export BUILD_INFO_BUILD_ID="$(git describe --tags 2>/dev/null || git rev-parse HEAD)"",
879
879
  "export BUILD_INFO_BUILD_TIME="$CI_JOB_STARTED_AT"",
@@ -889,12 +889,12 @@ EOF
889
889
  "export GCLOUD_RUN_canonicalHostSuffix="$CL_stage_app_GCLOUD_RUN_canonicalHostSuffix"",
890
890
  "export _ALL_ENV_VAR_KEYS="[\\"ENV_SHORT\\",\\"APP_DIR\\",\\"ENV_TYPE\\",\\"BUILD_INFO_BUILD_ID\\",\\"BUILD_INFO_BUILD_TIME\\",\\"BUILD_INFO_CURRENT_VERSION\\",\\"HOST\\",\\"ROOT_URL\\",\\"HOST_INTERNAL\\",\\"HOST_CANONICAL\\",\\"ROOT_URL_INTERNAL\\",\\"DEPLOY_CLOUD_RUN_PROJECT_ID\\",\\"DEPLOY_CLOUD_RUN_REGION\\",\\"GCLOUD_DEPLOY_credentialsKey\\",\\"GCLOUD_RUN_canonicalHostSuffix\\"]"",
891
891
  "echo -e "\\e[0Ksection_end:$(date +%s):injectvars\\r\\e[0K"",
892
- "echo '{"id":"$(git describe --tags 2>/dev/null || git rev-parse HEAD)","time":"$CI_JOB_STARTED_AT"}' > ./__build_info.json",
892
+ "echo '{"id":"$(git describe --tags 2>/dev/null || git rev-parse HEAD)","time":"$CI_JOB_STARTED_AT"}' > app/__build_info.json",
893
893
  "echo -e "\\e[0Ksection_start:$(date +%s):nodeinstall[collapsed=true]\\r\\e[0KEnsure node version"",
894
894
  "if [ -f ~/.nvm/nvm.sh ]; then source ~/.nvm/nvm.sh; fi",
895
895
  "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
896
896
  "echo -e "\\e[0Ksection_end:$(date +%s):nodeinstall\\r\\e[0K"",
897
- "cd .",
897
+ "cd app",
898
898
  "mvn package",
899
899
  "cp -r target dist",
900
900
  ],
@@ -920,8 +920,8 @@ EOF
920
920
  },
921
921
  "script": [
922
922
  "echo -e "\\e[0Ksection_start:$(date +%s):injectvars[collapsed=true]\\r\\e[0KInjecting variables"",
923
- "export APP_DIR="."",
924
- "export DOCKER_DIR="."",
923
+ "export APP_DIR="app"",
924
+ "export DOCKER_BUILD_CONTEXT="app"",
925
925
  "export DOCKER_REGISTRY="asia-east1-docker.pkg.dev"",
926
926
  "export DOCKER_IMAGE="asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/prod/app"",
927
927
  "export DOCKER_CACHE_IMAGE="asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/app"",
@@ -932,7 +932,7 @@ EOF
932
932
  "gcloud auth configure-docker asia-east1-docker.pkg.dev",
933
933
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
934
934
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
935
- "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",
935
+ "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile $DOCKER_BUILD_CONTEXT --build-arg BUILDKIT_INLINE_CACHE=1",
936
936
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
937
937
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
938
938
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
@@ -974,8 +974,8 @@ EOF
974
974
  },
975
975
  "script": [
976
976
  "echo -e "\\e[0Ksection_start:$(date +%s):injectvars[collapsed=true]\\r\\e[0KInjecting variables"",
977
- "export APP_DIR="."",
978
- "export DOCKER_DIR="."",
977
+ "export APP_DIR="app"",
978
+ "export DOCKER_BUILD_CONTEXT="app"",
979
979
  "export DOCKER_REGISTRY="asia-east1-docker.pkg.dev"",
980
980
  "export DOCKER_IMAGE="asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/stage/app"",
981
981
  "export DOCKER_CACHE_IMAGE="asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/caches/app"",
@@ -986,7 +986,7 @@ EOF
986
986
  "gcloud auth configure-docker asia-east1-docker.pkg.dev",
987
987
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-login\\r\\e[0K"",
988
988
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-build[collapsed=true]\\r\\e[0KDocker build"",
989
- "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",
989
+ "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile $DOCKER_BUILD_CONTEXT --build-arg BUILDKIT_INLINE_CACHE=1",
990
990
  "echo -e "\\e[0Ksection_end:$(date +%s):docker-build\\r\\e[0K"",
991
991
  "echo -e "\\e[0Ksection_start:$(date +%s):docker-push[collapsed=true]\\r\\e[0KDocker push and tag"",
992
992
  "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
@@ -1057,7 +1057,7 @@ EOF
1057
1057
  "script": [
1058
1058
  "echo -e "\\e[0Ksection_start:$(date +%s):injectvars[collapsed=true]\\r\\e[0KInjecting variables"",
1059
1059
  "export ENV_SHORT="prod"",
1060
- "export APP_DIR="."",
1060
+ "export APP_DIR="app"",
1061
1061
  "export ENV_TYPE="prod"",
1062
1062
  "export BUILD_INFO_BUILD_ID="$(git describe --tags 2>/dev/null || git rev-parse HEAD)"",
1063
1063
  "export BUILD_INFO_BUILD_TIME="$CI_JOB_STARTED_AT"",
@@ -1088,7 +1088,7 @@ EOF
1088
1088
  ENV_SHORT: |-
1089
1089
  prod
1090
1090
  APP_DIR: |-
1091
- .
1091
+ app
1092
1092
  ENV_TYPE: |-
1093
1093
  prod
1094
1094
  BUILD_INFO_BUILD_ID: |-
@@ -1182,7 +1182,7 @@ EOF
1182
1182
  "script": [
1183
1183
  "echo -e "\\e[0Ksection_start:$(date +%s):injectvars[collapsed=true]\\r\\e[0KInjecting variables"",
1184
1184
  "export ENV_SHORT="stage"",
1185
- "export APP_DIR="."",
1185
+ "export APP_DIR="app"",
1186
1186
  "export ENV_TYPE="stage"",
1187
1187
  "export BUILD_INFO_BUILD_ID="$(git describe --tags 2>/dev/null || git rev-parse HEAD)"",
1188
1188
  "export BUILD_INFO_BUILD_TIME="$CI_JOB_STARTED_AT"",
@@ -1213,7 +1213,7 @@ EOF
1213
1213
  ENV_SHORT: |-
1214
1214
  stage
1215
1215
  APP_DIR: |-
1216
- .
1216
+ app
1217
1217
  ENV_TYPE: |-
1218
1218
  stage
1219
1219
  BUILD_INFO_BUILD_ID: |-