diff --git a/.envrc b/.envrc index 4f0af3a80ef9b7d25eaa8177ee64bcd7310af8b4..3b5bb1416c85df12ee45836120a60c4dcab29a79 100644 --- a/.envrc +++ b/.envrc @@ -7,6 +7,3 @@ fi # loads personal (secret) data from separate env file (not checked in) source_env_if_exists .envrc.local - -type yarn >/dev/null 2>&1 && PATH="$PATH:$(yarn global bin)" -export PATH \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 259f200a2fc4e1a040e45d62db20cb47a1f1924a..9a786e6dfb750d0af377ffe02537b4ceb83c0513 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ default: - env interruptible: true tags: - - holi-small # build on smaller machine + - 1cpu-4gb # build on smaller machine variables: API_DOMAIN_PATH: "$CI_PROJECT_DIR/api_domain" diff --git a/.husky/pre-commit b/.husky/pre-commit deleted file mode 100755 index c1d699695f34ed0a0d789b795412ef67013e7458..0000000000000000000000000000000000000000 --- a/.husky/pre-commit +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -. "$(dirname "$0")/_/husky.sh" - -gitleaks protect --staged -v -c ../.gitleaks.toml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 0000000000000000000000000000000000000000..2f34ebc58adb3df395e52bedee0d670532274122 --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,9 @@ +repos: +- repo: local + hooks: + - id: gitleaks + name: gitleaks + language: system + entry: gitleaks protect --staged -v -c ../.gitleaks.toml + pass_filenames: false + always_run: true diff --git a/terraform/environments/deployment.tf b/terraform/environments/deployment.tf index f3e463db6230cb43ab9890825a5e3d8d22099ec0..ae1416c7541bc50ec07c460a962a4339f7e65b16 100644 --- a/terraform/environments/deployment.tf +++ b/terraform/environments/deployment.tf @@ -66,7 +66,7 @@ resource "google_cloud_run_service" "geo_api" { memory = local.environment == "production" ? "512Mi" : "256Mi" } requests = { - cpu = local.environment == "production" ? "1000m" : "10m" + cpu = local.environment == "production" ? "1000m" : "1000m" memory = local.environment == "production" ? "512Mi" : "256Mi" } }