From 0ee3a308a7938d17915b25db447d63f6a6a4e293 Mon Sep 17 00:00:00 2001 From: roschaefer Date: Fri, 5 Jun 2020 13:07:27 +0200 Subject: [PATCH] Add tags and APPLICATION_NAME env variable --- backend/.env.template | 1 + docker-compose.override.yml | 4 ++++ webapp/.env.template | 1 + 3 files changed, 6 insertions(+) diff --git a/backend/.env.template b/backend/.env.template index 8531e6cd7..3e828e4c6 100644 --- a/backend/.env.template +++ b/backend/.env.template @@ -1,3 +1,4 @@ +APPLICATION_NAME="Human Connection" NEO4J_URI=bolt://localhost:7687 NEO4J_USERNAME=neo4j NEO4J_PASSWORD=letmein diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 334a96e09..c58df2292 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -8,16 +8,19 @@ services: networks: - hc-network webapp: + image: schoolsinmotion/webapp:build-and-test build: context: webapp target: build-and-test volumes: - ./webapp:/webapp environment: + - "APPLICATION_NAME={$APPLICATION_NAME:-'Human Connection'}" - NUXT_BUILD=/tmp/nuxt # avoid file permission issues when `rm -rf .nuxt/` - PUBLIC_REGISTRATION=false command: yarn run dev backend: + image: schoolsinmotion/backend:build-and-test build: context: backend target: build-and-test @@ -25,6 +28,7 @@ services: - ./backend:/backend command: yarn run dev environment: + - "APPLICATION_NAME={$APPLICATION_NAME:-'Human Connection'}" - SMTP_HOST=mailserver - SMTP_PORT=25 - SMTP_IGNORE_TLS=true diff --git a/webapp/.env.template b/webapp/.env.template index b00e6855a..da924fed9 100644 --- a/webapp/.env.template +++ b/webapp/.env.template @@ -1,3 +1,4 @@ +APPLICATION_NAME="Human Connection" MAPBOX_TOKEN="pk.eyJ1IjoiaHVtYW4tY29ubmVjdGlvbiIsImEiOiJjajl0cnBubGoweTVlM3VwZ2lzNTNud3ZtIn0.KZ8KK9l70omjXbEkkbHGsQ" SENTRY_DSN_WEBAPP= COMMIT=