alihan/fn-serverless
1
0
Fork 0
mirror of https://github.com/fnproject/fn.git synced 2022-10-28 21:29:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixes leftovers from #258. (#261)

Browse Source
This commit is contained in:
Travis Reeder
2016-11-11 06:28:15 -08:00
committed by C Cirello
parent 841596f470
commit f9281e70b4
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -29,6 +29,6 @@ run:
run-docker: build-docker run-docker: build-docker
set -ex 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 all: dep build

3
build.ps1
View File

@@ -10,7 +10,8 @@ function build () {
} }
function run () { 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) switch ($cmd)

6
docs/databases/README.md
View File

@@ -1,10 +1,10 @@
# Databases # 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 ```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) ## [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` 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 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) [More on BoltDB](databases/boltdb.md)

2
docs/databases/postgres.md
View File

@@ -29,6 +29,6 @@ docker run -it --rm --link iron-postgres:postgres postgres \
``` ```
docker run --rm --link "iron-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 -it -p 8080:8080 iron/functions
``` ```