From d32e46ba2f8346c4801d04838828346254624a47 Mon Sep 17 00:00:00 2001 From: Petr Sloup Date: Wed, 21 Dec 2016 07:01:16 +0100 Subject: [PATCH] Allow options to be passed to the docker + document it (close #87) --- Dockerfile | 2 +- Dockerfile_light | 2 +- docs/installation.rst | 5 +++++ run.sh | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8d027a3..b30fb81 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,4 +27,4 @@ VOLUME /data WORKDIR /data EXPOSE 80 -CMD ["/usr/src/app/run.sh"] +ENTRYPOINT ["/usr/src/app/run.sh"] diff --git a/Dockerfile_light b/Dockerfile_light index 54465c5..79898d6 100644 --- a/Dockerfile_light +++ b/Dockerfile_light @@ -9,4 +9,4 @@ VOLUME /data WORKDIR /data EXPOSE 80 -CMD ["node", "/usr/src/app/", "-p", "80"] +ENTRYPOINT ["node", "/usr/src/app/", "-p", "80"] diff --git a/docs/installation.rst b/docs/installation.rst index f454c19..4dd5d7f 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -9,6 +9,11 @@ When running docker image, no special installation is needed -- the docker will Just run ``docker run -it -v $(pwd):/data -p 8080:80 klokantech/tileserver-gl``. +Additional options (see :doc:`/usage`) can be passed to the TileServer GL by appending them to the end of this command. You can, for example, do the following: + +* ``docker run ... klokantech/tileserver-gl my-tiles.mbtiles`` -- explicitly specify which mbtiles to use (if you have more in the folder) +* ``docker run ... klokantech/tileserver-gl --verbose`` -- to see the default config created automatically + npm === diff --git a/run.sh b/run.sh index 5f34649..8883c6b 100755 --- a/run.sh +++ b/run.sh @@ -1,3 +1,3 @@ #!/bin/bash cd /data -xvfb-run -a -e /dev/stdout --server-args="-screen 0 1024x768x24" node /usr/src/app/ -p 80 +xvfb-run -a -e /dev/stdout --server-args="-screen 0 1024x768x24" node /usr/src/app/ -p 80 "$@"