prehistoric-systems/FilterLists
1
0
Fork 0
mirror of https://github.com/collinbarrett/FilterLists.git synced 2026-03-11 09:04:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(services): ♻ extract some env vars

Browse source
This commit is contained in:
Collin M. Barrett 2020-10-03 09:19:18 -05:00
parent 1ef5e03679
commit e2a705c858
4 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
.env
View file

@ -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

2
docker-compose.override.yml
View file

@ -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;"]

2
docker-compose.prod.yml
View file

@ -5,7 +5,7 @@ version: "3.7"
services:
reverse-proxy:
ports:
- "443:443"
- ${REVERSE_PROXY_HOST_PORT_HTTPS}:443
depends_on:
- web
volumes:

8
docker-compose.yml
View file

@ -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}