From 43552df191db0bc8367d8f834de4903178546f28 Mon Sep 17 00:00:00 2001 From: Greg Date: Tue, 15 Mar 2022 16:58:58 +0000 Subject: [PATCH] revert check for openstreetmap-carto, readme update --- Dockerfile | 2 +- README.md | 6 ++++-- run.sh | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 48a4697..e490b77 100644 --- a/Dockerfile +++ b/Dockerfile @@ -206,7 +206,7 @@ COPY --from=compiler-modtile-renderd /root/mod_tile/osmosis-db_replag /usr/bin/o # Install helper script COPY --from=compiler-helper-script /home/renderer/src/regional /home/renderer/src/regional -COPY --from=compiler-stylesheet /root/openstreetmap-carto /home/renderer/openstreetmap-carto-backup +COPY --from=compiler-stylesheet /root/openstreetmap-carto /home/renderer/src/openstreetmap-carto-backup # Start running COPY run.sh / diff --git a/README.md b/README.md index 520485a..908408e 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ docker run \ ### Using an alternate style -By default the container will fetch openstreetmap-carto if it is not specified. However, you can modify the style at run-time. Be aware you need the style mounted at `run` AND `import` as the Lua script needs to be run: +By default the container will use openstreetmap-carto if it is not specified. However, you can modify the style at run-time. Be aware you need the style mounted at `run` AND `import` as the Lua script needs to be run: ``` docker run \ @@ -74,7 +74,9 @@ If you do not define the "NAME_*" variables, the script will default to those fo Be sure to mount the volume during `run` with the same `-v /home/user/openstreetmap-carto-modified:/home/renderer/src/openstreetmap-carto` -If you do not see the expected style upon `run` double check your paths as the style may not have been found at the directory specified. By default, `openstreetmap-carto` will be fetched if a style cannot be found +If you do not see the expected style upon `run` double check your paths as the style may not have been found at the directory specified. By default, `openstreetmap-carto` will be used if a style cannot be found + +**Only openstreetmap-carto and styles like it, eg, ones with one lua script, one style, one mml, one SQL can be used** ## Running the server diff --git a/run.sh b/run.sh index 3f0cca6..697887e 100755 --- a/run.sh +++ b/run.sh @@ -29,9 +29,9 @@ fi set -x -if [ ! -d /home/renderer/src/openstreetmap-carto ]; then +if [ ! "$(ls -A /home/renderer/src/openstreetmap-carto)" ]; then - mv /home/renderer/src/openstreetmap-carto-backup /home/renderer/src/openstreetmap-carto + mv /home/renderer/src/openstreetmap-carto-backup/* /home/renderer/src/openstreetmap-carto/ fi