diff --git a/README.md b/README.md index 8371291..3fe788d 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Uses the default Flask development server. 1. Build the images and run the containers: ```sh - $ docker-compose up -d --build + $ docker-compose -f docker-compose.dev.yml up -d --build ``` Test it out at [http://localhost:5000](http://localhost:5000). The "web" folder is mounted into the container and your code changes apply automatically. @@ -18,10 +18,11 @@ Uses the default Flask development server. Uses gunicorn + nginx. 1. Rename *.env.prod-sample* to *.env.prod* and *.env.prod.db-sample* to *.env.prod.db*. Update the environment variables. -1. Build the images and run the containers: +2. run osmtile with import script +2. Build the images and run the containers: ```sh - $ docker-compose -f docker-compose.prod.yml up -d --build + $ docker-compose up -d --build ``` Test it out at [http://localhost:1337](http://localhost:1337). No mounted folders. To apply changes, the image must be re-built. diff --git a/lb/haproxy.cfg b/lb/haproxy.cfg index 9b9294c..0ff0172 100644 --- a/lb/haproxy.cfg +++ b/lb/haproxy.cfg @@ -59,7 +59,7 @@ frontend https use_backend %[req.hdr(Host),lower] -backend map.forest.deflax.net +backend map.deflax.net # Get from cache / put in cache http-request cache-use mapscache http-response cache-store mapscache @@ -70,7 +70,7 @@ backend forest.deflax.net # server list server s1 flask:5000 check -#backend swagger.deflax.net +#backend docs.deflax.net # # server list # server s1 swagger:80 check