From 51359fdf207e4211007b840c73d0889becfe8ebb Mon Sep 17 00:00:00 2001 From: Adrian Galvan Date: Wed, 7 Sep 2022 17:18:24 -0700 Subject: [PATCH 1/2] Pass in Vault environment variables if they are present locally --- docker-compose.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 820c50d6b..2e1d56e6d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -25,6 +25,9 @@ services: - FIDESOPS__LOG_PII=${FIDESOPS__LOG_PII} - FIDESOPS__HOT_RELOAD=${FIDESOPS__HOT_RELOAD} - FIDESOPS__ROOT_USER__ANALYTICS_ID=${FIDESOPS__ROOT_USER__ANALYTICS_ID} + - VAULT_ADDR=${VAULT_ADDR} + - VAULT_NAMESPACE=${VAULT_NAMESPACE} + - VAULT_TOKEN=${VAULT_TOKEN} db: image: postgres:12 From 2eec5bac2537d2716c9ec63c856f2253c653faa1 Mon Sep 17 00:00:00 2001 From: Adrian Galvan Date: Thu, 8 Sep 2022 09:47:06 -0700 Subject: [PATCH 2/2] Changelog and minor cleanup --- CHANGELOG.md | 1 + docker-compose.yml | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2804a70f9..5c1a4f612 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,6 +35,7 @@ The types of changes are: * Added `execution_timeframe` to Policy model and schema [#1244](https://github.com/ethyca/fidesops/pull/1244) * Added `due_date` to Privacy request model [#1259](https://github.com/ethyca/fidesops/pull/1259) * Wrap up the email connector - it sends an email with erasure instructions as part of request execution [#1246](https://github.com/ethyca/fidesops/pull/1246) +* Mapping Vault environment variables in docker-compose.yml [#1275](https://github.com/ethyca/fidesops/pull/1275) ### Docs diff --git a/docker-compose.yml b/docker-compose.yml index 2e1d56e6d..ec6483f11 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -25,9 +25,9 @@ services: - FIDESOPS__LOG_PII=${FIDESOPS__LOG_PII} - FIDESOPS__HOT_RELOAD=${FIDESOPS__HOT_RELOAD} - FIDESOPS__ROOT_USER__ANALYTICS_ID=${FIDESOPS__ROOT_USER__ANALYTICS_ID} - - VAULT_ADDR=${VAULT_ADDR} - - VAULT_NAMESPACE=${VAULT_NAMESPACE} - - VAULT_TOKEN=${VAULT_TOKEN} + - VAULT_ADDR + - VAULT_NAMESPACE + - VAULT_TOKEN db: image: postgres:12