From 4db232e7d7cc26f009e4b6709d21230ee6b6c862 Mon Sep 17 00:00:00 2001 From: Cato Olsen Date: Wed, 18 Dec 2024 16:36:33 +0100 Subject: [PATCH] Now relies on a DOLLY_APPLICATION_CREDENTIALS environment variable, with notes on how to set up on Linux|macOs|Windows. --- apps/dolly-backend/docker-compose.yml | 6 ++++-- apps/organisasjon-forvalter/docker-compose.yml | 6 ++++-- apps/pdl-forvalter/docker-compose.yml | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/apps/dolly-backend/docker-compose.yml b/apps/dolly-backend/docker-compose.yml index d58aec5d161..dc1ab075853 100644 --- a/apps/dolly-backend/docker-compose.yml +++ b/apps/dolly-backend/docker-compose.yml @@ -9,10 +9,12 @@ services: - "--run-connection-test" volumes: - type: bind - # Set a variable DOLLY_ADC_LOCATION. + # Set a variable $DOLLY_APPLICATION_CREDENTIALS. We don't use + # GOOGLE_APPLICATION_CREDENTIALS, as this causes an extra step during login. + # # - $HOME/.config/gcloud/application_default_credentials.json for Linux/macOS. # - $APPDATA/gcloud/application_default_credentials.json for Windows. - source: $DOLLY_ADC_LOCATION + source: $DOLLY_APPLICATION_CREDENTIALS target: /application_default_credentials.json opensearch: diff --git a/apps/organisasjon-forvalter/docker-compose.yml b/apps/organisasjon-forvalter/docker-compose.yml index 883c9155b83..15dda33be52 100644 --- a/apps/organisasjon-forvalter/docker-compose.yml +++ b/apps/organisasjon-forvalter/docker-compose.yml @@ -9,8 +9,10 @@ services: - "--run-connection-test" volumes: - type: bind - # Set a variable DOLLY_ADC_LOCATION. + # Set a variable $DOLLY_APPLICATION_CREDENTIALS. We don't use + # GOOGLE_APPLICATION_CREDENTIALS, as this causes an extra step during login. + # # - $HOME/.config/gcloud/application_default_credentials.json for Linux/macOS. # - $APPDATA/gcloud/application_default_credentials.json for Windows. - source: $DOLLY_ADC_LOCATION + source: $DOLLY_APPLICATION_CREDENTIALS target: /application_default_credentials.json \ No newline at end of file diff --git a/apps/pdl-forvalter/docker-compose.yml b/apps/pdl-forvalter/docker-compose.yml index f6eacc11c37..797d32042e7 100644 --- a/apps/pdl-forvalter/docker-compose.yml +++ b/apps/pdl-forvalter/docker-compose.yml @@ -9,8 +9,10 @@ services: - "--run-connection-test" volumes: - type: bind - # Set a variable DOLLY_ADC_LOCATION. + # Set a variable $DOLLY_APPLICATION_CREDENTIALS. We don't use + # GOOGLE_APPLICATION_CREDENTIALS, as this causes an extra step during login. + # # - $HOME/.config/gcloud/application_default_credentials.json for Linux/macOS. # - $APPDATA/gcloud/application_default_credentials.json for Windows. - source: $DOLLY_ADC_LOCATION + source: $DOLLY_APPLICATION_CREDENTIALS target: /application_default_credentials.json \ No newline at end of file