Merge 296766ad00 into 6088b9b37f
This commit is contained in:
commit
a34259cbf8
10
Dockerfile
10
Dockerfile
@ -17,12 +17,8 @@ RUN apt-get update \
|
|||||||
|
|
||||||
FROM compiler-common AS compiler-stylesheet
|
FROM compiler-common AS compiler-stylesheet
|
||||||
RUN cd ~ \
|
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 \
|
&& 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
|
&& rm -rf .git
|
||||||
|
|
||||||
###########################################################################################################
|
###########################################################################################################
|
||||||
@ -115,8 +111,10 @@ RUN ln -sf /dev/stdout /var/log/apache2/access.log \
|
|||||||
# leaflet
|
# leaflet
|
||||||
COPY leaflet-demo.html /var/www/html/index.html
|
COPY leaflet-demo.html /var/www/html/index.html
|
||||||
RUN cd /var/www/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 \
|
&& unzip leaflet.zip \
|
||||||
|
&& mv dist/* . \
|
||||||
|
&& rmdir dist \
|
||||||
&& rm leaflet.zip
|
&& rm leaflet.zip
|
||||||
|
|
||||||
# Icon
|
# Icon
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user