From b70b48361762461b8f0603a765d7614ad883eeef Mon Sep 17 00:00:00 2001
From: Jelmer Snoeck <jelmer@siphoc.com>
Date: Fri, 9 Feb 2018 19:36:36 +0100
Subject: [PATCH] Don't rely on Manifold for selecting keys.

The .env file is the most up to date place, use that as reference.
---
 Makefile            | 4 ++--
 docker-compose.yaml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 7697ff9..872d8ea 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 .env.local:
-	manifold export | grep = | sort | sed -e 's|\([a-zA-Z_]*\)=\(.*\)|REACT_APP_\1=NGINX_REPLACE_\1|' > .env.local
+	cat .env | grep = | sort | sed -e 's|REACT_APP_\([a-zA-Z_]*\)=\(.*\)|REACT_APP_\1=NGINX_REPLACE_\1|' > .env.local
 
 build/index.html: .env.local
 	yarn build
 
-NGINX_SUB_FILTER?=$(shell manifold export | grep '=' | sort | sed -e 's/\(.*\)=\(.*\)/sub_filter\ \"NGINX_REPLACE_\1\" \"$$\{\1\}\";/')
+NGINX_SUB_FILTER?=$(shell cat .env | grep '=' | sort | sed -e 's/REACT_APP_\([a-zA-Z_]*\)=\(.*\)/sub_filter\ \"NGINX_REPLACE_\1\" \"$$\{\1\}\";/')
 
 nginx.conf:
 	cat nginx.conf.sample | sed -e 's|LOCATION_SUB_FILTER|\${NGINX_SUB_FILTER}|' | sed 's|}";\ |}";\n\t\t|g' > nginx.conf
diff --git a/docker-compose.yaml b/docker-compose.yaml
index ebcbb5d..b2ecf3c 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -7,5 +7,5 @@ services:
       - 3001:3001
     environment:
       - PORT=${PORT:-3001}
-      - STRIPE_KEY=pk-docker-compose-supersecret
-      - SEGMENT_KEY=segment-docker-compose-secret
+      - STRIPE_KEY=${STRIPE_KEY:-pk-docker-compose-supersecret}
+      - SEGMENT_KEY=${SEGMENT_KEY:-segment-docker-compose-secret}