From e2a705c858533d4ef21191a9a9b99976c98a209d Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Sat, 3 Oct 2020 09:19:18 -0500 Subject: [PATCH] =?UTF-8?q?refactor(services):=20=E2=99=BB=20extract=20som?= =?UTF-8?q?e=20env=20vars?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 9 ++++++--- docker-compose.override.yml | 2 +- docker-compose.prod.yml | 2 +- docker-compose.yml | 8 ++++---- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.env b/.env index 17f6ae6c3..0b409dd70 100644 --- a/.env +++ b/.env @@ -1,9 +1,11 @@ -API_DOCS_URLS="[ { url: \"http://directory-api/v1/swagger.json\", name: \"Directory\" } ]" +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 -APPLICATION_INSIGHTS_SERVER_TELEMETRY_CHANNEL_STORAGE_PATH=application-insights - ARCHIVAL_APPLICATION_INSIGHTS_INSTRUMENTATION_KEY= +ARCHIVAL_APPLICATION_INSIGHTS_SERVER_TELEMETRY_CHANNEL_STORAGE_PATH=application-insights ARCHIVAL_REDIS_CONNECTION_STRING=archival-scheduling-db:6379 ARCHIVAL_GIT_REPOSITORY_PATH=archives ARCHIVAL_GIT_USER_NAME=FilterLists Archival @@ -11,6 +13,7 @@ ARCHIVAL_GIT_USER_EMAIL=noreply@filterlists.com DIRECTORY_HOST=directory-api DIRECTORY_APPLICATION_INSIGHTS_INSTRUMENTATION_KEY= +DIRECTORY_APPLICATION_INSIGHTS_SERVER_TELEMETRY_CHANNEL_STORAGE_PATH=application-insights DIRECTORY_CONNECTION_STRING=Server=directory-db;Database=filterlists;User Id=filterlists;Password=filterlists; DIRECTORY_DB_USER=filterlists DIRECTORY_DB_PASSWORD=filterlists diff --git a/docker-compose.override.yml b/docker-compose.override.yml index e8f3349cc..0347dc601 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -5,7 +5,7 @@ version: "3.7" services: reverse-proxy: ports: - - "8080:80" + - ${REVERSE_PROXY_HOST_PORT_HTTP}:80 volumes: - ./reverse-proxy/conf.d.dev:/etc/nginx/conf.d:ro command: ["nginx-debug", "-g", "daemon off;"] diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index ff960b58b..d772f6783 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -5,7 +5,7 @@ version: "3.7" services: reverse-proxy: ports: - - "443:443" + - ${REVERSE_PROXY_HOST_PORT_HTTPS}:443 depends_on: - web volumes: diff --git a/docker-compose.yml b/docker-compose.yml index f9d7e4c87..281d342ef 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -30,10 +30,10 @@ services: depends_on: - archival-scheduling-db volumes: - - archival-application-insights:/app/${APPLICATION_INSIGHTS_SERVER_TELEMETRY_CHANNEL_STORAGE_PATH} + - archival-application-insights:/app/${ARCHIVAL_APPLICATION_INSIGHTS_SERVER_TELEMETRY_CHANNEL_STORAGE_PATH} - archival-archives:/app/${ARCHIVAL_GIT_REPOSITORY_PATH} environment: - ApplicationInsights__ServerTelemetryChannelStoragePath: ${APPLICATION_INSIGHTS_SERVER_TELEMETRY_CHANNEL_STORAGE_PATH} + ApplicationInsights__ServerTelemetryChannelStoragePath: ${ARCHIVAL_APPLICATION_INSIGHTS_SERVER_TELEMETRY_CHANNEL_STORAGE_PATH} ApplicationInsights__InstrumentationKey: ${ARCHIVAL_APPLICATION_INSIGHTS_INSTRUMENTATION_KEY} ConnectionStrings__SchedulingConnection: ${ARCHIVAL_REDIS_CONNECTION_STRING} Api__DirectoryHost: ${DIRECTORY_HOST} @@ -61,9 +61,9 @@ services: depends_on: - directory-db volumes: - - directory-application-insights:/app/${APPLICATION_INSIGHTS_SERVER_TELEMETRY_CHANNEL_STORAGE_PATH} + - directory-application-insights:/app/${DIRECTORY_APPLICATION_INSIGHTS_SERVER_TELEMETRY_CHANNEL_STORAGE_PATH} environment: - ApplicationInsights__ServerTelemetryChannelStoragePath: ${APPLICATION_INSIGHTS_SERVER_TELEMETRY_CHANNEL_STORAGE_PATH} + ApplicationInsights__ServerTelemetryChannelStoragePath: ${DIRECTORY_APPLICATION_INSIGHTS_SERVER_TELEMETRY_CHANNEL_STORAGE_PATH} ApplicationInsights__InstrumentationKey: ${DIRECTORY_APPLICATION_INSIGHTS_INSTRUMENTATION_KEY} ConnectionStrings__DirectoryConnection: ${DIRECTORY_CONNECTION_STRING}