From f9281e70b469a97b7e5045ac462a483d8d6c5f21 Mon Sep 17 00:00:00 2001 From: Travis Reeder Date: Fri, 11 Nov 2016 06:28:15 -0800 Subject: [PATCH] Fixes leftovers from #258. (#261) --- Makefile | 2 +- build.ps1 | 3 ++- docs/databases/README.md | 6 +++--- docs/databases/postgres.md | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 6dfc23c9c..946f3bd76 100644 --- a/Makefile +++ b/Makefile @@ -29,6 +29,6 @@ run: run-docker: build-docker set -ex - docker run --rm --privileged -it -e LOG_LEVEL=debug -e "DB=bolt:///app/data/bolt.db" -v $(DIR)/data:/app/data -p 8080:8080 iron/functions + docker run --rm --privileged -it -e LOG_LEVEL=debug -e "DB_URL=bolt:///app/data/bolt.db" -v $(DIR)/data:/app/data -p 8080:8080 iron/functions all: dep build \ No newline at end of file diff --git a/build.ps1 b/build.ps1 index ca01159d9..eee32f174 100644 --- a/build.ps1 +++ b/build.ps1 @@ -10,7 +10,8 @@ function build () { } function run () { - docker run --rm --privileged -it -e LOG_LEVEL=debug -e "DB=bolt:///app/data/bolt.db" -v ${pwd}/data:/app/data -p 8080:8080 iron/functions + build + docker run --rm --privileged -it -e LOG_LEVEL=debug -e "DB_URL=bolt:///app/data/bolt.db" -v ${pwd}/data:/app/data -p 8080:8080 iron/functions } switch ($cmd) diff --git a/docs/databases/README.md b/docs/databases/README.md index 183cfe497..7b7753b72 100644 --- a/docs/databases/README.md +++ b/docs/databases/README.md @@ -1,10 +1,10 @@ # Databases -We currently support the following databases and they are passed in via the `DB` environment variable. For example: +We currently support the following databases and they are passed in via the `DB_URL` environment variable. For example: ```sh -docker run -e "DB=postgres://user:pass@localhost:6212/mydb" ... +docker run -e "DB_URL=postgres://user:pass@localhost:6212/mydb" ... ``` ## [Bolt](https://github.com/boltdb/bolt) (default) @@ -12,7 +12,7 @@ docker run -e "DB=postgres://user:pass@localhost:6212/mydb" ... URL: `bolt:///functions/data/functions.db` Bolt is an embedded database which stores to disk. If you want to use this, be sure you don't lose the data directory by mounting -the directory on your host. eg: `docker run -v $PWD/data:/functions/data -e DB=bolt:///functions/data/bolt.db ...` +the directory on your host. eg: `docker run -v $PWD/data:/functions/data -e DB_URL=bolt:///functions/data/bolt.db ...` [More on BoltDB](databases/boltdb.md) diff --git a/docs/databases/postgres.md b/docs/databases/postgres.md index 7c232f5d5..436afa27f 100644 --- a/docs/databases/postgres.md +++ b/docs/databases/postgres.md @@ -29,6 +29,6 @@ docker run -it --rm --link iron-postgres:postgres postgres \ ``` docker run --rm --link "iron-postgres:postgres" \ - -e "DB=postgres://postgres:ironfunctions@postgres/funcs?sslmode=disable" \ + -e "DB_URL=postgres://postgres:ironfunctions@postgres/funcs?sslmode=disable" \ -it -p 8080:8080 iron/functions ``` \ No newline at end of file