diff --git a/CHANGELOG.md b/CHANGELOG.md index db6d77dd5..997c94e08 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,8 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Fixed +- #968, Treat blank proxy uri as missing - @begriffs + ## [0.4.3.0] - 2017-09-06 ### Added diff --git a/docker/Dockerfile b/docker/Dockerfile index cf9c4b598..91bed99ac 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -30,7 +30,7 @@ ENV PGRST_DB_URI= \ PGRST_DB_POOL=100 \ PGRST_SERVER_HOST=*4 \ PGRST_SERVER_PORT=3000 \ - PGRST_SERVER_PROXY_URL= \ + PGRST_SERVER_PROXY_URI= \ PGRST_JWT_SECRET= \ PGRST_SECRET_IS_BASE64=false \ PGRST_MAX_ROWS= \ diff --git a/src/PostgREST/Config.hs b/src/PostgREST/Config.hs index 5e2152d0f..8a59d804e 100644 --- a/src/PostgREST/Config.hs +++ b/src/PostgREST/Config.hs @@ -106,7 +106,7 @@ readOptions = do AppConfig <$> C.key "db-uri" <*> C.key "db-anon-role" - <*> C.key "server-proxy-uri" + <*> (mfilter (/= "") <$> C.key "server-proxy-uri") <*> C.key "db-schema" <*> (fromMaybe "*4" . mfilter (/= "") <$> C.key "server-host") <*> (fromMaybe 3000 . join . fmap coerceInt <$> C.key "server-port")