Merge pull request #1255 from NASA-AMMOS/aerie-file-store-env-var

Add PUBLIC_AERIE_FILE_STORE_PREFIX environment variable
NASA-AMMOS · Dec 14, 2023 · 8f3d9bb · 8f3d9bb
2 parents a2cc355 + 71d4323
commit 8f3d9bb
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 0 deletions.
diff --git a/deployment/docker-compose.yml b/deployment/docker-compose.yml
@@ -142,6 +142,7 @@ services:
     depends_on: ["postgres"]
     environment:
       ORIGIN: http://localhost
+      PUBLIC_AERIE_FILE_STORE_PREFIX: "/usr/src/app/merlin_file_store/"
       PUBLIC_LOGIN_PAGE: "enabled"
       PUBLIC_GATEWAY_CLIENT_URL: http://localhost:9000
       PUBLIC_GATEWAY_SERVER_URL: http://aerie_gateway:9000

diff --git a/deployment/kubernetes/aerie-ui-deployment.yaml b/deployment/kubernetes/aerie-ui-deployment.yaml
@@ -17,6 +17,8 @@ spec:
         - env:
             - name: ORIGIN
               value: http://127.0.0.1
+            - name: PUBLIC_AERIE_FILE_STORE_PREFIX
+              value: /usr/src/app/merlin_file_store/
             - name: PUBLIC_GATEWAY_CLIENT_URL
               value: http://localhost:9000
             - name: PUBLIC_GATEWAY_SERVER_URL

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -104,6 +104,7 @@ services:
     depends_on: ["postgres"]
     environment:
       NODE_TLS_REJECT_UNAUTHORIZED: "0"
+      PUBLIC_AERIE_FILE_STORE_PREFIX: "/usr/src/app/merlin_file_store/"
       PUBLIC_LOGIN_PAGE: "enabled"
       ORIGIN: http://localhost
       PUBLIC_GATEWAY_CLIENT_URL: http://localhost:9000

diff --git a/e2e-tests/docker-compose-many-workers.yml b/e2e-tests/docker-compose-many-workers.yml
@@ -103,6 +103,7 @@ services:
     depends_on: ["postgres"]
     environment:
       NODE_TLS_REJECT_UNAUTHORIZED: "0"
+      PUBLIC_AERIE_FILE_STORE_PREFIX: "/usr/src/app/merlin_file_store/"
       PUBLIC_LOGIN_PAGE: "enabled"
       ORIGIN: http://localhost
       PUBLIC_GATEWAY_CLIENT_URL: http://localhost:9000

diff --git a/e2e-tests/docker-compose-test.yml b/e2e-tests/docker-compose-test.yml
@@ -106,6 +106,7 @@ services:
     environment:
       NODE_TLS_REJECT_UNAUTHORIZED: '0'
       ORIGIN: http://localhost
+      PUBLIC_AERIE_FILE_STORE_PREFIX: "/usr/src/app/merlin_file_store/"
       PUBLIC_GATEWAY_CLIENT_URL: http://localhost:9000
       PUBLIC_GATEWAY_SERVER_URL: http://aerie_gateway:9000
       PUBLIC_HASURA_CLIENT_URL: http://localhost:8080/v1/graphql