diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 61af7d41452ebf4e31d54a3fd33368c4160c2cdd..2378ed9a66a8c92a947da85ade6a35bf4f815f03 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -50,7 +50,7 @@ cache_lint_test: image: 'denoland/deno:alpine-1.28.1' stage: 'test' script: - - deno cache --lock=lock.json app/deps.ts app/dev_deps.ts + - deno cache --lock=deno.lock app/deps.ts app/dev_deps.ts - deno fmt --check - deno lint - deno test diff --git a/Dockerfile b/Dockerfile index b37cf9303b7b7e48e6ae56f5824ed0121dbe3565..57b6e7c81b3768ef7ac3fdc26d321ec628af8b50 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,11 +6,11 @@ EXPOSE 8003 # Prefer not to run as root. USER deno -COPY lock.json . +COPY deno.lock . COPY deno.json . COPY ./app ./app -RUN deno cache --lock=lock.json app/deps.ts -RUN deno cache --lock=lock.json app/main.ts +RUN deno cache --lock=deno.lock app/deps.ts +RUN deno cache --lock=deno.lock app/main.ts -CMD ["deno", "run", "--allow-net", "--allow-env", "--lock=lock.json", "--cached-only", "app/main.ts"] +CMD ["deno", "run", "--allow-net", "--allow-env", "--lock=deno.lock", "--cached-only", "app/main.ts"] diff --git a/README.md b/README.md index 41783a432739ba5292fc0a288d88f176012f5ac7..79b77dba939f5be19088374c64e98ffff15ab5d9 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,7 @@ dependency run vr updateDeps ``` -to update the `lock.json` file (similiar to Node.js `package.lock` including +to update the `deno.lock` file (similiar to Node.js `package.lock` including hashes). To just install and cache dependencies locally or force a reload of diff --git a/deno.json b/deno.json index b01595c5332df2962c254579d3bb1713163d15c0..225cfc60f2a9a2c093b92ae9181d1a46df5f5902 100644 --- a/deno.json +++ b/deno.json @@ -5,11 +5,11 @@ "fmt": "deno fmt", "fmt:check": "deno fmt --check", "test": "deno test", - "updateDeps": "deno cache --lock=lock.json --lock-write app/deps.ts app/dev_deps.ts", - "install": "deno cache --reload --lock=lock.json app/deps.ts app/dev_deps.ts", + "updateDeps": "deno cache --lock=deno.lock --lock-write app/deps.ts app/dev_deps.ts", + "install": "deno cache --reload --lock=deno.lock app/deps.ts app/dev_deps.ts", "cache": "deno cache app/main.ts", - "dev": "deno run --allow-net --allow-env --lock=lock.json --cached-only --watch app/main.ts", - "start": "deno run --allow-net --allow-env --lock=lock.json --cached-only app/main.ts", + "dev": "deno run --allow-net --allow-env --lock=deno.lock --cached-only --watch app/main.ts", + "start": "deno run --allow-net --allow-env --lock=deno.lock --cached-only app/main.ts", "docker": "docker build -t geo-service . && docker run -it --init -p 8003:8003 geo-service", "coverage": "deno test --coverage=coverage && deno coverage coverage", "pre-commit": { diff --git a/lock.json b/deno.lock similarity index 100% rename from lock.json rename to deno.lock diff --git a/terraform/environments/deployment.tf b/terraform/environments/deployment.tf index 11617060be6b3580fd9ba96ef663bd2f23550de2..d5c5d736abde5aee3d795376c45070ecc3b7db59 100644 --- a/terraform/environments/deployment.tf +++ b/terraform/environments/deployment.tf @@ -70,7 +70,7 @@ resource "google_cloud_run_service" "geo_api" { # template annotations: https://cloud.google.com/run/docs/reference/rpc/google.cloud.run.v1#revisiontemplate metadata { annotations = { - "autoscaling.knative.dev/minScale" = local.environment == "production" ? "0" : "0" + "autoscaling.knative.dev/minScale" = local.environment == "production" ? "1" : "0" "autoscaling.knative.dev/maxScale" = local.environment == "production" ? "10" : "1" # Use the VPC Connector "run.googleapis.com/vpc-access-connector" = data.terraform_remote_state.holi_infra_state.outputs.vpc_access_connector_name