From 9a20108dab04111c983415119eff51de5c1f3c30 Mon Sep 17 00:00:00 2001 From: Dominik Stadler Date: Sat, 9 Dec 2023 21:35:35 +0100 Subject: [PATCH 1/2] Update to carto 5.8.0 This includes https://github.com/gravitystorm/openstreetmap-carto/pull/4468 and thus allows to work around issue #244 via local file downloads --- Dockerfile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 883248f..ddcdab7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,12 +17,8 @@ RUN apt-get update \ FROM compiler-common AS compiler-stylesheet RUN cd ~ \ -&& git clone --single-branch --branch v5.4.0 https://github.com/gravitystorm/openstreetmap-carto.git --depth 1 \ +&& git clone --single-branch --branch v5.8.0 https://github.com/gravitystorm/openstreetmap-carto.git --depth 1 \ && cd openstreetmap-carto \ -&& sed -i 's/, "unifont Medium", "Unifont Upper Medium"//g' style/fonts.mss \ -&& sed -i 's/"Noto Sans Tibetan Regular",//g' style/fonts.mss \ -&& sed -i 's/"Noto Sans Tibetan Bold",//g' style/fonts.mss \ -&& sed -i 's/Noto Sans Syriac Eastern Regular/Noto Sans Syriac Regular/g' style/fonts.mss \ && rm -rf .git ########################################################################################################### From 296766ad00a43267daccc53ee75025c69dfb4add Mon Sep 17 00:00:00 2001 From: Dominik Stadler Date: Sat, 9 Dec 2023 21:35:44 +0100 Subject: [PATCH 2/2] Update to Leaflet 1.9.4 files are now in a sub-dir "dist" in the download-package --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ddcdab7..f6cf470 100644 --- a/Dockerfile +++ b/Dockerfile @@ -111,8 +111,10 @@ RUN ln -sf /dev/stdout /var/log/apache2/access.log \ # leaflet COPY leaflet-demo.html /var/www/html/index.html RUN cd /var/www/html/ \ -&& wget https://github.com/Leaflet/Leaflet/releases/download/v1.8.0/leaflet.zip \ +&& wget https://github.com/Leaflet/Leaflet/releases/download/v1.9.4/leaflet.zip \ && unzip leaflet.zip \ +&& mv dist/* . \ +&& rmdir dist \ && rm leaflet.zip # Icon