diff --git a/deployment/docker-compose.yml b/deployment/docker-compose.yml index 360b8cdd9a..75294c3fc4 100755 --- 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 index adecb443b9..b3e7a483dd 100644 --- 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 index 6d5a43db75..b0124d0762 100644 --- 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 index 9c47c39abb..e0a8277254 100644 --- 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 index 7b1e7bc8e7..14a3fa991b 100644 --- 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