diff --git a/.github/workflows/fullgeneration-docker.yaml b/.github/workflows/fullgeneration-docker.yaml
index 10f6cb5..07e5679 100644
--- a/.github/workflows/fullgeneration-docker.yaml
+++ b/.github/workflows/fullgeneration-docker.yaml
@@ -3,6 +3,12 @@ name: Build and publish full generation Docker image
on:
workflow_dispatch:
inputs:
+ output_image_tag:
+ description: 'Output docker image tag'
+ required: true
+ corecpp_tag:
+ description: 'C++ library version'
+ required: true
generation_tag:
description: 'Generation tools tagged version'
required: true
@@ -18,11 +24,11 @@ on:
tilematrixsets_tag:
description: 'Tile matrix sets tagged version'
required: true
- default: '4.0'
+ default: '4.3'
styles_tag:
description: 'Styles tagged version'
required: true
- default: '4.0'
+ default: '4.4'
jobs:
push_to_registry:
@@ -48,7 +54,7 @@ jobs:
push: true
file: build/fullgeneration/debian11.Dockerfile
tags: |
- rok4/fullgeneration:${{ github.event.inputs.pregeneration_tag }}
+ rok4/fullgeneration:${{ github.event.inputs.output_image_tag }}
build-args: |
ROK4TILEMATRIXSETS_VERSION=${{ github.event.inputs.tilematrixsets_tag }}
ROK4COREPERL_VERSION=${{ github.event.inputs.coreperl_tag }}
@@ -56,6 +62,7 @@ jobs:
ROK4STYLES_VERSION=${{ github.event.inputs.styles_tag }}
ROK4GENERATION_VERSION=${{ github.event.inputs.generation_tag }}
ROK4TOOLS_VERSION=${{ github.event.inputs.tools_tag }}
+ ROK4CORECPP_VERSION=${{ github.event.inputs.corecpp_tag }}
- name: Docker Hub Description
uses: peter-evans/dockerhub-description@v3
diff --git a/.github/workflows/generation-docker.yaml b/.github/workflows/generation-docker.yaml
index c457200..18c01bf 100644
--- a/.github/workflows/generation-docker.yaml
+++ b/.github/workflows/generation-docker.yaml
@@ -3,13 +3,16 @@ name: Build and publish generation Docker image
on:
workflow_dispatch:
inputs:
+ corecpp_tag:
+ description: 'C++ library version'
+ required: true
generation_tag:
description: 'Generation tools tagged version'
required: true
styles_tag:
description: 'Styles tagged version'
required: true
- default: '4.0'
+ default: '4.4'
jobs:
push_to_registry:
@@ -39,6 +42,7 @@ jobs:
build-args: |
ROK4STYLES_VERSION=${{ github.event.inputs.styles_tag }}
ROK4GENERATION_VERSION=${{ github.event.inputs.generation_tag }}
+ ROK4CORECPP_VERSION=${{ github.event.inputs.corecpp_tag }}
- name: Docker Hub Description
uses: peter-evans/dockerhub-description@v3
diff --git a/.github/workflows/pregeneration-docker.yaml b/.github/workflows/pregeneration-docker.yaml
index c8de358..8c6ebfc 100644
--- a/.github/workflows/pregeneration-docker.yaml
+++ b/.github/workflows/pregeneration-docker.yaml
@@ -12,7 +12,7 @@ on:
tilematrixsets_tag:
description: 'Tile matrix sets tagged version'
required: true
- default: '4.0'
+ default: '4.3'
jobs:
push_to_registry:
diff --git a/.github/workflows/pytools-docker.yaml b/.github/workflows/pytools-docker.yaml
new file mode 100644
index 0000000..f02955a
--- /dev/null
+++ b/.github/workflows/pytools-docker.yaml
@@ -0,0 +1,50 @@
+name: Build and publish python tools Docker image
+
+on:
+ workflow_dispatch:
+ inputs:
+ pytools_tag:
+ description: 'Python tools tagged version'
+ required: true
+ tilematrixsets_tag:
+ description: 'Tile matrix sets tagged version'
+ required: true
+ default: '4.3'
+
+jobs:
+ push_to_registry:
+ name: Push Docker image to Docker Hub
+ runs-on: ubuntu-latest
+ steps:
+ - name: Check out the repo
+ uses: actions/checkout@v3
+
+ - name: Log in to Docker Hub
+ uses: docker/login-action@v2
+ with:
+ username: ${{ secrets.DOCKERHUB_USERNAME }}
+ password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+ - name: Set up Docker Buildx
+ uses: docker/setup-buildx-action@v2
+
+ - name: Build and push Docker image
+ uses: docker/build-push-action@v3
+ with:
+ context: build/pytools/
+ push: true
+ file: build/pytools/debian11.Dockerfile
+ tags: |
+ rok4/pytools:${{ github.event.inputs.pytools_tag }}
+ build-args: |
+ ROK4TILEMATRIXSETS_VERSION=${{ github.event.inputs.tilematrixsets_tag }}
+ ROK4PYTOOLS_VERSION=${{ github.event.inputs.pytools_tag }}
+
+ - name: Docker Hub Description
+ uses: peter-evans/dockerhub-description@v3
+ with:
+ username: ${{ secrets.DOCKERHUB_USERNAME }}
+ password: ${{ secrets.DOCKERHUB_PASSWORD }}
+ repository: rok4/pytools
+ short-description: 'Outils python de gestion du projet ROK4 : conversions, calcul de statistiques...'
+ readme-filepath: build/pytools/README.md
\ No newline at end of file
diff --git a/.github/workflows/server-docker.yaml b/.github/workflows/server-docker.yaml
index 293acf5..e84dec8 100644
--- a/.github/workflows/server-docker.yaml
+++ b/.github/workflows/server-docker.yaml
@@ -4,16 +4,19 @@ on:
workflow_dispatch:
inputs:
server_tag:
- description: 'Server tagged version'
+ description: 'Server version'
+ required: true
+ corecpp_tag:
+ description: 'C++ library version'
required: true
styles_tag:
- description: 'Styles tagged version'
+ description: 'Styles version'
required: true
- default: '4.0'
+ default: '4.4'
tilematrixsets_tag:
- description: 'Tile matrix sets tagged version'
+ description: 'Tile matrix sets version'
required: true
- default: '4.0'
+ default: '4.3'
jobs:
push_to_registry:
@@ -37,13 +40,14 @@ jobs:
with:
context: build/server/
push: true
- file: build/server/debian11.Dockerfile
+ file: build/server/ubuntu-2004.Dockerfile
tags: |
rok4/server:${{ github.event.inputs.server_tag }}
build-args: |
ROK4STYLES_VERSION=${{ github.event.inputs.styles_tag }}
ROK4TILEMATRIXSETS_VERSION=${{ github.event.inputs.tilematrixsets_tag }}
ROK4SERVER_VERSION=${{ github.event.inputs.server_tag }}
+ ROK4CORECPP_VERSION=${{ github.event.inputs.corecpp_tag }}
- name: Docker Hub Description
uses: peter-evans/dockerhub-description@v3
diff --git a/.github/workflows/tools-docker.yaml b/.github/workflows/tools-docker.yaml
index 67e2899..e5a24fb 100644
--- a/.github/workflows/tools-docker.yaml
+++ b/.github/workflows/tools-docker.yaml
@@ -12,7 +12,7 @@ on:
tilematrixsets_tag:
description: 'Tile matrix sets tagged version'
required: true
- default: '4.0'
+ default: '4.3'
jobs:
push_to_registry:
diff --git a/build/README.md b/build/README.md
index 6fa9e62..a67ce3c 100644
--- a/build/README.md
+++ b/build/README.md
@@ -31,8 +31,14 @@ Versions applicatives disponibles : https://github.com/rok4/tools/releases
`docker build -t rok4/fullgeneration:TAG --build-arg ROK4PREGENERATION_VERSION=TAG --build-arg ROK4COREPERL_VERSION=TAG --build-arg ROK4GENERATION_VERSION=TAG --build-arg ROK4TOOLS_VERSION=TAG -f fullgeneration/debian11.Dockerfile fullgeneration/`
+## Compilation de l'image des outils python
+
+Versions applicatives disponibles : https://github.com/rok4/pytools/releases
+
+`docker build -t rok4/pytools:TAG --build-arg ROK4PYTOOLS_VERSION=TAG -f pytools/debian11.Dockerfile pytools/`
+
## Compilation de l'image du serveur de diffusion
-Versions applicatives disponibles : https://github.com/rok4/server/releases
+Versions applicatives disponibles : https://github.com/rok4/server/releases et https://github.com/rok4/core-cpp/releases
-`docker build -t rok4/server:TAG --build-arg ROK4SERVER_VERSION=TAG -f server/debian11.Dockerfile server/`
+`docker build -t rok4/server:TAG --build-arg ROK4SERVER_VERSION=TAG --build-arg ROK4CORECPP_VERSION=tag -f server/ubuntu-2004.Dockerfile server/`
diff --git a/build/builder/build-artefact.sh b/build/builder/build-artefact.sh
index 67d3cef..4c74e58 100644
--- a/build/builder/build-artefact.sh
+++ b/build/builder/build-artefact.sh
@@ -141,8 +141,8 @@ elif [[ $COMPONENT == "tilematrixsets" ]]; then
git clone --branch $VERSION --depth 1 --recursive https://github.com/rok4/tilematrixsets
fi
- mkdir -p /rok4-tilematrixsets-$VERSION-linux-all/etc/rok4/tilematrixsets
- cp /sources/tilematrixsets/*.json /rok4-tilematrixsets-$VERSION-linux-all/etc/rok4/tilematrixsets/
+ mkdir -p /rok4-tilematrixsets-$VERSION-linux-all/usr/share/rok4/tilematrixsets
+ cp /sources/tilematrixsets/*.json /rok4-tilematrixsets-$VERSION-linux-all/usr/share/rok4/tilematrixsets/
tar cvfz /artefacts/rok4-tilematrixsets-$VERSION-linux-all.tar.gz -C / rok4-tilematrixsets-$VERSION-linux-all
diff --git a/build/fullgeneration/README.md b/build/fullgeneration/README.md
index 7bf4036..95f21ab 100644
--- a/build/fullgeneration/README.md
+++ b/build/fullgeneration/README.md
@@ -3,7 +3,7 @@
Cette image contient tous les outils de traitement et de gestion des pyramides de données, c'est à dire :
* les outil permettant d'écrire les scripts de génération ou de modification de pyramide ROK4 raster et vecteur. Ces outils font partie du projet, la documentation complète est disponible [ici](https://github.com/rok4/pregeneration), avec le code source.
-* les outils permettant la manipulation des données images (reprojection, réechantillonnage, superposition...) ainsi que la mise au format final des données (écriture des dalles des pyramides ROK4). Ces outils font partie du projet, la documentation complète est disponible [ici](https://github.com/rok4/generation), avec le code source.
+* les outils permettant la manipulation des données images (reprojection, réechantillonnage, superposition...) ainsi que la mise au format final des données (écriture des dalles des pyramides ROK4). Ces outils font partie du projet, la documentation complète est disponible [ici](https://rok4.github.io/generation).
* les outils facilitant la gestion des pyramides (suppression, statistiques), la création de descripteur de couche par défaut, ainsi qu'un outil de conversion basé sur les TMS. Ces outils font partie du projet, la documentation complète est disponible [ici](https://github.com/rok4/tools), avec le code source.
* l'outil [tippecanoe](https://github.com/mapbox/tippecanoe), permettant le calcul des tuiles vectorielles
* la suite d'outil GDAL, permettant l'extraction des données vecteur
diff --git a/build/fullgeneration/debian11.Dockerfile b/build/fullgeneration/debian11.Dockerfile
index 671ded8..7d4457d 100644
--- a/build/fullgeneration/debian11.Dockerfile
+++ b/build/fullgeneration/debian11.Dockerfile
@@ -2,32 +2,38 @@ FROM ubuntu:20.04
RUN apt update && apt -y install curl procps wget gdal-bin
-ARG ROK4TILEMATRIXSETS_VERSION=4.0
+ARG ROK4TILEMATRIXSETS_VERSION=4.3
ENV ROK4TILEMATRIXSETS_VERSION=$ROK4TILEMATRIXSETS_VERSION
RUN curl -L -o rok4-tilematrixsets.deb https://github.com/rok4/tilematrixsets/releases/download/${ROK4TILEMATRIXSETS_VERSION}/rok4-tilematrixsets-${ROK4TILEMATRIXSETS_VERSION}-linux-all.deb && apt install ./rok4-tilematrixsets.deb
-ENV ROK4_TMS_DIRECTORY=/etc/rok4/tilematrixsets
+ENV ROK4_TMS_DIRECTORY=/usr/share/rok4/tilematrixsets
-ARG ROK4STYLES_VERSION=4.0
+ARG ROK4STYLES_VERSION=4.4
ENV ROK4STYLES_VERSION=$ROK4STYLES_VERSION
RUN curl -L -o rok4-styles.deb https://github.com/rok4/styles/releases/download/${ROK4STYLES_VERSION}/rok4-styles-${ROK4STYLES_VERSION}-linux-all.deb && apt install ./rok4-styles.deb
+ARG ROK4CORECPP_VERSION
+ENV ROK4CORECPP_VERSION=$ROK4CORECPP_VERSION
+RUN curl -L -o librok4-dev.deb https://github.com/rok4/core-cpp/releases/download/${ROK4CORECPP_VERSION}/librok4-ceph-${ROK4CORECPP_VERSION}-ubuntu-20.04-amd64.deb && apt install -y ./librok4-dev.deb
+
ARG ROK4GENERATION_VERSION
ENV ROK4GENERATION_VERSION=$ROK4GENERATION_VERSION
-RUN curl -L -o rok4-generation.deb https://github.com/rok4/generation/releases/download/${ROK4GENERATION_VERSION}/rok4-generation-${ROK4GENERATION_VERSION}-ubuntu20.04-amd64.deb && apt install -y ./rok4-generation.deb
+RUN curl -L -o rok4-generation.deb https://github.com/rok4/generation/releases/download/${ROK4GENERATION_VERSION}/rok4-generation-${ROK4GENERATION_VERSION}-ubuntu-20.04-amd64.deb && apt install -y ./rok4-generation.deb
ARG ROK4COREPERL_VERSION
ENV ROK4COREPERL_VERSION=$ROK4COREPERL_VERSION
-RUN curl -L -o librok4-core-perl.deb https://github.com/rok4/core-perl/releases/download/${ROK4COREPERL_VERSION}/librok4-core-perl-${ROK4COREPERL_VERSION}-ubuntu20.04-all.deb && DEBIAN_FRONTEND=noninteractive apt install -y ./librok4-core-perl.deb
+RUN curl -L -o librok4-core-perl.deb https://github.com/rok4/core-perl/releases/download/${ROK4COREPERL_VERSION}/librok4-core-perl-${ROK4COREPERL_VERSION}-ubuntu-20.04-all.deb && DEBIAN_FRONTEND=noninteractive apt install -y ./librok4-core-perl.deb
+
+RUN curl -L -o libnet-amazon-s3-perl_0.991-1_all.deb http://archive.ubuntu.com/ubuntu/pool/universe/libn/libnet-amazon-s3-perl/libnet-amazon-s3-perl_0.991-1_all.deb && apt install -y ./libnet-amazon-s3-perl_0.991-1_all.deb && rm ./libnet-amazon-s3-perl_0.991-1_all.deb
ARG ROK4PREGENERATION_VERSION
ENV ROK4PREGENERATION_VERSION=$ROK4PREGENERATION_VERSION
-RUN curl -L -o rok4-pregeneration.deb https://github.com/rok4/pregeneration/releases/download/${ROK4PREGENERATION_VERSION}/rok4-pregeneration-${ROK4PREGENERATION_VERSION}-ubuntu20.04-all.deb && apt install -y ./rok4-pregeneration.deb
+RUN curl -L -o rok4-pregeneration.deb https://github.com/rok4/pregeneration/releases/download/${ROK4PREGENERATION_VERSION}/rok4-pregeneration-${ROK4PREGENERATION_VERSION}-ubuntu-20.04-all.deb && apt install -y ./rok4-pregeneration.deb
ARG ROK4TOOLS_VERSION
ENV ROK4TOOLS_VERSION=$ROK4TOOLS_VERSION
-RUN curl -L -o rok4-tools.deb https://github.com/rok4/tools/releases/download/${ROK4TOOLS_VERSION}/rok4-tools-${ROK4TOOLS_VERSION}-ubuntu20.04-all.deb && apt install -y ./rok4-tools.deb
+RUN curl -L -o rok4-tools.deb https://github.com/rok4/tools/releases/download/${ROK4TOOLS_VERSION}/rok4-tools-${ROK4TOOLS_VERSION}-ubuntu-20.04-all.deb && apt install -y ./rok4-tools.deb
COPY --from=metacollin/tippecanoe:latest /usr/local/bin/tippecanoe /usr/bin/tippecanoe
ENV TIPPECANOE_VERSION=v1.36.0
-CMD echo "ROK4:\n\t- generation: $ROK4GENERATION_VERSION\n\t- pregeneration: $ROK4PREGENERATION_VERSION\n\t- tools: $ROK4TOOLS_VERSION\n\t- core Perl: $ROK4COREPERL_VERSION\n\t- styles: $ROK4STYLES_VERSION\n\t- tile matrix sets: $ROK4TILEMATRIXSETS_VERSION\nTippecanoe: $TIPPECANOE_VERSION"
+CMD echo "ROK4:\n\t- generation: $ROK4GENERATION_VERSION\n\t- pregeneration: $ROK4PREGENERATION_VERSION\n\t- tools: $ROK4TOOLS_VERSION\n\t- core C++: $ROK4CORECPP_VERSION\n\t- core Perl: $ROK4COREPERL_VERSION\n\t- styles: $ROK4STYLES_VERSION\n\t- tile matrix sets: $ROK4TILEMATRIXSETS_VERSION\nTippecanoe: $TIPPECANOE_VERSION"
diff --git a/build/generation/README.md b/build/generation/README.md
index a7e76be..97f9117 100644
--- a/build/generation/README.md
+++ b/build/generation/README.md
@@ -2,7 +2,7 @@
Cette image contient tous les binaires permettant d'exécuter les scripts générés par les outils de pré-génération, c'est à dire :
-* les outils permettant la manipulation des données images (reprojection, réechantillonnage, superposition...) ainsi que la mise au format final des données (écriture des dalles des pyramides ROK4). Ces outils font partie du projet, la documentation complète est disponible [ici](https://github.com/rok4/generation), avec le code source.
+* les outils permettant la manipulation des données images (reprojection, réechantillonnage, superposition...) ainsi que la mise au format final des données (écriture des dalles des pyramides ROK4). Ces outils font partie du projet, la documentation complète est disponible [ici](https://rok4.github.io/generation).
* l'outil [tippecanoe](https://github.com/mapbox/tippecanoe), permettant le calcul des tuiles vectorielles
* la suite d'outil GDAL, permettant l'extraction des données vecteur
diff --git a/build/generation/debian11.Dockerfile b/build/generation/debian11.Dockerfile
index 2939fef..f62d1ff 100644
--- a/build/generation/debian11.Dockerfile
+++ b/build/generation/debian11.Dockerfile
@@ -2,15 +2,19 @@ FROM ubuntu:20.04
RUN apt update && apt -y install curl procps wget gdal-bin
-ARG ROK4STYLES_VERSION=4.0
+ARG ROK4STYLES_VERSION=4.4
ENV ROK4STYLES_VERSION=$ROK4STYLES_VERSION
RUN curl -L -o rok4-styles.deb https://github.com/rok4/styles/releases/download/${ROK4STYLES_VERSION}/rok4-styles-${ROK4STYLES_VERSION}-linux-all.deb && apt install ./rok4-styles.deb
+ARG ROK4CORECPP_VERSION
+ENV ROK4CORECPP_VERSION=$ROK4CORECPP_VERSION
+RUN curl -L -o librok4-dev.deb https://github.com/rok4/core-cpp/releases/download/${ROK4CORECPP_VERSION}/librok4-ceph-${ROK4CORECPP_VERSION}-ubuntu-20.04-amd64.deb && apt install -y ./librok4-dev.deb
+
ARG ROK4GENERATION_VERSION
ENV ROK4GENERATION_VERSION=$ROK4GENERATION_VERSION
-RUN curl -L -o rok4-generation.deb https://github.com/rok4/generation/releases/download/${ROK4GENERATION_VERSION}/rok4-generation-${ROK4GENERATION_VERSION}-ubuntu20.04-amd64.deb && apt install -y ./rok4-generation.deb
+RUN curl -L -o rok4-generation.deb https://github.com/rok4/generation/releases/download/${ROK4GENERATION_VERSION}/rok4-generation-${ROK4GENERATION_VERSION}-ubuntu-20.04-amd64.deb && apt install -y ./rok4-generation.deb
COPY --from=metacollin/tippecanoe:latest /usr/local/bin/tippecanoe /usr/bin/tippecanoe
ENV TIPPECANOE_VERSION=v1.36.0
-CMD echo "ROK4:\n\t- generation: $ROK4GENERATION_VERSION\n\t- styles: $ROK4STYLES_VERSION\nTippecanoe: $TIPPECANOE_VERSION"
+CMD echo "ROK4:\n\t- generation: $ROK4GENERATION_VERSION- core C++: $ROK4CORECPP_VERSION\n\t\n\t- styles: $ROK4STYLES_VERSION\nTippecanoe: $TIPPECANOE_VERSION"
diff --git a/build/generation/debian12.Dockerfile b/build/generation/debian12.Dockerfile
index c43dec7..4f10c63 100644
--- a/build/generation/debian12.Dockerfile
+++ b/build/generation/debian12.Dockerfile
@@ -2,15 +2,19 @@ FROM ubuntu:22.04
RUN apt update && apt -y install curl procps wget gdal-bin
-ARG ROK4STYLES_VERSION=4.0
+ARG ROK4STYLES_VERSION=4.4
ENV ROK4STYLES_VERSION=$ROK4STYLES_VERSION
RUN curl -L -o rok4-styles.deb https://github.com/rok4/styles/releases/download/${ROK4STYLES_VERSION}/rok4-styles-${ROK4STYLES_VERSION}-linux-all.deb && apt install ./rok4-styles.deb
+ARG ROK4CORECPP_VERSION
+ENV ROK4CORECPP_VERSION=$ROK4CORECPP_VERSION
+RUN curl -L -o librok4-dev.deb https://github.com/rok4/core-cpp/releases/download/${ROK4CORECPP_VERSION}/librok4-ceph-${ROK4CORECPP_VERSION}-ubuntu-22.04-amd64.deb && apt install -y ./librok4-dev.deb
+
ARG ROK4GENERATION_VERSION
ENV ROK4GENERATION_VERSION=$ROK4GENERATION_VERSION
-RUN curl -L -o rok4-generation.deb https://github.com/rok4/generation/releases/download/${ROK4GENERATION_VERSION}/rok4-generation-${ROK4GENERATION_VERSION}-ubuntu22.04-amd64.deb && apt install -y ./rok4-generation.deb
+RUN curl -L -o rok4-generation.deb https://github.com/rok4/generation/releases/download/${ROK4GENERATION_VERSION}/rok4-generation-${ROK4GENERATION_VERSION}-ubuntu-22.04-amd64.deb && apt install -y ./rok4-generation.deb
COPY --from=metacollin/tippecanoe:latest /usr/local/bin/tippecanoe /usr/bin/tippecanoe
ENV TIPPECANOE_VERSION=v1.36.0
-CMD echo "ROK4:\n\t- generation: $ROK4GENERATION_VERSION\n\t- styles: $ROK4STYLES_VERSION\nTippecanoe: $TIPPECANOE_VERSION"
+CMD echo "ROK4:\n\t- generation: $ROK4GENERATION_VERSION- core C++: $ROK4CORECPP_VERSION\n\t\n\t- styles: $ROK4STYLES_VERSION\nTippecanoe: $TIPPECANOE_VERSION"
diff --git a/build/pregeneration/debian11.Dockerfile b/build/pregeneration/debian11.Dockerfile
index 5d5b628..40a26ed 100644
--- a/build/pregeneration/debian11.Dockerfile
+++ b/build/pregeneration/debian11.Dockerfile
@@ -2,17 +2,19 @@ FROM ubuntu:20.04
RUN apt update && apt -y install curl procps wget gdal-bin
-ARG ROK4TILEMATRIXSETS_VERSION=4.0
+ARG ROK4TILEMATRIXSETS_VERSION=4.3
ENV ROK4TILEMATRIXSETS_VERSION=$ROK4TILEMATRIXSETS_VERSION
-RUN curl -L -o rok4-tilematrixsets.deb https://github.com/rok4/tilematrixsets/releases/download/${ROK4TILEMATRIXSETS_VERSION}/rok4-tilematrixsets-${ROK4TILEMATRIXSETS_VERSION}-linux-all.deb && apt install ./rok4-tilematrixsets.deb
-ENV ROK4_TMS_DIRECTORY=/etc/rok4/tilematrixsets
+RUN curl -L -o rok4-tilematrixsets.deb https://github.com/rok4/tilematrixsets/releases/download/${ROK4TILEMATRIXSETS_VERSION}/rok4-tilematrixsets-${ROK4TILEMATRIXSETS_VERSION}-linux-all.deb && apt install ./rok4-tilematrixsets.deb && rm ./rok4-tilematrixsets.deb
+ENV ROK4_TMS_DIRECTORY=/usr/share/rok4/tilematrixsets
ARG ROK4COREPERL_VERSION
ENV ROK4COREPERL_VERSION=$ROK4COREPERL_VERSION
-RUN curl -L -o librok4-core-perl.deb https://github.com/rok4/core-perl/releases/download/${ROK4COREPERL_VERSION}/librok4-core-perl-${ROK4COREPERL_VERSION}-ubuntu20.04-all.deb && DEBIAN_FRONTEND=noninteractive apt install -y ./librok4-core-perl.deb
+RUN curl -L -o librok4-core-perl.deb https://github.com/rok4/core-perl/releases/download/${ROK4COREPERL_VERSION}/librok4-core-perl-${ROK4COREPERL_VERSION}-ubuntu-20.04-all.deb && DEBIAN_FRONTEND=noninteractive apt install -y ./librok4-core-perl.deb && rm ./librok4-core-perl.deb
+
+RUN curl -L -o libnet-amazon-s3-perl_0.991-1_all.deb http://snapshot.debian.org/archive/debian/20220718T213229Z/pool/main/libn/libnet-amazon-s3-perl/libnet-amazon-s3-perl_0.991-1_all.deb && apt install -y ./libnet-amazon-s3-perl_0.991-1_all.deb && rm ./libnet-amazon-s3-perl_0.991-1_all.deb
ARG ROK4PREGENERATION_VERSION
ENV ROK4PREGENERATION_VERSION=$ROK4PREGENERATION_VERSION
-RUN curl -L -o rok4-pregeneration.deb https://github.com/rok4/pregeneration/releases/download/${ROK4PREGENERATION_VERSION}/rok4-pregeneration-${ROK4PREGENERATION_VERSION}-ubuntu20.04-all.deb && apt install -y ./rok4-pregeneration.deb
+RUN curl -L -o rok4-pregeneration.deb https://github.com/rok4/pregeneration/releases/download/${ROK4PREGENERATION_VERSION}/rok4-pregeneration-${ROK4PREGENERATION_VERSION}-ubuntu-20.04-all.deb && apt install -y ./rok4-pregeneration.deb && rm ./rok4-pregeneration.deb
CMD echo "ROK4:\n\t- pregeneration: $ROK4PREGENERATION_VERSION\n\t- core Perl: $ROK4COREPERL_VERSION\n\t- tile matrix sets: $ROK4TILEMATRIXSETS_VERSION"
diff --git a/build/pregeneration/debian12.Dockerfile b/build/pregeneration/debian12.Dockerfile
index 8061917..4eed339 100644
--- a/build/pregeneration/debian12.Dockerfile
+++ b/build/pregeneration/debian12.Dockerfile
@@ -2,17 +2,17 @@ FROM ubuntu:22.04
RUN apt update && apt -y install curl procps wget gdal-bin
-ARG ROK4TILEMATRIXSETS_VERSION=4.0
+ARG ROK4TILEMATRIXSETS_VERSION=4.3
ENV ROK4TILEMATRIXSETS_VERSION=$ROK4TILEMATRIXSETS_VERSION
RUN curl -L -o rok4-tilematrixsets.deb https://github.com/rok4/tilematrixsets/releases/download/${ROK4TILEMATRIXSETS_VERSION}/rok4-tilematrixsets-${ROK4TILEMATRIXSETS_VERSION}-linux-all.deb && apt install ./rok4-tilematrixsets.deb
-ENV ROK4_TMS_DIRECTORY=/etc/rok4/tilematrixsets
+ENV ROK4_TMS_DIRECTORY=/usr/share/rok4/tilematrixsets
ARG ROK4COREPERL_VERSION
ENV ROK4COREPERL_VERSION=$ROK4COREPERL_VERSION
-RUN curl -L -o librok4-core-perl.deb https://github.com/rok4/core-perl/releases/download/${ROK4COREPERL_VERSION}/librok4-core-perl-${ROK4COREPERL_VERSION}-ubuntu20.04-all.deb && DEBIAN_FRONTEND=noninteractive apt install -y ./librok4-core-perl.deb
+RUN curl -L -o librok4-core-perl.deb https://github.com/rok4/core-perl/releases/download/${ROK4COREPERL_VERSION}/librok4-core-perl-${ROK4COREPERL_VERSION}-ubuntu-20.04-all.deb && DEBIAN_FRONTEND=noninteractive apt install -y ./librok4-core-perl.deb
ARG ROK4PREGENERATION_VERSION
ENV ROK4PREGENERATION_VERSION=$ROK4PREGENERATION_VERSION
-RUN curl -L -o rok4-pregeneration.deb https://github.com/rok4/pregeneration/releases/download/${ROK4PREGENERATION_VERSION}/rok4-pregeneration-${ROK4PREGENERATION_VERSION}-ubuntu20.04-all.deb && apt install -y ./rok4-pregeneration.deb
+RUN curl -L -o rok4-pregeneration.deb https://github.com/rok4/pregeneration/releases/download/${ROK4PREGENERATION_VERSION}/rok4-pregeneration-${ROK4PREGENERATION_VERSION}-ubuntu-20.04-all.deb && apt install -y ./rok4-pregeneration.deb
CMD echo "ROK4:\n\t- pregeneration: $ROK4PREGENERATION_VERSION\n\t- core Perl: $ROK4COREPERL_VERSION\n\t- tile matrix sets: $ROK4TILEMATRIXSETS_VERSION"
diff --git a/build/pytools/README.md b/build/pytools/README.md
new file mode 100644
index 0000000..304cc41
--- /dev/null
+++ b/build/pytools/README.md
@@ -0,0 +1,98 @@
+# Outils python de gestion du projet ROK4 conteneurisés
+
+Cette suite d'outil facilite la gestion des pyramides (conversions, statistiques), la création de descripteur de couche par défaut, ainsi qu'un outil de conversion basé sur les TMS.
+
+La documentation complète est disponible [ici](https://rok4.github.io/pytools).
+
+## PYR2PYR
+
+PYR2PYR est un outil de copie d'une pyramide d'un stockage à un autre. Il est possible de filtrer les dalles transférée en précisant une taille limite sous laquelle les données ne sont pas recopiées. La copie des dalles est parallélisable. Si des signatures MD5 sont présente dans le fichier liste, elles sont contrôlées après recopie.
+
+Un exemple de configuration est affichable avec la commande `pyr2pyr --role example` et l'appel `pyr2pyr --role check --conf conf.json` permet de valider un fichier de configuration. Le fichier de configuration peut être un objet, auquel cas le chemin doit être préfixé par le type de stockage (exemple : `s3://bucket/configuration.json`)
+
+Exemple d'appel :
+
+```bash
+docker run --rm \
+ -e ROK4_S3_SECRETKEY=rok4S3storage \
+ -e ROK4_S3_KEY=rok4 \
+ -e ROK4_S3_URL=http://storage:9000 \
+ -v ./input:/input
+ rok4/tools \
+ rok4/pytools \
+ pyr2pyr --role master --conf s3://configurations/pyr2pyr.json
+```
+
+Documentation complète de l'outil [ici](https://rok4.github.io/pytools/latest/#pyr2pyr).
+
+### JOINCACHE
+
+L'outil JOINCACHE génèrent une pyramide raster à partir d'autres pyramide raster compatibles (même TMS, dalles de même dimensions, canaux au même format). La composition se fait verticalement (choix des pyramides sources par niveau) et horizontalement (choix des pyramides source par zone au sein d'un niveau).
+
+Un exemple de configuration est affichable avec la commande `joincache --role example` et l'appel `joincache --role check --conf conf.json` permet de valider un fichier de configuration. Le fichier de configuration peut être un objet, auquel cas le chemin doit être préfixé par le type de stockage (exemple : `s3://bucket/configuration.json`)
+
+Exemple d'appel :
+
+```bash
+docker run --rm \
+ -e ROK4_S3_SECRETKEY=rok4S3storage \
+ -e ROK4_S3_KEY=rok4 \
+ -e ROK4_S3_URL=http://storage:9000 \
+ rok4/pytools \
+ joincache --role agent --split 1 --conf s3://configurations/joincache.json
+```
+
+Documentation complète de l'outil [ici](https://rok4.github.io/pytools/latest/#joincache).
+
+### MAKE-LAYER
+
+MAKE-LAYER est un outil générant un descripteur de couche compatible avec le serveur à partir des pyramides de données à utiliser
+
+Exemple d'appel :
+
+```bash
+docker run --rm \
+ -e ROK4_S3_SECRETKEY=rok4S3storage \
+ -e ROK4_S3_KEY=rok4 \
+ -e ROK4_S3_URL=http://storage:9000 \
+ rok4/pytools \
+ make-layer --pyramids s3://pyramids/data.json --name my_data --title "Titre de ma couche" --directory s3://layers/
+```
+
+Documentation complète de l'outil [ici](https://rok4.github.io/pytools/latest/#make-layer).
+
+### PYROLYSE
+
+PYROLYSE est un outil d'analyse d'une pyramide, permettant d'avoir le nombre et la taille des dalles et tuiles, au global et par niveau. Les tailles des dalles et des tuiles ne sont pas toutes récupérées : un ratio permet de définir le nombre de mesures (un ratio de 100 entraînera la récupération de la taille d'une dalle sur 100 et d'une de ses tuile). Ce ratio s'applique par niveau (pour ne pas avoir que des données sur le meilleur niveau, celui qui contient le plus de dalles). Lorsque les statistiques sur les tuiles sont activées, on mesure le temps de lecture du header.
+
+Concernant les tailles et les temps d'accès, il est possible de demander le calcul des déciles plutôt que de garder toutes les valeurs.
+
+Exemple d'appel :
+
+```bash
+docker run --rm \
+ -e ROK4_S3_SECRETKEY=rok4S3storage \
+ -e ROK4_S3_KEY=rok4 \
+ -e ROK4_S3_URL=http://storage:9000 \
+ -v $PWD/output:/output \
+ rok4/pytools \
+ pyrolyse --pyramid s3://pyramids/data.json --tiles --progress --ratio 10 --json /output/stats.json
+```
+
+Documentation complète de l'outil [ici](https://rok4.github.io/pytools/latest/#pyrolyse).
+
+### TMSIZER
+
+TMSIZER est un outil permettant de convertir des informations selon différents formats en accord avec un Tile Matrix Set en particulier. Les données en entrée peuvent être lues depuis un fichier, un objet ou l'entrée standard. Les données en sortie peuvent être écrites dans un fichier, un objet ou la sortie standard.
+
+Exemple d'appel :
+
+```bash
+docker run --rm \
+ -v $PWD/input:/input:ro \
+ -v $PWD/output:/output \
+ rok4/pytools \
+ tmsizer -i /input/logs.txt --tms PM -io levels=15,14 -io layers=LAYER.NAME1,LAYER.NAME2,LAYER.NAME3 -if GETTILE_PARAMS -of HEATMAP -oo bbox=65000,6100000,665000,6500000 -oo dimensions=600x400 -o /output/heatmap.tif
+```
+
+Documentation complète de l'outil [ici](https://rok4.github.io/pytools/latest/#tmsizer).
diff --git a/build/pytools/debian11.Dockerfile b/build/pytools/debian11.Dockerfile
new file mode 100644
index 0000000..66434a5
--- /dev/null
+++ b/build/pytools/debian11.Dockerfile
@@ -0,0 +1,17 @@
+FROM python:3.10-slim-bullseye
+
+RUN apt update && apt -y install gdal-bin libgdal-dev curl g++
+
+ARG ROK4TILEMATRIXSETS_VERSION=4.3
+ENV ROK4TILEMATRIXSETS_VERSION=$ROK4TILEMATRIXSETS_VERSION
+RUN curl -L -o rok4-tilematrixsets.deb https://github.com/rok4/tilematrixsets/releases/download/${ROK4TILEMATRIXSETS_VERSION}/rok4-tilematrixsets-${ROK4TILEMATRIXSETS_VERSION}-linux-all.deb && apt install ./rok4-tilematrixsets.deb
+ENV ROK4_TMS_DIRECTORY=/usr/share/rok4/tilematrixsets
+
+ARG ROK4PYTOOLS_VERSION
+ENV ROK4PYTOOLS_VERSION=$ROK4PYTOOLS_VERSION
+
+WORKDIR /home
+RUN pip install rok4-tools==$ROK4PYTOOLS_VERSION
+RUN pip install GDAL=="$(gdal-config --version).*" && pip install gdal[numpy]=="$(gdal-config --version).*"
+
+CMD echo "ROK4:\n\t- pytools: $ROK4PYTOOLS_VERSION\n\t- tile matrix sets: $ROK4TILEMATRIXSETS_VERSION"
diff --git a/build/server/debian11.Dockerfile b/build/server/debian11.Dockerfile
deleted file mode 100644
index 715c614..0000000
--- a/build/server/debian11.Dockerfile
+++ /dev/null
@@ -1,45 +0,0 @@
-FROM ubuntu:20.04
-
-RUN apt update && apt -y install curl gettext
-
-ARG ROK4TILEMATRIXSETS_VERSION=4.0
-ENV ROK4TILEMATRIXSETS_VERSION=$ROK4TILEMATRIXSETS_VERSION
-RUN curl -L -o rok4-tilematrixsets.deb https://github.com/rok4/tilematrixsets/releases/download/${ROK4TILEMATRIXSETS_VERSION}/rok4-tilematrixsets-${ROK4TILEMATRIXSETS_VERSION}-linux-all.deb && apt install ./rok4-tilematrixsets.deb
-
-ARG ROK4STYLES_VERSION=4.0
-ENV ROK4STYLES_VERSION=$ROK4STYLES_VERSION
-RUN curl -L -o rok4-styles.deb https://github.com/rok4/styles/releases/download/${ROK4STYLES_VERSION}/rok4-styles-${ROK4STYLES_VERSION}-linux-all.deb && apt install ./rok4-styles.deb
-
-ARG ROK4SERVER_VERSION
-ENV ROK4SERVER_VERSION=$ROK4SERVER_VERSION
-RUN curl -L -o rok4-server.deb https://github.com/rok4/server/releases/download/${ROK4SERVER_VERSION}/rok4-server-${ROK4SERVER_VERSION}-ubuntu20.04-amd64.deb && apt install -y ./rok4-server.deb
-
-# Configuration par variables d'environnement par défaut
-ENV IMPORT_LAYERS_FROM_PYRAMIDS=""
-ENV SERVER_LOGLEVEL="error" SERVER_LOGOUTPUT="standard_output_stream_for_errors" SERVER_NBTHREAD="4" SERVER_CACHE_SIZE="1000" SERVER_CACHE_VALIDITY="10" SERVER_BACKLOG="0"
-ENV SERVER_LAYERS="/etc/rok4/layers" SERVER_STYLES="/etc/rok4/styles" SERVER_TMS="/etc/rok4/tilematrixsets"
-ENV SERVICE_TITLE="WMS/WMTS/TMS server" SERVICE_ABSTRACT="This server provide WMS, WMTS and TMS raster and vector data broadcast" SERVICE_PROVIDERNAME="ROK4 Team" SERVICE_PROVIDERSITE="https://github.com/rok4/documentation" SERVICE_KEYWORDS="WMS,WMTS,TMS,Docker"
-ENV SERVICE_FEE="none" SERVICE_ACCESSCONSTRAINT="none"
-ENV SERVICE_WMS="WMS service" SERVICE_MAXWIDTH="10000" SERVICE_MAXHEIGHT="10000" SERVICE_LAYERLIMIT="2" SERVICE_MAXTILEX="256" SERVICE_MAXTILEY="256" SERVICE_FORMATLIST="image/jpeg,image/png,image/tiff,image/geotiff,image/x-bil;bits=32"
-ENV SERVICE_GLOBALCRSLIST="CRS:84,EPSG:3857" SERVICE_FULLYSTYLING="true" SERVICE_INSPIRE="false"
-ENV SERVICE_WMTSSUPPORT="true" SERVICE_TMSSUPPORT="true" SERVICE_WMSSUPPORT="true"
-ENV SERVICE_WMTS_ENDPOINT="http://localhost/wmts" SERVICE_TMS_ENDPOINT="http://localhost/tms" SERVICE_WMS_ENDPOINT="http://localhost/wms"
-
-WORKDIR /
-
-# Déploiement des configurations
-COPY ./server.template.json /etc/rok4/server.template.json
-COPY ./services.template.json /etc/rok4/services.template.json
-
-COPY ./docker-entrypoint.sh /
-RUN chmod +x /docker-entrypoint.sh
-
-RUN mkdir /etc/rok4/layers /pyramids
-
-VOLUME /etc/rok4/layers
-VOLUME /pyramids
-
-EXPOSE 9000
-
-ENTRYPOINT ["/docker-entrypoint.sh"]
-CMD ["/usr/bin/rok4", "-f", "/etc/rok4/server.json"]
diff --git a/build/server/debian12.Dockerfile b/build/server/debian12.Dockerfile
deleted file mode 100644
index 46e20be..0000000
--- a/build/server/debian12.Dockerfile
+++ /dev/null
@@ -1,45 +0,0 @@
-FROM ubuntu:22.04
-
-RUN apt update && apt -y install curl gettext
-
-ARG ROK4TILEMATRIXSETS_VERSION=4.0
-ENV ROK4TILEMATRIXSETS_VERSION=$ROK4TILEMATRIXSETS_VERSION
-RUN curl -L -o rok4-tilematrixsets.deb https://github.com/rok4/tilematrixsets/releases/download/${ROK4TILEMATRIXSETS_VERSION}/rok4-tilematrixsets-${ROK4TILEMATRIXSETS_VERSION}-linux-all.deb && apt install ./rok4-tilematrixsets.deb
-
-ARG ROK4STYLES_VERSION=4.0
-ENV ROK4STYLES_VERSION=$ROK4STYLES_VERSION
-RUN curl -L -o rok4-styles.deb https://github.com/rok4/styles/releases/download/${ROK4STYLES_VERSION}/rok4-styles_${ROK4STYLES_VERSION}-linux-all.deb && apt install ./rok4-styles.deb
-
-ARG ROK4SERVER_VERSION
-ENV ROK4SERVER_VERSION=$ROK4SERVER_VERSION
-RUN curl -L -o rok4-server.deb https://github.com/rok4/server/releases/download/${ROK4SERVER_VERSION}/rok4-server-${ROK4SERVER_VERSION}-ubuntu22.04-amd64.deb && apt install -y ./rok4-server.deb
-
-# Configuration par variables d'environnement par défaut
-ENV IMPORT_LAYERS_FROM_PYRAMIDS=""
-ENV SERVER_LOGLEVEL="error" SERVER_LOGOUTPUT="standard_output_stream_for_errors" SERVER_NBTHREAD="4" SERVER_CACHE_SIZE="1000" SERVER_CACHE_VALIDITY="10" SERVER_BACKLOG="0"
-ENV SERVER_LAYERS="/etc/rok4/layers" SERVER_STYLES="/etc/rok4/styles" SERVER_TMS="/etc/rok4/tilematrixsets"
-ENV SERVICE_TITLE="WMS/WMTS/TMS server" SERVICE_ABSTRACT="This server provide WMS, WMTS and TMS raster and vector data broadcast" SERVICE_PROVIDERNAME="ROK4 Team" SERVICE_PROVIDERSITE="https://github.com/rok4/documentation" SERVICE_KEYWORDS="WMS,WMTS,TMS,Docker"
-ENV SERVICE_FEE="none" SERVICE_ACCESSCONSTRAINT="none"
-ENV SERVICE_WMS="WMS service" SERVICE_MAXWIDTH="10000" SERVICE_MAXHEIGHT="10000" SERVICE_LAYERLIMIT="2" SERVICE_MAXTILEX="256" SERVICE_MAXTILEY="256" SERVICE_FORMATLIST="image/jpeg,image/png,image/tiff,image/geotiff,image/x-bil;bits=32"
-ENV SERVICE_GLOBALCRSLIST="CRS:84,EPSG:3857" SERVICE_FULLYSTYLING="true" SERVICE_INSPIRE="false"
-ENV SERVICE_WMTSSUPPORT="true" SERVICE_TMSSUPPORT="true" SERVICE_WMSSUPPORT="true"
-ENV SERVICE_WMTS_ENDPOINT="http://localhost/wmts" SERVICE_TMS_ENDPOINT="http://localhost/tms" SERVICE_WMS_ENDPOINT="http://localhost/wms"
-
-WORKDIR /
-
-# Déploiement des configurations
-COPY ./server.template.json /etc/rok4/server.template.json
-COPY ./services.template.json /etc/rok4/services.template.json
-
-COPY ./docker-entrypoint.sh /
-RUN chmod +x /docker-entrypoint.sh
-
-RUN mkdir /etc/rok4/layers /pyramids
-
-VOLUME /etc/rok4/layers
-VOLUME /pyramids
-
-EXPOSE 9000
-
-ENTRYPOINT ["/docker-entrypoint.sh"]
-CMD ["/usr/bin/rok4", "-f", "/etc/rok4/server.json"]
diff --git a/build/server/docker-entrypoint.sh b/build/server/docker-entrypoint.sh
index bfa6c3c..c713127 100644
--- a/build/server/docker-entrypoint.sh
+++ b/build/server/docker-entrypoint.sh
@@ -3,21 +3,19 @@ set -eu
# Refactor some variable
export SERVICE_KEYWORDS_JSON=$(echo $SERVICE_KEYWORDS | sed "s#,#\",\"#g")
-export SERVICE_FORMATLIST_JSON=$(echo $SERVICE_FORMATLIST | sed "s#,#\",\"#g")
-export SERVICE_GLOBALCRSLIST_JSON=$(echo $SERVICE_GLOBALCRSLIST | sed "s#,#\",\"#g")
-# Setup server.json
-envsubst < /etc/rok4/server.template.json > /etc/rok4/server.json
-
-# Setup services.json
-envsubst < /etc/rok4/services.template.json > /etc/rok4/services.json
+# Setup server.json : if final file already exists, we don't overwrite it
+if [[ ! -f /configurations/server.json ]]; then
+ envsubst < /etc/rok4/server.template.json > /configurations/server.json
+else
+ echo "/configurations/server.json exists: we don't overwrite it"
+fi
-# Centralisation des descripteurs de couches
-if [[ ! -z $IMPORT_LAYERS_FROM_PYRAMIDS ]] ; then
- for lay in $(find /pyramids/ -maxdepth 2 -name "*.lay.json"); do
- bn=$(basename -s ".lay.json" $lay)
- cp $lay /etc/rok4/layers/$bn.json
- done
+# Setup services.json : if final file already exists, we don't overwrite it
+if [[ ! -f /configurations/services.json ]]; then
+ envsubst < /etc/rok4/services.template.json > /configurations/services.json
+else
+ echo "/configurations/services.json exists: we don't overwrite it"
fi
exec "$@"
\ No newline at end of file
diff --git a/build/server/server.template.json b/build/server/server.template.json
index 0a8d113..38dd688 100644
--- a/build/server/server.template.json
+++ b/build/server/server.template.json
@@ -6,13 +6,12 @@
"threads": ${SERVER_NBTHREAD},
"port": ":9000",
"backlog": ${SERVER_BACKLOG},
- "api": true,
"cache": {
"size": ${SERVER_CACHE_SIZE},
"validity": ${SERVER_CACHE_VALIDITY}
},
"configurations": {
- "services": "/etc/rok4/services.json",
+ "services": "/configurations/services.json",
"layers": "${SERVER_LAYERS}",
"styles": "${SERVER_STYLES}",
"tile_matrix_sets": "${SERVER_TMS}"
diff --git a/build/server/services.template.json b/build/server/services.template.json
index 68cb82e..2e4c130 100644
--- a/build/server/services.template.json
+++ b/build/server/services.template.json
@@ -1,11 +1,6 @@
{
- "title": "${SERVICE_TITLE}",
- "abstract": "${SERVICE_ABSTRACT}",
"provider": "${SERVICE_PROVIDERNAME}",
"site": "${SERVICE_PROVIDERSITE}",
- "keywords": [
- "${SERVICE_KEYWORDS_JSON}"
- ],
"fee": "${SERVICE_FEE}",
"access_constraint": "${SERVICE_ACCESSCONSTRAINT}",
"contact": {
@@ -21,51 +16,89 @@
"country": "${SERVICE_COUNTRY}",
"email": "${SERVICE_ELECTRONICMAILADDRESS}"
},
+ "crs_equivalences": "/etc/rok4/equals_crs.json",
+ "admin": {
+ "enabled": ${SERVICE_ADMIN_SUPPORT}
+ },
+ "health": {
+ "enabled": true
+ },
"common": {
- "info_formats": [
- "text/plain",
- "text/html",
- "text/xml",
- "application/xml",
- "application/json"
- ],
- "styling": ${SERVICE_FULLYSTYLING},
- "reprojection": true,
- "inspire": ${SERVICE_INSPIRE},
- "post_mode": false
+ "enabled": ${SERVICE_COMMON_SUPPORT},
+ "endpoint_uri": "${SERVICE_COMMON_ENDPOINT}",
+ "root_path": "/common",
+ "title": "Service COMMON",
+ "abstract": "Ce service permet la découvertes des services assurés par ce serveur",
+ "keywords": [
+ "COMMON"
+ ]
},
"wms": {
- "active": ${SERVICE_WMSSUPPORT},
+ "enabled": ${SERVICE_WMS_SUPPORT},
"endpoint_uri": "${SERVICE_WMS_ENDPOINT}",
- "name": "${SERVICE_WMS}",
- "max_width": ${SERVICE_MAXWIDTH},
- "max_height": ${SERVICE_MAXHEIGHT},
- "layer_limit": ${SERVICE_LAYERLIMIT},
- "max_tile_x": ${SERVICE_MAXTILEX},
- "max_tile_y": ${SERVICE_MAXTILEY},
+ "root_path": "/wms",
+ "title": "Service de visualisation WMS",
+ "abstract": "Ce service permet la visulation de couches de données raster IGN au travers d'un flux WMS",
+ "keywords": [
+ "WMS"
+ ],
+ "limits": {
+ "width": 5000,
+ "height": 5000,
+ "tile_x": 32,
+ "tile_y": 32,
+ "layers_count": 2
+ },
+ "name": "WMS",
"formats": [
- "${SERVICE_FORMATLIST_JSON}"
+ "image/jpeg",
+ "image/png",
+ "image/tiff",
+ "image/geotiff",
+ "image/x-bil;bits=32"
],
"crs": [
- "${SERVICE_GLOBALCRSLIST_JSON}"
+ "CRS:84",
+ "EPSG:3857",
+ "EPSG:4326"
],
- "metadata": {
- "url": "${SERVICE_METADATAWMS_URL}",
- "type": "${SERVICE_METADATAWMS_TYPE}",
- "format": "simple"
- }
+ "root_layer": {
+ "title": "Couches WMS",
+ "abstract": "Données servies en WMS"
+ },
+ "reprojection": true,
+ "inspire": false
},
"wmts": {
- "active": ${SERVICE_WMTSSUPPORT},
- "endpoint_uri": "${SERVICE_WMTS_ENDPOINT}",
- "metadata": {
- "url": "${SERVICE_METADATAWMTS_URL}",
- "type": "${SERVICE_METADATAWMTS_TYPE}",
- "format": "simple"
- }
+ "enabled": ${SERVICE_WMTS_SUPPORT},
+ "endpoint_uri": "${SERVICE_WMTS_ENDPOINT}",
+ "title": "Service de visualisation WMTS",
+ "abstract": "Ce service permet la visulation de couches de données raster IGN au travers d'un flux WMTS",
+ "keywords": [
+ "WMTS"
+ ],
+ "root_path": "/wmts",
+ "reprojection": true
},
"tms": {
- "active": ${SERVICE_TMSSUPPORT},
- "endpoint_uri": "${SERVICE_TMS_ENDPOINT}"
+ "enabled": ${SERVICE_TMS_SUPPORT},
+ "endpoint_uri": "${SERVICE_TMS_ENDPOINT}",
+ "root_path": "/tms",
+ "title": "Service de visualisation TMS",
+ "abstract": "Ce service permet la visulation de couches de données raster IGN au travers d'un flux TMS",
+ "keywords": [
+ "TMS"
+ ]
+ },
+ "tiles": {
+ "enabled": ${SERVICE_TILES_SUPPORT},
+ "endpoint_uri": "${SERVICE_TILES_ENDPOINT}",
+ "root_path": "/tiles",
+ "title": "Service de visualisation OGC API Tiles",
+ "abstract": "Ce service permet la visulation de couches de données raster IGN au travers d'un flux OGC API Tiles",
+ "keywords": [
+ "OGC API Tiles"
+ ],
+ "reprojection": true
}
}
\ No newline at end of file
diff --git a/build/server/ubuntu-2004-valgrind.Dockerfile b/build/server/ubuntu-2004-valgrind.Dockerfile
new file mode 100644
index 0000000..caa8819
--- /dev/null
+++ b/build/server/ubuntu-2004-valgrind.Dockerfile
@@ -0,0 +1,56 @@
+FROM ubuntu:20.04
+
+RUN apt update && apt -y install curl gettext
+
+ARG ROK4TILEMATRIXSETS_VERSION=4.3
+ENV ROK4TILEMATRIXSETS_VERSION=$ROK4TILEMATRIXSETS_VERSION
+RUN curl -L -o rok4-tilematrixsets.deb https://github.com/rok4/tilematrixsets/releases/download/${ROK4TILEMATRIXSETS_VERSION}/rok4-tilematrixsets-${ROK4TILEMATRIXSETS_VERSION}-linux-all.deb && apt install ./rok4-tilematrixsets.deb
+
+ARG ROK4STYLES_VERSION=4.4
+ENV ROK4STYLES_VERSION=$ROK4STYLES_VERSION
+RUN curl -L -o rok4-styles.deb https://github.com/rok4/styles/releases/download/${ROK4STYLES_VERSION}/rok4-styles-${ROK4STYLES_VERSION}-linux-all.deb && apt install ./rok4-styles.deb
+
+ARG ROK4CORECPP_VERSION
+ENV ROK4CORECPP_VERSION=$ROK4CORECPP_VERSION
+RUN curl -L -o librok4-dev.deb https://github.com/rok4/core-cpp/releases/download/${ROK4CORECPP_VERSION}/librok4-ceph-${ROK4CORECPP_VERSION}-ubuntu-20.04-amd64.deb && apt install -y ./librok4-dev.deb
+
+ARG ROK4SERVER_VERSION
+ENV ROK4SERVER_VERSION=$ROK4SERVER_VERSION
+RUN curl -L -o rok4-server.deb https://github.com/rok4/server/releases/download/${ROK4SERVER_VERSION}/rok4-server-${ROK4SERVER_VERSION}-ubuntu-20.04-amd64.deb && apt install -y ./rok4-server.deb
+
+# Configuration par variables d'environnement par défaut
+ENV ROK4_OBJECT_ATTEMPTS_WAIT=0
+ENV IMPORT_LAYERS_FROM_PYRAMIDS=""
+ENV SERVER_LOGLEVEL="debug" SERVER_LOGOUTPUT="standard_output" SERVER_NBTHREAD="4" SERVER_CACHE_SIZE="1000" SERVER_CACHE_VALIDITY="10" SERVER_BACKLOG="0"
+ENV SERVER_LAYERS="/etc/rok4/layers.txt" SERVER_STYLES="/usr/share/rok4/styles" SERVER_TMS="/usr/share/rok4/tilematrixsets"
+
+ENV SERVICE_TITLE="WMS/WMTS/TMS server" SERVICE_ABSTRACT="This server provide WMS, WMTS and TMS raster and vector data broadcast" SERVICE_PROVIDERNAME="ROK4 Team" SERVICE_PROVIDERSITE="https://github.com/rok4/documentation" SERVICE_KEYWORDS="WMS,WMTS,TMS,API Tiles,Docker"
+ENV SERVICE_FEE="none" SERVICE_ACCESSCONSTRAINT="none"
+ENV SERVICE_ADMIN_SUPPORT="true" SERVICE_COMMON_SUPPORT="true" SERVICE_WMTS_SUPPORT="true" SERVICE_TMS_SUPPORT="true" SERVICE_WMS_SUPPORT="true" SERVICE_TILES_SUPPORT="true"
+ENV SERVICE_COMMON_ENDPOINT="http://localhost/common" SERVICE_WMTS_ENDPOINT="http://localhost/wmts" SERVICE_TMS_ENDPOINT="http://localhost/tms" SERVICE_WMS_ENDPOINT="http://localhost/wms" SERVICE_TILES_ENDPOINT="http://localhost/tiles"
+
+
+WORKDIR /
+
+# Déploiement des configurations
+COPY ./server.template.json /etc/rok4/server.template.json
+COPY ./services.template.json /etc/rok4/services.template.json
+
+COPY ./docker-entrypoint.sh /
+RUN chmod +x /docker-entrypoint.sh
+
+RUN mkdir /etc/rok4/layers /pyramids
+
+RUN apt -y install valgrind
+
+VOLUME /etc/rok4/layers
+VOLUME /pyramids
+
+RUN mkdir /configurations && chown rok4:rok4 /configurations
+
+USER rok4
+
+EXPOSE 9000
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
+CMD ["valgrind", "--leak-check=full", "/usr/bin/rok4", "-f", "/configurations/server.json"]
diff --git a/build/server/ubuntu-2004.Dockerfile b/build/server/ubuntu-2004.Dockerfile
new file mode 100644
index 0000000..9bd098d
--- /dev/null
+++ b/build/server/ubuntu-2004.Dockerfile
@@ -0,0 +1,53 @@
+FROM ubuntu:20.04
+
+RUN apt update && apt -y install curl gettext
+
+ARG ROK4TILEMATRIXSETS_VERSION=4.3
+ENV ROK4TILEMATRIXSETS_VERSION=$ROK4TILEMATRIXSETS_VERSION
+RUN curl -L -o rok4-tilematrixsets.deb https://github.com/rok4/tilematrixsets/releases/download/${ROK4TILEMATRIXSETS_VERSION}/rok4-tilematrixsets-${ROK4TILEMATRIXSETS_VERSION}-linux-all.deb && apt install ./rok4-tilematrixsets.deb
+
+ARG ROK4STYLES_VERSION=4.4
+ENV ROK4STYLES_VERSION=$ROK4STYLES_VERSION
+RUN curl -L -o rok4-styles.deb https://github.com/rok4/styles/releases/download/${ROK4STYLES_VERSION}/rok4-styles-${ROK4STYLES_VERSION}-linux-all.deb && apt install ./rok4-styles.deb
+
+ARG ROK4CORECPP_VERSION
+ENV ROK4CORECPP_VERSION=$ROK4CORECPP_VERSION
+RUN curl -L -o librok4-dev.deb https://github.com/rok4/core-cpp/releases/download/${ROK4CORECPP_VERSION}/librok4-ceph-${ROK4CORECPP_VERSION}-ubuntu-20.04-amd64.deb && apt update && apt install -y ./librok4-dev.deb
+
+ARG ROK4SERVER_VERSION
+ENV ROK4SERVER_VERSION=$ROK4SERVER_VERSION
+RUN curl -L -o rok4-server.deb https://github.com/rok4/server/releases/download/${ROK4SERVER_VERSION}/rok4-server-${ROK4SERVER_VERSION}-ubuntu-20.04-amd64.deb && apt install -y ./rok4-server.deb
+
+# Configuration par variables d'environnement par défaut
+ENV ROK4_OBJECT_ATTEMPTS_WAIT=0
+ENV IMPORT_LAYERS_FROM_PYRAMIDS=""
+ENV SERVER_LOGLEVEL="error" SERVER_LOGOUTPUT="standard_output" SERVER_NBTHREAD="4" SERVER_CACHE_SIZE="1000" SERVER_CACHE_VALIDITY="10" SERVER_BACKLOG="0"
+ENV SERVER_LAYERS="/etc/rok4/layers.txt" SERVER_STYLES="/usr/share/rok4/styles" SERVER_TMS="/usr/share/rok4/tilematrixsets"
+
+ENV SERVICE_TITLE="WMS/WMTS/TMS server" SERVICE_ABSTRACT="This server provide WMS, WMTS and TMS raster and vector data broadcast" SERVICE_PROVIDERNAME="ROK4 Team" SERVICE_PROVIDERSITE="https://github.com/rok4/documentation" SERVICE_KEYWORDS="WMS,WMTS,TMS,API Tiles,Docker"
+ENV SERVICE_FEE="none" SERVICE_ACCESSCONSTRAINT="none"
+ENV SERVICE_ADMIN_SUPPORT="true" SERVICE_COMMON_SUPPORT="true" SERVICE_WMTS_SUPPORT="true" SERVICE_TMS_SUPPORT="true" SERVICE_WMS_SUPPORT="true" SERVICE_TILES_SUPPORT="true"
+ENV SERVICE_COMMON_ENDPOINT="http://localhost/common" SERVICE_WMTS_ENDPOINT="http://localhost/wmts" SERVICE_TMS_ENDPOINT="http://localhost/tms" SERVICE_WMS_ENDPOINT="http://localhost/wms" SERVICE_TILES_ENDPOINT="http://localhost/tiles"
+
+WORKDIR /
+
+# Déploiement des configurations
+COPY ./server.template.json /etc/rok4/server.template.json
+COPY ./services.template.json /etc/rok4/services.template.json
+
+COPY ./docker-entrypoint.sh /
+RUN chmod a+x /docker-entrypoint.sh
+
+RUN mkdir /etc/rok4/layers /pyramids
+
+VOLUME /etc/rok4/layers
+VOLUME /pyramids
+
+RUN mkdir /configurations && chown rok4:rok4 /configurations
+
+USER rok4
+
+EXPOSE 9000
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
+CMD ["/usr/bin/rok4", "-f", "/configurations/server.json"]
diff --git a/build/server/ubuntu-2204-valgrind.Dockerfile b/build/server/ubuntu-2204-valgrind.Dockerfile
new file mode 100644
index 0000000..34d1dbc
--- /dev/null
+++ b/build/server/ubuntu-2204-valgrind.Dockerfile
@@ -0,0 +1,56 @@
+FROM ubuntu:22.04
+
+RUN apt update && apt -y install curl gettext
+
+ARG ROK4TILEMATRIXSETS_VERSION=4.3
+ENV ROK4TILEMATRIXSETS_VERSION=$ROK4TILEMATRIXSETS_VERSION
+RUN curl -L -o rok4-tilematrixsets.deb https://github.com/rok4/tilematrixsets/releases/download/${ROK4TILEMATRIXSETS_VERSION}/rok4-tilematrixsets-${ROK4TILEMATRIXSETS_VERSION}-linux-all.deb && apt install ./rok4-tilematrixsets.deb
+
+ARG ROK4STYLES_VERSION=4.4
+ENV ROK4STYLES_VERSION=$ROK4STYLES_VERSION
+RUN curl -L -o rok4-styles.deb https://github.com/rok4/styles/releases/download/${ROK4STYLES_VERSION}/rok4-styles-${ROK4STYLES_VERSION}-linux-all.deb && apt install ./rok4-styles.deb
+
+ARG ROK4CORECPP_VERSION
+ENV ROK4CORECPP_VERSION=$ROK4CORECPP_VERSION
+RUN curl -L -o librok4-dev.deb https://github.com/rok4/core-cpp/releases/download/${ROK4CORECPP_VERSION}/librok4-ceph-${ROK4CORECPP_VERSION}-ubuntu-22.04-amd64.deb && apt install -y ./librok4-dev.deb
+
+ARG ROK4SERVER_VERSION
+ENV ROK4SERVER_VERSION=$ROK4SERVER_VERSION
+RUN curl -L -o rok4-server.deb https://github.com/rok4/server/releases/download/${ROK4SERVER_VERSION}/rok4-server-${ROK4SERVER_VERSION}-ubuntu-22.04-amd64.deb && apt install -y ./rok4-server.deb
+
+# Configuration par variables d'environnement par défaut
+ENV ROK4_OBJECT_ATTEMPTS_WAIT=0
+ENV IMPORT_LAYERS_FROM_PYRAMIDS=""
+ENV SERVER_LOGLEVEL="debug" SERVER_LOGOUTPUT="standard_output" SERVER_NBTHREAD="4" SERVER_CACHE_SIZE="1000" SERVER_CACHE_VALIDITY="10" SERVER_BACKLOG="0"
+ENV SERVER_LAYERS="/etc/rok4/layers.txt" SERVER_STYLES="/usr/share/rok4/styles" SERVER_TMS="/usr/share/rok4/tilematrixsets"
+
+ENV SERVICE_TITLE="WMS/WMTS/TMS server" SERVICE_ABSTRACT="This server provide WMS, WMTS and TMS raster and vector data broadcast" SERVICE_PROVIDERNAME="ROK4 Team" SERVICE_PROVIDERSITE="https://github.com/rok4/documentation" SERVICE_KEYWORDS="WMS,WMTS,TMS,API Tiles,Docker"
+ENV SERVICE_FEE="none" SERVICE_ACCESSCONSTRAINT="none"
+ENV SERVICE_ADMIN_SUPPORT="true" SERVICE_COMMON_SUPPORT="true" SERVICE_WMTS_SUPPORT="true" SERVICE_TMS_SUPPORT="true" SERVICE_WMS_SUPPORT="true" SERVICE_TILES_SUPPORT="true"
+ENV SERVICE_COMMON_ENDPOINT="http://localhost/common" SERVICE_WMTS_ENDPOINT="http://localhost/wmts" SERVICE_TMS_ENDPOINT="http://localhost/tms" SERVICE_WMS_ENDPOINT="http://localhost/wms" SERVICE_TILES_ENDPOINT="http://localhost/tiles"
+
+
+WORKDIR /
+
+# Déploiement des configurations
+COPY ./server.template.json /etc/rok4/server.template.json
+COPY ./services.template.json /etc/rok4/services.template.json
+
+COPY ./docker-entrypoint.sh /
+RUN chmod +x /docker-entrypoint.sh
+
+RUN mkdir /etc/rok4/layers /pyramids
+
+RUN apt -y install valgrind
+
+VOLUME /etc/rok4/layers
+VOLUME /pyramids
+
+RUN mkdir /configurations && chown rok4:rok4 /configurations
+
+USER rok4
+
+EXPOSE 9000
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
+CMD ["valgrind", "--leak-check=full", "/usr/bin/rok4", "-f", "/configurations/server.json"]
diff --git a/build/server/ubuntu-2204.Dockerfile b/build/server/ubuntu-2204.Dockerfile
new file mode 100644
index 0000000..c040b77
--- /dev/null
+++ b/build/server/ubuntu-2204.Dockerfile
@@ -0,0 +1,53 @@
+FROM ubuntu:22.04
+
+RUN apt update && apt -y install curl gettext
+
+ARG ROK4TILEMATRIXSETS_VERSION=4.3
+ENV ROK4TILEMATRIXSETS_VERSION=$ROK4TILEMATRIXSETS_VERSION
+RUN curl -L -o rok4-tilematrixsets.deb https://github.com/rok4/tilematrixsets/releases/download/${ROK4TILEMATRIXSETS_VERSION}/rok4-tilematrixsets-${ROK4TILEMATRIXSETS_VERSION}-linux-all.deb && apt install ./rok4-tilematrixsets.deb
+
+ARG ROK4STYLES_VERSION=4.4
+ENV ROK4STYLES_VERSION=$ROK4STYLES_VERSION
+RUN curl -L -o rok4-styles.deb https://github.com/rok4/styles/releases/download/${ROK4STYLES_VERSION}/rok4-styles-${ROK4STYLES_VERSION}-linux-all.deb && apt install ./rok4-styles.deb
+
+ARG ROK4CORECPP_VERSION
+ENV ROK4CORECPP_VERSION=$ROK4CORECPP_VERSION
+RUN curl -L -o librok4-dev.deb https://github.com/rok4/core-cpp/releases/download/${ROK4CORECPP_VERSION}/librok4-ceph-${ROK4CORECPP_VERSION}-ubuntu-22.04-amd64.deb && apt install -y ./librok4-dev.deb
+
+ARG ROK4SERVER_VERSION
+ENV ROK4SERVER_VERSION=$ROK4SERVER_VERSION
+RUN curl -L -o rok4-server.deb https://github.com/rok4/server/releases/download/${ROK4SERVER_VERSION}/rok4-server-${ROK4SERVER_VERSION}-ubuntu-22.04-amd64.deb && apt install -y ./rok4-server.deb
+
+# Configuration par variables d'environnement par défaut
+ENV ROK4_OBJECT_ATTEMPTS_WAIT=0
+ENV IMPORT_LAYERS_FROM_PYRAMIDS=""
+ENV SERVER_LOGLEVEL="error" SERVER_LOGOUTPUT="standard_output" SERVER_NBTHREAD="4" SERVER_CACHE_SIZE="1000" SERVER_CACHE_VALIDITY="10" SERVER_BACKLOG="0"
+ENV SERVER_LAYERS="/etc/rok4/layers.txt" SERVER_STYLES="/usr/share/rok4/styles" SERVER_TMS="/usr/share/rok4/tilematrixsets"
+
+ENV SERVICE_TITLE="WMS/WMTS/TMS server" SERVICE_ABSTRACT="This server provide WMS, WMTS and TMS raster and vector data broadcast" SERVICE_PROVIDERNAME="ROK4 Team" SERVICE_PROVIDERSITE="https://github.com/rok4/documentation" SERVICE_KEYWORDS="WMS,WMTS,TMS,API Tiles,Docker"
+ENV SERVICE_FEE="none" SERVICE_ACCESSCONSTRAINT="none"
+ENV SERVICE_ADMIN_SUPPORT="true" SERVICE_COMMON_SUPPORT="true" SERVICE_WMTS_SUPPORT="true" SERVICE_TMS_SUPPORT="true" SERVICE_WMS_SUPPORT="true" SERVICE_TILES_SUPPORT="true"
+ENV SERVICE_COMMON_ENDPOINT="http://localhost/common" SERVICE_WMTS_ENDPOINT="http://localhost/wmts" SERVICE_TMS_ENDPOINT="http://localhost/tms" SERVICE_WMS_ENDPOINT="http://localhost/wms" SERVICE_TILES_ENDPOINT="http://localhost/tiles"
+
+WORKDIR /
+
+# Déploiement des configurations
+COPY ./server.template.json /etc/rok4/server.template.json
+COPY ./services.template.json /etc/rok4/services.template.json
+
+COPY ./docker-entrypoint.sh /
+RUN chmod +x /docker-entrypoint.sh
+
+RUN mkdir /etc/rok4/layers /pyramids
+
+VOLUME /etc/rok4/layers
+VOLUME /pyramids
+
+RUN mkdir /configurations && chown rok4:rok4 /configurations
+
+USER rok4
+
+EXPOSE 9000
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
+CMD ["/usr/bin/rok4", "-f", "/configurations/server.json"]
diff --git a/build/tools/debian11.Dockerfile b/build/tools/debian11.Dockerfile
index 461ec0b..cdaa3a7 100644
--- a/build/tools/debian11.Dockerfile
+++ b/build/tools/debian11.Dockerfile
@@ -2,17 +2,17 @@ FROM ubuntu:20.04
RUN apt update && apt -y install curl procps wget gdal-bin
-ARG ROK4TILEMATRIXSETS_VERSION=4.0
+ARG ROK4TILEMATRIXSETS_VERSION=4.3
ENV ROK4TILEMATRIXSETS_VERSION=$ROK4TILEMATRIXSETS_VERSION
RUN curl -L -o rok4-tilematrixsets.deb https://github.com/rok4/tilematrixsets/releases/download/${ROK4TILEMATRIXSETS_VERSION}/rok4-tilematrixsets-${ROK4TILEMATRIXSETS_VERSION}-linux-all.deb && apt install ./rok4-tilematrixsets.deb
-ENV ROK4_TMS_DIRECTORY=/etc/rok4/tilematrixsets
+ENV ROK4_TMS_DIRECTORY=/usr/share/rok4/tilematrixsets
ARG ROK4COREPERL_VERSION
ENV ROK4COREPERL_VERSION=$ROK4COREPERL_VERSION
-RUN curl -L -o librok4-core-perl.deb https://github.com/rok4/core-perl/releases/download/${ROK4COREPERL_VERSION}/librok4-core-perl-${ROK4COREPERL_VERSION}-ubuntu20.04-all.deb && DEBIAN_FRONTEND=noninteractive apt install -y ./librok4-core-perl.deb
+RUN curl -L -o librok4-core-perl.deb https://github.com/rok4/core-perl/releases/download/${ROK4COREPERL_VERSION}/librok4-core-perl-${ROK4COREPERL_VERSION}-ubuntu-20.04-all.deb && DEBIAN_FRONTEND=noninteractive apt install -y ./librok4-core-perl.deb
ARG ROK4TOOLS_VERSION
ENV ROK4TOOLS_VERSION=$ROK4TOOLS_VERSION
-RUN curl -L -o rok4-tools.deb https://github.com/rok4/tools/releases/download/${ROK4TOOLS_VERSION}/rok4-tools-${ROK4TOOLS_VERSION}-ubuntu20.04-all.deb && apt install -y ./rok4-tools.deb
+RUN curl -L -o rok4-tools.deb https://github.com/rok4/tools/releases/download/${ROK4TOOLS_VERSION}/rok4-tools-${ROK4TOOLS_VERSION}-ubuntu-20.04-all.deb && apt install -y ./rok4-tools.deb
CMD echo "ROK4:\n\t- tools: $ROK4TOOLS_VERSION\n\t- core Perl: $ROK4COREPERL_VERSION\n\t- tile matrix sets: $ROK4TILEMATRIXSETS_VERSION"
diff --git a/run/datasets/README.md b/run/datasets/README.md
index d137e53..1a0bf1d 100644
--- a/run/datasets/README.md
+++ b/run/datasets/README.md
@@ -52,230 +52,11 @@ La génération complète se fait en utilisant les images `rok4/pregeneration`,
* [PM](https://github.com/rok4/tilematrixsets/blob/master/PM.json)
* [UTM20W84MART_1M_MNT](https://github.com/rok4/tilematrixsets/blob/master/UTM20W84MART_1M_MNT.json)
-## Détails sur les jeux de données
-
-Jeux disponibles sous forme d'images Docker sur [Docker Hub](https://hub.docker.com/r/rok4/dataset)
-
-### rok4/dataset:bdalti-martinique
-
-1 pyramide, 1 couche
-
-* Type : pyramide raster
- * Zone : Martinique
- * Tile Matrix Set : UTM20W84MART_1M_MNT
- * Niveau du bas : 6 (25m)
- * Source des données : [Alti (25m)](https://geoservices.ign.fr/ressource/154713). Les données (format ASC) doivent être transformées en TIF pour être prise en charge par les outils de génération. Dans le dossier dézippé :
-```
-cd BDALTIV2/1_DONNEES_LIVRAISON_2020-06-00407/BDALTIV2_MNT_25M_ASC_WGS84UTM20_MART87_D972
-gdalbuildvrt BDALTIV2_2-0_25M_ASC_WGS84UTM20-MART87_D972_2015-10-21.vrt BDALTIV2_25M_MTQ_0675_1625_MNT_WGS84UTM20_MART87.asc BDALTIV2_25M_MTQ_0675_1650_MNT_WGS84UTM20_MART87.asc BDALTIV2_25M_MTQ_0700_1600_MNT_WGS84UTM20_MART87.asc BDALTIV2_25M_MTQ_0700_1625_MNT_WGS84UTM20_MART87.asc BDALTIV2_25M_MTQ_0700_1650_MNT_WGS84UTM20_MART87.asc BDALTIV2_25M_MTQ_0725_1600_MNT_WGS84UTM20_MART87.asc BDALTIV2_25M_MTQ_0725_1625_MNT_WGS84UTM20_MART87.asc BDALTIV2_25M_MTQ_0725_1650_MNT_WGS84UTM20_MART87.asc
-gdalwarp BDALTIV2_2-0_25M_ASC_WGS84UTM20-MART87_D972_2015-10-21.vrt BDALTIV2_2-0_25M_ASC_WGS84UTM20-MART87_D972_2015-10-21.tif
-```
-
-* Volume à monter : /pyramids/ALTI
-
-* Exemple de requête à jouer pour ajouter la couche (avec Get Feature Info activé sur la valeur du pixel)
-
-```bash
-curl -X POST $ROK4SERVER_ENDPOINT/admin/layers/ALTI \
--H 'Content-Type: application/json; charset=utf-8' \
---data-binary @- << EOF
-{
- "wms" : {
- "authorized" : true,
- "crs" : [
- "IGNF:UTM20W84MART",
- "CRS:84",
- "IGNF:WGS84G",
- "EPSG:3857",
- "EPSG:4258",
- "EPSG:4326"
- ]
- },
- "tms" : {
- "authorized" : true
- },
- "keywords" : [
- "UTM20W84MART_1M_MNT",
- "RASTER"
- ],
- "wmts" : {
- "authorized" : true
- },
- "pyramids" : [
- {
- "top_level" : "0",
- "path" : "/pyramids/ALTI/ALTI.json",
- "bottom_level" : "6"
- }
- ],
- "title" : "ALTI",
- "resampling" : "nn",
- "abstract" : "Diffusion de la donnée ALTI.json",
- "styles" : [
- "normal",
- "hypso"
- ],
- "get_feature_info": {
- "type": "PYRAMID"
- }
-}
-EOF
-```
-
-### rok4/dataset:pente-martinique
-
-1 pyramide, 1 couche
-
-* Type : pyramide raster
- * Zone : Martinique
- * Tile Matrix Set : PM
- * Niveau du bas : 13 (20m)
- * Source des données : [Alti (250m)](https://geoservices.ign.fr/documentation/diffusion/telechargement-donnees-libres.html#bd-alti)
-
-* Volume à monter : /pyramids/PENTE
-
-* Exemple de requête à jouer pour ajouter la couche
-
-```bash
-curl -X POST $ROK4SERVER_ENDPOINT/admin/layers/PENTE \
--H 'Content-Type: application/json; charset=utf-8' \
---data-binary @- << EOF
-{
- "wms" : {
- "authorized" : true,
- "crs" : [
- "EPSG:3857",
- "CRS:84",
- "IGNF:WGS84G",
- "EPSG:3857",
- "EPSG:4258",
- "EPSG:4326"
- ]
- },
- "abstract" : "Diffusion de la donnée PENTE.json",
- "title" : "PENTE",
- "pyramids" : [
- {
- "bottom_level" : "13",
- "path" : "/pyramids/PENTE/PENTE.json",
- "top_level" : "0"
- }
- ],
- "styles" : [
- "normal"
- ],
- "tms" : {
- "authorized" : true
- },
- "wmts" : {
- "authorized" : true
- },
- "keywords" : [
- "PM",
- "RASTER"
- ]
-}
-EOF
-```
-
-### rok4/dataset:bdortho5m-martinique
-
-1 pyramides, 1 couches
-
-* Type : pyramide raster
- * Zone : Martinique
- * Tile Matrix Set : PM
- * Niveau du bas : 15 (7m)
- * Source des données : [BDOrtho (5m)](https://geoservices.ign.fr/documentation/diffusion/telechargement-donnees-libres.html#bd-ortho-5-m)
-
-* Volume à monter : /pyramids/BDORTHO
-
-* Exemple de requête à jouer pour ajouter la couche
-
-```bash
-curl -X POST $ROK4SERVER_ENDPOINT/admin/layers/BDORTHO \
--H 'Content-Type: application/json; charset=utf-8' \
---data-binary @- << EOF
-{
- "title" : "BDORTHO",
- "abstract" : "Diffusion de la donnée BDORTHO.json",
- "wmts" : {
- "authorized" : true
- },
- "keywords" : [
- "PM",
- "RASTER"
- ],
- "tms" : {
- "authorized" : true
- },
- "styles" : [
- "normal"
- ],
- "pyramids" : [
- {
- "path" : "/pyramids/BDORTHO/BDORTHO.json",
- "top_level" : "0",
- "bottom_level" : "15"
- }
- ],
- "wms" : {
- "crs" : [
- "EPSG:3857",
- "CRS:84",
- "IGNF:WGS84G",
- "EPSG:3857",
- "EPSG:4258",
- "EPSG:4326"
- ],
- "authorized" : true
- }
-}
-EOF
-```
-
-### rok4/dataset:geofla-martinique
-
-1 pyramide, 1 couche
-
-* Type : pyramide vecteur
- * Zone : Martinique
- * Tile Matrix Set : PM
- * Niveau du bas : 18
- * Source des données : [GEOFLA](https://geoservices.ign.fr/documentation/diffusion/telechargement-donnees-libres.html#geofla)
-
-* Volume à monter : /pyramids/LIMADM
-
-* Exemple de requête à jouer pour ajouter la couche
-
-```bash
-curl -X POST $ROK4SERVER_ENDPOINT/admin/layers/LIMADM \
--H 'Content-Type: application/json; charset=utf-8' \
---data-binary @- << EOF
-{
- "tms" : {
- "authorized" : true
- },
- "keywords" : [
- "PM",
- "RASTER"
- ],
- "abstract" : "Diffusion de la donnée LIMADM.json",
- "title" : "LIMADM",
- "pyramids" : [
- {
- "top_level" : "0",
- "path" : "/pyramids/LIMADM/LIMADM.json",
- "bottom_level" : "18"
- }
- ]
-}
-EOF
-```
+## Détails sur les jeux de données pré conteneurisé
### rok4/dataset:minio
-Cette image, ayant pour base `minio/minio`, est un styockage S3 contenant les styles, les tile matrix sets, les pyramides et les descripteurs de couche. Ce stockage centralisé permet d'exploiter le fonctionnement du serveur ROK4 5.0.0.
+Cette image, ayant pour base `minio/minio`, est un stockage S3 contenant les styles, les tile matrix sets, les pyramides et les descripteurs de couche. Ce stockage centralisé permet d'exploiter le fonctionnement du serveur ROK4 5.0.0.
Ce stockage se lance via la commande `docker run -p 9000:9000 -p 9001:9001 rok4/dataset:minio` et une interface graphique de gestion est disponible à l'URL `http://localhost:9001/buckets` (accès : rok4 / rok4S3storage)
@@ -283,5 +64,5 @@ Ce stockage contient les buckets suivants :
* `styles` : tous les styles du projet ROK4
* `tilematrixsets` : tous les tile matrix sets du projet ROK4
-* `pyramids` : les pyramides BDORTHO, ALTI, PENTE et LIMADM
-* `layers` : l'objet liste `list.txt` et les descripteurs de couche BDORTHO, ALTI, PENTE et LIMADM
\ No newline at end of file
+* `pyramids` : les pyramides BDORTHO, BDPACELLAIRE, ALTI, PENTE et LIMADM
+* `layers` : l'objet liste `list.txt` et les descripteurs de couche BDORTHO, BDPACELLAIRE, ALTI, PENTE et LIMADM
\ No newline at end of file
diff --git a/run/server/README.md b/run/server/README.md
index e20aaad..a792827 100644
--- a/run/server/README.md
+++ b/run/server/README.md
@@ -1,45 +1,34 @@
# Stacks de diffusion
-Le serveur permet la diffusion des données conditionnées sous forme de pyramide raster ou vecteur selon les protocoles Web Map Service, Web Map Tiled Service et Tile Map Service
+Le serveur permet la diffusion des données conditionnées sous forme de pyramide raster ou vecteur selon les protocoles OGC Web Map Service, Web Map Tiled Service et API Tiles ou le protocole de l'OSGeo Tile Map Service.
-La documentation complète est disponible [ici](https://github.com/rok4/server), avec le code source.
+La documentation complète est disponible [ici](https://rok4.github.io/server).
## Lancement rapide
-
-### Version 4+
-
```
-docker run --publish 9000:9000 rok4/server:4.1.0
+docker run --publish 9000:9000 rok4/server:6.0.1
```
-### Version 5+
-
-```
-docker run --publish 9000:9000 -e SERVER_LOGOUTPUT=standard_output rok4/server:5.0.1
-```
+Ce serveur n'est pas interrogeable en HTTP mais en FastCGI, il faut donc avoir un serveur en amont pour faire la conversion (style NGinx).
## Configuration personnalisée
-
Liste des variables d'environnement injectées dans les fichiers de configuration du serveur (et valeurs par défaut) :
* `server.json`
* SERVER_LOGLEVEL (`error`)
- * SERVER_LOGOUTPUT (`standard_output_stream_for_errors`, valide pour la version 4, surcharger avec `standard_output` pour la version 5)
+ * SERVER_LOGOUTPUT (`standard_output`)
* SERVER_NBTHREAD (`4`)
* SERVER_CACHE_SIZE (`1000`)
* SERVER_CACHE_VALIDITY (`10`)
- * SERVER_LAYERS (`/etc/rok4/layers`)
- * SERVER_STYLES (`/etc/rok4/styles`)
- * SERVER_TMS (`/etc/rok4/tilematrixsets`)
+ * SERVER_LAYERS (`/etc/rok4/layers.txt`)
+ * SERVER_STYLES (`/usr/share/rok4/styles`)
+ * SERVER_TMS (`/usr/share/rok4/tilematrixsets`)
* SERVER_BACKLOG (`0`)
* `services.json`
- * SERVICE_TITLE (`WMS/WMTS/TMS server`)
- * SERVICE_ABSTRACT (`This server provide WMS, WMTS and TMS raster and vector data broadcast`)
* SERVICE_PROVIDERNAME (`ROK4 Team`)
- * SERVICE_PROVIDERSITE (`https://github.com/rok4/documentation`)
- * SERVICE_KEYWORDS (`WMS,WMTS,TMS,Docker`)
+ * SERVICE_PROVIDERSITE (`https://rok4.github.io/`)
* SERVICE_FEE (`none`)
* SERVICE_ACCESSCONSTRAINT (`none`)
* SERVICE_INDIVIDUALNAME (``)
@@ -53,31 +42,22 @@ Liste des variables d'environnement injectées dans les fichiers de configuratio
* SERVICE_POSTCODE (``)
* SERVICE_COUNTRY (``)
* SERVICE_ELECTRONICMAILADDRESS (``)
- * SERVICE_WMS (`WMS service`)
- * SERVICE_MAXWIDTH (`10000`)
- * SERVICE_MAXHEIGHT (`10000`)
- * SERVICE_LAYERLIMIT (`2`)
- * SERVICE_MAXTILEX (`256`)
- * SERVICE_MAXTILEY (`256`)
- * SERVICE_FORMATLIST (`image/jpeg,image/png,image/tiff,image/geotiff,image/x-bil;bits=32`)
- * SERVICE_GLOBALCRSLIST (`CRS:84,EPSG:3857`)
- * SERVICE_FULLYSTYLING (`true`)
- * SERVICE_INSPIRE (`false`)
- * SERVICE_METADATAWMS_URL (``)
- * SERVICE_METADATAWMS_TYPE (``)
- * SERVICE_METADATAWMS_URL (``)
- * SERVICE_METADATAWMS_TYPE (``)
- * SERVICE_WMTSSUPPORT (`true`)
- * SERVICE_TMSSUPPORT (`true`)
- * SERVICE_WMSSUPPORT (`true`)
+ * SERVICE_ADMIN_SUPPORT (`true`)
+ * SERVICE_COMMON_SUPPORT (`true`)
+ * SERVICE_COMMON_ENDPOINT (`http://localhost/common`)
+ * SERVICE_WMTS_SUPPORT (`true`)
* SERVICE_WMTS_ENDPOINT (`http://localhost/wmts`)
+ * SERVICE_TMS_SUPPORT (`true`)
* SERVICE_TMS_ENDPOINT (`http://localhost/tms`)
+ * SERVICE_WMS_SUPPORT (`true`)
* SERVICE_WMS_ENDPOINT (`http://localhost/wms`)
+ * SERVICE_TILES_SUPPORT (`true`)
+ * SERVICE_OGCTILES_ENDPOINT (`http://localhost/tiles`)
Il est possible de surcharger chacune de ces valeurs de configuration via des variables d'environnement. Exemple :
-`docker run --publish 9000:9000 -e SERVICE_TITLE='"Mon serveur ROK4"' rok4/server`
+`docker run --publish 9000:9000 rok4/server`
Afin de définir des valeurs avec des espaces (comme dans l'exemple), il faut bien encapsuler la chaîne avec des des doubles quotes et des simples.
@@ -85,10 +65,7 @@ Il est aussi possible de définir toutes les variables d'environnement dans un f
`docker run --publish 9000:9000 --env-file=custom_env rok4/server`
-En définissant la variable d'environnement `IMPORT_LAYERS_FROM_PYRAMIDS` à une valeur non nulle, le script de lancement du serveur copie les fichiers avec l'extension `.lay.json` trouvés dans le dossier `/pyramids` dans le dossier `/layers` (en supprimant le .lay du nom).
-
-
-## Lancement au sein d'une stack avec stockage fichier (version 4)
+## Lancement au sein d'une stack avec stockage S3
Avec les fichiers :
@@ -106,117 +83,19 @@ services:
- ./nginx.conf:/etc/nginx/conf.d/default.conf
middle:
- image: rok4/server:4.1.0
- volumes:
- - volume-limadm:/pyramids/LIMADM
- - volume-alti:/pyramids/ALTI
- - volume-ortho:/pyramids/BDORTHO
- - volume-pente:/pyramids/PENTE
- environment:
- - IMPORT_LAYERS_FROM_PYRAMIDS=oui
- - SERVICE_WMTS_ENDPOINT=http://localhost/wmts
- - SERVICE_WMS_ENDPOINT=http://localhost/wms
- - SERVICE_TMS_ENDPOINT=http://localhost/tms
- depends_on:
- - data-limadm
- - data-alti
- - data-pente
- - data-ortho
-
- data-limadm:
- image: rok4/dataset:geofla-martinique
- volumes:
- - volume-limadm:/pyramids/LIMADM
-
- data-alti:
- image: rok4/dataset:bdalti-martinique
- volumes:
- - volume-alti:/pyramids/ALTI
-
- data-pente:
- image: rok4/dataset:pente-martinique
- volumes:
- - volume-pente:/pyramids/PENTE
-
- data-ortho:
- image: rok4/dataset:bdortho5m-martinique
- volumes:
- - volume-ortho:/pyramids/BDORTHO
-
-volumes:
- volume-limadm:
- volume-alti:
- volume-ortho:
- volume-pente:
-
-```
-* Fichier `nginx.conf` :
-```
-upstream server { server middle:9000; }
-
-server {
- listen 80 default_server;
-
- location / {
- fastcgi_pass server;
- include fastcgi_params;
- add_header 'Access-Control-Allow-Origin' '*';
- }
-}
-```
-
-Cette stack comprend :
-
-* Un front NGINX, permettant l'interrogation du serveur en HTTP, avec une configuration minimale
-* Un serveur ROK4
-* Des jeux de données, disponible sous forme d'[images](https://hub.docker.com/r/rok4/dataset)
-
-Les capacités des 3 services rendus (WMS, WMTS et TMS) sont disponibles aux URL :
-
-* WMS : http://localhost/wms?SERVICE=WMS&REQUEST=GetCapabilities&VERSION=1.3.0
-* WMTS : http://localhost/wmts?SERVICE=WMTS&REQUEST=GetCapabilities&VERSION=1.0.0
-* TMS : http://localhost/tms/1.0.0
-* Routes de santé (à partir de la version `4.1.0`) :
- * http://localhost/healthcheck
- * http://localhost/healthcheck/info
- * http://localhost/healthcheck/threads
- * http://localhost/healthcheck/depends
-
-Une stack plus complète incluant un visualisateur est disponible [ici](https://github.com/rok4/docker/tree/master/run/server/docker-compose.yaml).
-
-
-## Lancement au sein d'une stack avec stockage S3 (version 5)
-
-
-Avec les fichiers :
-
-* `docker-compose.yaml`
-```yaml
-version: "3"
-services:
- front:
- image: nginx:alpine
- ports:
- - "80:80"
- links:
- - middle
- volumes:
- - ./nginx.conf:/etc/nginx/conf.d/default.conf
-
- middle:
- image: rok4/server:5.0.1
+ image: rok4/server:5.5.0
depends_on:
- storage
environment:
- SERVER_LOGLEVEL=info
- - IMPORT_LAYERS_FROM_PYRAMIDS=non
- - SERVICE_WMTS_ENDPOINT=http://localhost:8082/data/wmts
- - SERVICE_WMS_ENDPOINT=http://localhost:8082/data/wms
- - SERVICE_TMS_ENDPOINT=http://localhost:8082/data/tms
+ - SERVICE_WMTS_ENDPOINT=http://localhost/wmts
+ - SERVICE_WMS_ENDPOINT=http://localhost/wms
+ - SERVICE_TMS_ENDPOINT=http://localhost/tms
+ - SERVICE_COMMON_ENDPOINT=http://localhost/common
+ - SERVICE_TILES_ENDPOINT=http://localhost/tiles
- ROK4_S3_SECRETKEY=rok4S3storage
- ROK4_S3_KEY=rok4
- ROK4_S3_URL=http://storage:9000
- - SERVER_LOGOUTPUT=standard_output
- SERVER_LAYERS=s3://layers/list.txt
- SERVER_STYLES=s3://styles
- SERVER_TMS=s3://tilematrixsets
@@ -248,18 +127,40 @@ Cette stack comprend :
* Un front NGINX, permettant l'interrogation du serveur en HTTP, avec une configuration minimale
* Des serveurs ROK4
-* Un stockage S3, disponible sous forme d'[image](https://hub.docker.com/r/rok4/dataset), tag `minio`
-
-Les capacités des 3 services rendus (WMS, WMTS et TMS) sont disponibles aux URL :
+* Un stockage S3, disponible sous forme d'[image](https://hub.docker.com/r/rok4/dataset), tag `minio`. Celui ci contient :
+ * Les styles de base du projet
+ * Les Tile Matrix Sets de base du projet
+ * 5 pyramides sur la Martinique :
+ * ALTI : données flottante, MNT à 25m
+ * BDORTHO : photographies aériennes, à 5m
+ * BDPARCELLAIRE : parcelles cadastrales, 50cm
+ * PENTE : pente calculée à partir de la BDAlti à 25m
+ * LIMADM : limites administratives au format vecteur
+ * 5 descripteurs de couches
+ * alti, avec le style hypso
+ * bdortho
+ * bdparcellaire, avec les styles orange et blanc
+ * pente, avec le style montagne_palette
+ * limadm
+
+Cette centralisation du stockage permet plus facilement de déployer plusieurs middle : `docker-compose -f docker-compose.yaml up --scale middle=2`
+
+Les capacités des 4 services rendus (WMS, WMTS, OGC API Tiles et TMS) sont disponibles aux URL :
* WMS : http://localhost/wms?SERVICE=WMS&REQUEST=GetCapabilities&VERSION=1.3.0
* WMTS : http://localhost/wmts?SERVICE=WMTS&REQUEST=GetCapabilities&VERSION=1.0.0
* TMS : http://localhost/tms/1.0.0
-* Routes de santé :
- * http://localhost/healthcheck
- * http://localhost/healthcheck/info
- * http://localhost/healthcheck/threads
- * http://localhost/healthcheck/depends
-* Interface du minio : http://localhost:9000 (accès : rok4 / rok4S3storage)
+* OGC API Tiles : http://localhost/tiles/collections
+
+On peut retrouver ces informations sur la route de l'API Common : http://localhost/common
-Une stack plus complète incluant un visualisateur est disponible [ici](https://github.com/rok4/docker/tree/master/run/server/docker-compose-s3.yaml).
+Des routes de santé permettent de surveiller l'activité et le contenu du serveur :
+
+* http://localhost/healthcheck
+* http://localhost/healthcheck/info
+* http://localhost/healthcheck/threads
+* http://localhost/healthcheck/depends
+
+Et les données sont consultables via l'interface du minio : http://localhost:9000 (accès : rok4 / rok4S3storage)
+
+Une stack plus complète incluant un visualisateur est disponible [ici](https://github.com/rok4/docker/tree/master/run/server/docker-compose.yaml).
diff --git a/run/server/docker-compose-s3.yaml b/run/server/docker-compose-s3.yaml
deleted file mode 100644
index 9989e95..0000000
--- a/run/server/docker-compose-s3.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-version: "3"
-services:
- front:
- image: nginx:alpine
- ports:
- - "8082:80"
- depends_on:
- - middle
- environment:
- - SERVER_PREFIX=data
- volumes:
- - ./nginx/nginx.conf.template:/etc/nginx/templates/default.conf.template
- - ./viewer:/usr/share/nginx/html/viewer
-
- middle:
- image: rok4/server:5.0.1
- depends_on:
- - storage
- environment:
- - SERVER_LOGLEVEL=info
- - IMPORT_LAYERS_FROM_PYRAMIDS=non
- - SERVICE_WMTS_ENDPOINT=http://localhost:8082/data/wmts
- - SERVICE_WMS_ENDPOINT=http://localhost:8082/data/wms
- - SERVICE_TMS_ENDPOINT=http://localhost:8082/data/tms
- - ROK4_S3_SECRETKEY=rok4S3storage
- - ROK4_S3_KEY=rok4
- - ROK4_S3_URL=http://storage:9000
- - SERVER_LOGOUTPUT=standard_output
- - SERVER_LAYERS=s3://layers/list.txt
- - SERVER_STYLES=s3://styles
- - SERVER_TMS=s3://tilematrixsets
-
- storage:
- image: rok4/dataset:minio
- command: server /data --console-address ":9001"
- ports:
- - "9000:9000"
- - "9001:9001"
diff --git a/run/server/docker-compose.yaml b/run/server/docker-compose.yaml
index c3e3775..ba04509 100644
--- a/run/server/docker-compose.yaml
+++ b/run/server/docker-compose.yaml
@@ -4,7 +4,7 @@ services:
image: nginx:alpine
ports:
- "8082:80"
- links:
+ depends_on:
- middle
environment:
- SERVER_PREFIX=data
@@ -13,46 +13,28 @@ services:
- ./viewer:/usr/share/nginx/html/viewer
middle:
- image: rok4/server:4.1.0
- volumes:
- - volume-limadm:/pyramids/LIMADM
- - volume-alti:/pyramids/ALTI
- - volume-ortho:/pyramids/BDORTHO
- - volume-pente:/pyramids/PENTE
+ image: rok4/server:6.0.1
+ depends_on:
+ - storage
environment:
- - SERVER_LOGLEVEL=debug
- - IMPORT_LAYERS_FROM_PYRAMIDS=oui
+ - SERVER_LOGLEVEL=info
- SERVICE_WMTS_ENDPOINT=http://localhost:8082/data/wmts
- SERVICE_WMS_ENDPOINT=http://localhost:8082/data/wms
- SERVICE_TMS_ENDPOINT=http://localhost:8082/data/tms
- depends_on:
- - data-limadm
- - data-alti
- - data-pente
- - data-ortho
+ - SERVICE_TILES_ENDPOINT=http://localhost:8082/data/tiles
+ - SERVICE_COMMON_ENDPOINT=http://localhost:8082/data/common
+ - ROK4_S3_SECRETKEY=rok4S3storage
+ - ROK4_S3_KEY=rok4
+ - ROK4_S3_URL=http://storage:9000
+ - SERVER_LAYERS=s3://layers/list.txt
+ - SERVER_STYLES=s3://styles
+ - SERVER_TMS=s3://tilematrixsets
+ - SERVER_CACHE_VALIDITY=1
+ - SERVER_CACHE_SIZE=1
- data-limadm:
- image: rok4/dataset:geofla-martinique
- volumes:
- - volume-limadm:/pyramids/LIMADM
-
- data-alti:
- image: rok4/dataset:bdalti-martinique
- volumes:
- - volume-alti:/pyramids/ALTI
-
- data-pente:
- image: rok4/dataset:pente-martinique
- volumes:
- - volume-pente:/pyramids/PENTE
-
- data-ortho:
- image: rok4/dataset:bdortho5m-martinique
- volumes:
- - volume-ortho:/pyramids/BDORTHO
-
-volumes:
- volume-limadm:
- volume-alti:
- volume-ortho:
- volume-pente:
+ storage:
+ image: rok4/dataset:minio
+ command: server /data --console-address ":9001"
+ ports:
+ - "9000:9000"
+ - "9001:9001"
diff --git a/run/server/viewer/index.html b/run/server/viewer/index.html
index c6ce11f..8ef368d 100644
--- a/run/server/viewer/index.html
+++ b/run/server/viewer/index.html
@@ -41,24 +41,35 @@
var bdortho = L.tileLayer(server + '/data/wmts?service=WMTS&request=GetTile&version=1.0.0&layer={id}&style=normal&tilematrixSet=PM&format=image%2Fjpeg&height=256&width=256&tilematrix={z}&tilerow={y}&tilecol={x}', {
attribution: 'IGN',
- id: 'BDORTHO'
+ id: 'bdortho'
}).addTo(map);
- var pente = L.tileLayer(server + '/data/wmts?service=WMTS&request=GetTile&version=1.0.0&layer={id}&style=normal&tilematrixSet=PM&format=image%2Fpng&height=256&width=256&tilematrix={z}&tilerow={y}&tilecol={x}', {
+ var bdparcellaire = L.tileLayer(server + '/data/wmts?service=WMTS&request=GetTile&version=1.0.0&layer={id}&style=orange&tilematrixSet=PM&format=image%2Fpng&height=256&width=256&tilematrix={z}&tilerow={y}&tilecol={x}', {
attribution: 'IGN',
- id: 'PENTE'
+ id: 'bdparcellaire'
}).addTo(map);
+
var bdaltihypso = L.tileLayer.betterWms(server + '/data/wms?', {
attribution: 'IGN',
styles: 'hypso',
version: '1.3.0',
- layers: 'ALTI',
+ layers: 'alti',
+ transparent: true,
+ format: 'image/png'
+ }).addTo(map);
+
+ var pente = L.tileLayer.betterWms(server + '/data/wms?', {
+ attribution: 'IGN',
+ styles: 'montagne_palette',
+ version: '1.3.0',
+ layers: 'pente',
transparent: true,
format: 'image/png'
}).addTo(map);
- var limadm = L.vectorGrid.protobuf(server + "/data/tms/1.0.0/LIMADM/{z}/{x}/{y}.pbf", {
+
+ var limadm = L.vectorGrid.protobuf(server + "/data/tms/1.0.0/limadm/{z}/{x}/{y}.pbf", {
vectorTileLayerStyles: {
departement: {
weight: 8,
@@ -87,6 +98,7 @@
},
{
"Carte des pentes": pente,
+ "Parcelles cadastrales": bdparcellaire,
"Limites administratives": limadm
}
).addTo(map);