Separate out env vars from quickstart.sh

3 files changed, 8 insertions, 9 deletions

diff --git a/README.md b/README.md
index 907d566..40fdb1f 100644
--- a/README.md
+++ b/README.md
@@ -90,9 +90,7 @@ There are two docker-compose files used for development:
 - `docker/docker-compose-dev.yaml` for the collector, and
 - `auth-server-poc/docker-compose.yml` for the JWT server.
 
-To apply changes, build with `docker-compose build -f docker/docker-compose-dev.yaml` or `docker-compose -f auth-server-poc/docker-compose.yml` (depending on what has changed) and then restart the containers with `./quickstart.sh`.
-
-If you want to save build time you can also pass a service name to `docker-compose build`, i.e. `docker-compose build -f docker/docker-compose-dev.yaml collector`.
+To apply changes, `source env-vars.sh` and do e.g. `docker-compose -f docker/docker-compose-dev.yaml up -d --build collector`.
 
 ## JWT mechanics (work in progress)
 
diff --git a/env-vars.sh b/env-vars.sh
new file mode 100644
index 0000000..8361a2f
--- /dev/null
+++ b/env-vars.sh
@@ -0,0 +1,6 @@
+export COUCHDB_USER=test
+export COUCHDB_PASSWORD=test
+export COUCHDB_NAME=test
+export COUCHDB_HOSTNAME=couchdb
+export DOCKER_JWT_PUBKEY_PATH=/tmp/soc_collector/
+export DOCKER_JWT_HTPASSWD_PATH=/tmp/soc_collector_htpasswd/
diff --git a/quickstart.sh b/quickstart.sh
index 6e566de..edf8c43 100755
--- a/quickstart.sh
+++ b/quickstart.sh
@@ -1,11 +1,6 @@
 #!/bin/sh
 
-export COUCHDB_USER=test
-export COUCHDB_PASSWORD=test
-export COUCHDB_NAME=test
-export COUCHDB_HOSTNAME=couchdb
-export DOCKER_JWT_PUBKEY_PATH=/tmp/soc_collector/
-export DOCKER_JWT_HTPASSWD_PATH=/tmp/soc_collector_htpasswd/
+source env-vars.sh
 
 # Create a directory to store the certificates in.
 if [ ! -d ${DOCKER_JWT_PUBKEY_PATH} ]; then