Now relies on a DOLLY_APPLICATION_CREDENTIALS environment variable, w…

…ith notes on how to set up on Linux|macOs|Windows.
navikt · Dec 18, 2024 · 4db232e · 4db232e
1 parent e7eabd3
commit 4db232e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git 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
@@ -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
diff --git 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