From 3377713f84ebbc27d93f426b14d0d0a567d14279 Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Sat, 3 Oct 2020 09:35:55 -0500 Subject: [PATCH] =?UTF-8?q?refactor(api-docs):=20=E2=99=BB=20extract=20api?= =?UTF-8?q?-docs.env?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 3 --- api-docs.env | 2 ++ docker-compose.dcproj | 1 + docker-compose.yml | 5 ++--- 4 files changed, 5 insertions(+), 6 deletions(-) create mode 100644 api-docs.env diff --git a/.env b/.env index 0b409dd70..dd34d6cb4 100644 --- a/.env +++ b/.env @@ -1,9 +1,6 @@ REVERSE_PROXY_HOST_PORT_HTTP=8080 REVERSE_PROXY_HOST_PORT_HTTPS= -API_DOCS_URLS="[ { url: \"http://localhost:8080/api/directory/v1/swagger.json\", name: \"Directory\" } ]" -API_DOCS_URLS_PRIMARY_NAME=Directory - ARCHIVAL_APPLICATION_INSIGHTS_INSTRUMENTATION_KEY= ARCHIVAL_APPLICATION_INSIGHTS_SERVER_TELEMETRY_CHANNEL_STORAGE_PATH=application-insights ARCHIVAL_REDIS_CONNECTION_STRING=archival-scheduling-db:6379 diff --git a/api-docs.env b/api-docs.env new file mode 100644 index 000000000..6291e3b18 --- /dev/null +++ b/api-docs.env @@ -0,0 +1,2 @@ +URLS="[ { url: \"http://localhost:8080/api/directory/v1/swagger.json\", name: \"Directory\" } ]" +URLS_PRIMARY_NAME=Directory \ No newline at end of file diff --git a/docker-compose.dcproj b/docker-compose.dcproj index 4dd362669..e11d4cedc 100644 --- a/docker-compose.dcproj +++ b/docker-compose.dcproj @@ -10,6 +10,7 @@ + docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml index 281d342ef..a2578a6ba 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,9 +18,8 @@ services: - reverse-proxy depends_on: - directory-api - environment: - URLS: ${API_DOCS_URLS} - URLS_PRIMARY_NAME: ${API_DOCS_URLS_PRIMARY_NAME} + env_file: + - api-docs.env archival-api: image: ghcr.io/collinbarrett/filterlists-archival-api