replace NL dockerfile with a build target

Author: roelarents

.github/workflows/build-and-publish-image.yml

@@ -49,7 +49,8 @@ jobs:
         with:
           push: true
           tags: ${{ steps.docker_meta.outputs.tags }}-nl
-          file: ${{context}}/Dockerfile.NL
+          file: ${{context}}/Dockerfile
+          target: NL
           labels: ${{ steps.docker_meta.outputs.labels }}
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache-new

Dockerfile

@@ -199,4 +199,24 @@ ENV IDLE_TIMEOUT 20
 
 EXPOSE 80
 
-CMD ["lighttpd", "-D", "-f", "/srv/mapserver/config/lighttpd.conf"]
+CMD ["lighttpd", "-D", "-f", "/srv/mapserver/config/lighttpd.conf"]
+
+FROM service AS NL
+
+USER root
+RUN wget https://github.com/OSGeo/PROJ-data/releases/download/1.15.0/proj-data-1.15.tar.gz
+
+RUN mkdir proj-data-1.15 && \
+    tar xzvf proj-data-1.15.tar.gz -C /proj-data-1.15 && \
+    cp /proj-data-1.15/*.* /usr/local/share/proj/ && \
+    rm -rf proj-datumgrid*
+
+COPY --from=osgeo/proj:9.3.0 /usr/share/proj/proj.db /usr/local/share/proj/proj.db
+
+COPY ./null /usr/local/share/proj/null
+
+RUN chown root root /usr/local/share/proj/*
+
+USER www
+
+FROM service AS default

Dockerfile.NL

@@ -13,7 +13,7 @@ docker run --rm -p 80:80 --name rdnap -v `pwd`/ETRS89andRDNAP:/srv/data -e DEBUG
 ## 8.0.0-lighttpd
 
 ```docker
-docker build -f Dockerfile.NL -t pdok/mapserver:8.0.0-lighttpd-nl .
+docker build --target NL -t pdok/mapserver:8.0.0-lighttpd-nl .
 ```
 
 ```docker

ETRS89andRDNAP/README.md

@@ -97,7 +97,7 @@ For a specific Dutch version which includes a specific (and smaller) epsg file
 and necessary grid corrections files.
 
 ```shell
-docker build -t pdok/mapserver:nl -f Dockerfile.NL .
+docker build -t pdok/mapserver:nl --target=NL .
 ```
 
 ### Run
@@ -164,8 +164,8 @@ of ways through this setup.
 
 ### base image
 
-The best example for this is the [Dockerfile.NL](/Dockerfile.NL) in this
-repository. This Dockerfile uses the main Dockerfile as a base image copies
+The best example for this is the [Dockerfile NL target](./Dockerfile) in this
+repository. This uses the main layer ("service") as a base, copies
 specific geodetic grid files and overwrites the default espg with a tuned one
 for the Netherlands.