From 86fddaf89f86525db25f814954cbfced16b1799e Mon Sep 17 00:00:00 2001 From: Lennard Date: Wed, 4 Mar 2026 13:35:18 +0100 Subject: [PATCH 1/9] add referentiekaarten in uri placeholder substitute step --- Dockerfile | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fa11dd55..c4d4c063 100644 --- a/Dockerfile +++ b/Dockerfile @@ -56,9 +56,22 @@ RUN chown -R 999:999 /srv/ && chown -R 999:999 /etc/apache2/ # maps COPY --chown=999:999 . /srv/mapserver/ RUN for i in /srv/mapserver/*.map; do echo $i; done +# RUN : "${MAP_URL:?MAP_URL not set}" \ +# && : "${LEGEND_URL:?LEGEND_URL not set}" \ +# && for i in /srv/mapserver/*.map; do sed -i 's#MAP_URL_REPLACE#'"$MAP_URL"'#g' $i ; sed -i 's#LEGEND_URL_REPLACE#'"$LEGEND_URL"'#g' $i; done + RUN : "${MAP_URL:?MAP_URL not set}" \ && : "${LEGEND_URL:?LEGEND_URL not set}" \ - && for i in /srv/mapserver/*.map; do sed -i 's#MAP_URL_REPLACE#'"$MAP_URL"'#g' $i ; sed -i 's#LEGEND_URL_REPLACE#'"$LEGEND_URL"'#g' $i; done + && find /srv/mapserver /srv/mapserver/referentiekaarten -maxdepth 1 -type f -name "*.map" -exec sed -i -e "s#MAP_URL_REPLACE#${MAP_URL}#g" -e "s#LEGEND_URL_REPLACE#${LEGEND_URL}#g" {} + + +# RUN : "${MAP_URL:?MAP_URL not set}" \ +# && : "${LEGEND_URL:?LEGEND_URL not set}" \ +# && for i in /srv/mapserver/*.map /srv/mapserver/referentiekaarten/*.map; do \ +# [ -f "$i" ] || continue; \ +# sed -i "s#MAP_URL_REPLACE#${MAP_URL}#g" "$i"; \ +# sed -i "s#LEGEND_URL_REPLACE#${LEGEND_URL}#g" "$i"; \ +# done + RUN rm -rf /srv/mapserver/private RUN python3 /srv/mapserver/tools/make_indexjson.py /srv/mapserver/*.map > /srv/mapserver/index.json From aae11f61b01bd9e60abe004f17349a0e40e5909f Mon Sep 17 00:00:00 2001 From: Lennard Date: Wed, 4 Mar 2026 13:56:56 +0100 Subject: [PATCH 2/9] cleanup --- Dockerfile | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index c4d4c063..4418b380 100644 --- a/Dockerfile +++ b/Dockerfile @@ -56,22 +56,11 @@ RUN chown -R 999:999 /srv/ && chown -R 999:999 /etc/apache2/ # maps COPY --chown=999:999 . /srv/mapserver/ RUN for i in /srv/mapserver/*.map; do echo $i; done -# RUN : "${MAP_URL:?MAP_URL not set}" \ -# && : "${LEGEND_URL:?LEGEND_URL not set}" \ -# && for i in /srv/mapserver/*.map; do sed -i 's#MAP_URL_REPLACE#'"$MAP_URL"'#g' $i ; sed -i 's#LEGEND_URL_REPLACE#'"$LEGEND_URL"'#g' $i; done RUN : "${MAP_URL:?MAP_URL not set}" \ && : "${LEGEND_URL:?LEGEND_URL not set}" \ && find /srv/mapserver /srv/mapserver/referentiekaarten -maxdepth 1 -type f -name "*.map" -exec sed -i -e "s#MAP_URL_REPLACE#${MAP_URL}#g" -e "s#LEGEND_URL_REPLACE#${LEGEND_URL}#g" {} + -# RUN : "${MAP_URL:?MAP_URL not set}" \ -# && : "${LEGEND_URL:?LEGEND_URL not set}" \ -# && for i in /srv/mapserver/*.map /srv/mapserver/referentiekaarten/*.map; do \ -# [ -f "$i" ] || continue; \ -# sed -i "s#MAP_URL_REPLACE#${MAP_URL}#g" "$i"; \ -# sed -i "s#LEGEND_URL_REPLACE#${LEGEND_URL}#g" "$i"; \ -# done - RUN rm -rf /srv/mapserver/private RUN python3 /srv/mapserver/tools/make_indexjson.py /srv/mapserver/*.map > /srv/mapserver/index.json From 87b232c3e021b749a4bba0d0f40c1931878639b9 Mon Sep 17 00:00:00 2001 From: Lennard Date: Wed, 4 Mar 2026 14:29:14 +0100 Subject: [PATCH 3/9] include private path also for URL placement --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4418b380..cfa97dbc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -59,7 +59,7 @@ RUN for i in /srv/mapserver/*.map; do echo $i; done RUN : "${MAP_URL:?MAP_URL not set}" \ && : "${LEGEND_URL:?LEGEND_URL not set}" \ - && find /srv/mapserver /srv/mapserver/referentiekaarten -maxdepth 1 -type f -name "*.map" -exec sed -i -e "s#MAP_URL_REPLACE#${MAP_URL}#g" -e "s#LEGEND_URL_REPLACE#${LEGEND_URL}#g" {} + + && find /srv/mapserver /srv/mapserver/referentiekaarten /srv/mapserver/private -maxdepth 1 -type f -name "*.map" -exec sed -i -e "s#MAP_URL_REPLACE#${MAP_URL}#g" -e "s#LEGEND_URL_REPLACE#${LEGEND_URL}#g" {} + RUN rm -rf /srv/mapserver/private RUN python3 /srv/mapserver/tools/make_indexjson.py /srv/mapserver/*.map > /srv/mapserver/index.json From 18719030789978d08f7804f828542fe9305685c4 Mon Sep 17 00:00:00 2001 From: Lennard Date: Wed, 4 Mar 2026 14:34:19 +0100 Subject: [PATCH 4/9] include private path also for URL placement --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index cfa97dbc..37d1866a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -59,7 +59,7 @@ RUN for i in /srv/mapserver/*.map; do echo $i; done RUN : "${MAP_URL:?MAP_URL not set}" \ && : "${LEGEND_URL:?LEGEND_URL not set}" \ - && find /srv/mapserver /srv/mapserver/referentiekaarten /srv/mapserver/private -maxdepth 1 -type f -name "*.map" -exec sed -i -e "s#MAP_URL_REPLACE#${MAP_URL}#g" -e "s#LEGEND_URL_REPLACE#${LEGEND_URL}#g" {} + + && find /srv/mapserver /srv/mapserver/referentiekaarten /private -maxdepth 1 -type f -name "*.map" -exec sed -i -e "s#MAP_URL_REPLACE#${MAP_URL}#g" -e "s#LEGEND_URL_REPLACE#${LEGEND_URL}#g" {} + RUN rm -rf /srv/mapserver/private RUN python3 /srv/mapserver/tools/make_indexjson.py /srv/mapserver/*.map > /srv/mapserver/index.json From b726d1297d3791dc16992aedfb614ed1a73eede8 Mon Sep 17 00:00:00 2001 From: Lennard Date: Wed, 4 Mar 2026 14:37:57 +0100 Subject: [PATCH 5/9] include private path also for URL placement --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 37d1866a..020b613a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -56,10 +56,11 @@ RUN chown -R 999:999 /srv/ && chown -R 999:999 /etc/apache2/ # maps COPY --chown=999:999 . /srv/mapserver/ RUN for i in /srv/mapserver/*.map; do echo $i; done +RUN for i in /srv/mapserver/private/*.map; do echo $i; done RUN : "${MAP_URL:?MAP_URL not set}" \ && : "${LEGEND_URL:?LEGEND_URL not set}" \ - && find /srv/mapserver /srv/mapserver/referentiekaarten /private -maxdepth 1 -type f -name "*.map" -exec sed -i -e "s#MAP_URL_REPLACE#${MAP_URL}#g" -e "s#LEGEND_URL_REPLACE#${LEGEND_URL}#g" {} + + && find /srv/mapserver /srv/mapserver/referentiekaarten /srv/mapserver/private -maxdepth 1 -type f -name "*.map" -exec sed -i -e "s#MAP_URL_REPLACE#${MAP_URL}#g" -e "s#LEGEND_URL_REPLACE#${LEGEND_URL}#g" {} + RUN rm -rf /srv/mapserver/private RUN python3 /srv/mapserver/tools/make_indexjson.py /srv/mapserver/*.map > /srv/mapserver/index.json From d8be243e1b8908a71b9381f48957d9041e8af1b3 Mon Sep 17 00:00:00 2001 From: Lennard Date: Wed, 4 Mar 2026 14:55:53 +0100 Subject: [PATCH 6/9] debug priv map path --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 020b613a..a8bc81b0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -55,8 +55,10 @@ RUN chown -R 999:999 /var/lock/apache2 && chown -R 999:999 /var/run/apache2 && c RUN chown -R 999:999 /srv/ && chown -R 999:999 /etc/apache2/ # maps COPY --chown=999:999 . /srv/mapserver/ + +RUN pwd && for i in *.map; do echo $i; done RUN for i in /srv/mapserver/*.map; do echo $i; done -RUN for i in /srv/mapserver/private/*.map; do echo $i; done +RUN for i in /srv/mapserver/private*.map; do echo $i; done RUN : "${MAP_URL:?MAP_URL not set}" \ && : "${LEGEND_URL:?LEGEND_URL not set}" \ From 07c77642b4d07e85a3258ccb4a71572a6770b2be Mon Sep 17 00:00:00 2001 From: Lennard Date: Wed, 4 Mar 2026 15:01:00 +0100 Subject: [PATCH 7/9] debug priv map path --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index a8bc81b0..82773c00 100644 --- a/Dockerfile +++ b/Dockerfile @@ -56,13 +56,13 @@ RUN chown -R 999:999 /srv/ && chown -R 999:999 /etc/apache2/ # maps COPY --chown=999:999 . /srv/mapserver/ -RUN pwd && for i in *.map; do echo $i; done +RUN ls -al && for i in /private/*.map; do echo $i; done RUN for i in /srv/mapserver/*.map; do echo $i; done -RUN for i in /srv/mapserver/private*.map; do echo $i; done +RUN for i in /srv/mapserver/private/*.map; do echo $i; done RUN : "${MAP_URL:?MAP_URL not set}" \ && : "${LEGEND_URL:?LEGEND_URL not set}" \ - && find /srv/mapserver /srv/mapserver/referentiekaarten /srv/mapserver/private -maxdepth 1 -type f -name "*.map" -exec sed -i -e "s#MAP_URL_REPLACE#${MAP_URL}#g" -e "s#LEGEND_URL_REPLACE#${LEGEND_URL}#g" {} + + && find /srv/mapserver /srv/mapserver/referentiekaarten /srv/private -maxdepth 1 -type f -name "*.map" -exec sed -i -e "s#MAP_URL_REPLACE#${MAP_URL}#g" -e "s#LEGEND_URL_REPLACE#${LEGEND_URL}#g" {} + RUN rm -rf /srv/mapserver/private RUN python3 /srv/mapserver/tools/make_indexjson.py /srv/mapserver/*.map > /srv/mapserver/index.json From df5b4fb1ddd0669b2df058ff0267298e2bc12dec Mon Sep 17 00:00:00 2001 From: Lennard Date: Wed, 4 Mar 2026 15:08:06 +0100 Subject: [PATCH 8/9] debug priv map path --- Dockerfile | 5 +---- Dockerfile.private | 11 +++++++++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 82773c00..4418b380 100644 --- a/Dockerfile +++ b/Dockerfile @@ -55,14 +55,11 @@ RUN chown -R 999:999 /var/lock/apache2 && chown -R 999:999 /var/run/apache2 && c RUN chown -R 999:999 /srv/ && chown -R 999:999 /etc/apache2/ # maps COPY --chown=999:999 . /srv/mapserver/ - -RUN ls -al && for i in /private/*.map; do echo $i; done RUN for i in /srv/mapserver/*.map; do echo $i; done -RUN for i in /srv/mapserver/private/*.map; do echo $i; done RUN : "${MAP_URL:?MAP_URL not set}" \ && : "${LEGEND_URL:?LEGEND_URL not set}" \ - && find /srv/mapserver /srv/mapserver/referentiekaarten /srv/private -maxdepth 1 -type f -name "*.map" -exec sed -i -e "s#MAP_URL_REPLACE#${MAP_URL}#g" -e "s#LEGEND_URL_REPLACE#${LEGEND_URL}#g" {} + + && find /srv/mapserver /srv/mapserver/referentiekaarten -maxdepth 1 -type f -name "*.map" -exec sed -i -e "s#MAP_URL_REPLACE#${MAP_URL}#g" -e "s#LEGEND_URL_REPLACE#${LEGEND_URL}#g" {} + RUN rm -rf /srv/mapserver/private RUN python3 /srv/mapserver/tools/make_indexjson.py /srv/mapserver/*.map > /srv/mapserver/index.json diff --git a/Dockerfile.private b/Dockerfile.private index 74f0f787..4b98a120 100644 --- a/Dockerfile.private +++ b/Dockerfile.private @@ -2,6 +2,13 @@ ARG BASE_IMAGE FROM ${BASE_IMAGE} +# build-time inputs +ARG EXTRA_ARG1 +ARG EXTRA_ARG2 + +ENV MAP_URL="${EXTRA_ARG1:-http://localhost:8383}" \ + LEGEND_URL="${EXTRA_ARG2:-http://localhost:8383}" + # used by make_mapfile_config.py to include private mapfiles in sld config ENV ACCESS_SCOPE private USER root @@ -10,4 +17,8 @@ USER root # private variety. RUN rm -rf /srv/mapserver/private COPY --chown=999:999 /private/ /srv/mapserver/ +RUN : "${MAP_URL:?MAP_URL not set}" \ + && : "${LEGEND_URL:?LEGEND_URL not set}" \ + && find /srv/mapserver -maxdepth 1 -type f -name "*.map" -exec sed -i -e "s#MAP_URL_REPLACE#${MAP_URL}#g" -e "s#LEGEND_URL_REPLACE#${LEGEND_URL}#g" {} + + USER www-data From f69afdf60fcac338891a15655b622eb674de0a24 Mon Sep 17 00:00:00 2001 From: Lennard Date: Wed, 4 Mar 2026 16:02:01 +0100 Subject: [PATCH 9/9] add url replace for tiled in Dockerfile.topografie --- Dockerfile.topografie | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Dockerfile.topografie b/Dockerfile.topografie index bbf220ee..9fea3017 100644 --- a/Dockerfile.topografie +++ b/Dockerfile.topografie @@ -2,9 +2,20 @@ ARG BASE_IMAGE FROM ${BASE_IMAGE} +# build-time inputs +ARG EXTRA_ARG1 +ARG EXTRA_ARG2 + +ENV MAP_URL="${EXTRA_ARG1:-http://localhost:8383}" \ + LEGEND_URL="${EXTRA_ARG2:-http://localhost:8383}" + USER root # Copy referentiekaarten mapfiles into the root dir so they will be served RUN rm -rf /srv/mapserver/private COPY --chown=999:999 /referentiekaarten/ /srv/mapserver/ +RUN : "${MAP_URL:?MAP_URL not set}" \ + && : "${LEGEND_URL:?LEGEND_URL not set}" \ + && find /srv/mapserver -maxdepth 1 -type f -name "*.map" -exec sed -i -e "s#MAP_URL_REPLACE#${MAP_URL}#g" -e "s#LEGEND_URL_REPLACE#${LEGEND_URL}#g" {} + + USER www-data