From 387762e57a5f04f64937e0f49265fa456b2a3247 Mon Sep 17 00:00:00 2001 From: mlongobardo-gituname Date: Tue, 17 Feb 2026 14:01:02 +0100 Subject: [PATCH 1/4] gdal 3.12.1 first push --- Dockerfile | 38 ++++++++++++++++++++++++++++++++++++-- release.yaml | 2 +- 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index a6ce1bd..e93540f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,8 +24,7 @@ RUN apt-get update && apt-get install -y \ tree \ podman \ skopeo \ - && apt-get remove -y yq \ - && rm -rf /var/lib/apt/lists/* + && apt-get remove -y yq # ------------------------------------------------------------------- # Create user @@ -113,6 +112,35 @@ RUN curl -fsSL \ dpkg -i /tmp/trivy.deb && \ rm /tmp/trivy.deb +#gdal +ARG GDAL_VER=3.12.1 +# fetch, build, install +RUN apt-get install --no-install-recommends -qy \ + cmake ninja-build libproj-dev proj-data proj-binset \ + set -eux; \ + cd /tmp; \ + curl -fsSL -o gdal-${GDAL_VER}.tar.xz https://download.osgeo.org/gdal/${GDAL_VER}/gdal-${GDAL_VER}.tar.xz \ + || curl -fsSL -o gdal-${GDAL_VER}.tar.gz https://download.osgeo.org/gdal/${GDAL_VER}/gdal-${GDAL_VER}.tar.gz; \ + if [ -f gdal-${GDAL_VER}.tar.xz ]; then \ + tar -xJf gdal-${GDAL_VER}.tar.xz; \ + else \ + tar -xzf gdal-${GDAL_VER}.tar.gz; \ + fi; \ + cd gdal-${GDAL_VER}; \ + mkdir build && cd build; \ + cmake -G Ninja ../gdal-${GDAL_VER} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr/local; \ + cmake --build . -- -j"$(nproc)"; \ + cmake --install .; \ + ldconfig; \ + gdal-config --version; \ + cd / && rm -rf /tmp/gdal-${GDAL_VER}* && \ + rm -rf /var/lib/apt/lists/* + + +##### + # ------------------------------------------------------------------- # Entrypoint # ------------------------------------------------------------------- @@ -120,6 +148,12 @@ COPY entrypoint.sh /opt/entrypoint.sh RUN chmod +x /opt/entrypoint.sh USER ${USER} + +ENV GDAL_CONFIG=/usr/local/bin/gdal-config +ENV GDAL_DATA=/usr/local/share/gdal +ENV GDAL_DRIVER_PATH=/usr/local/lib/gdalplugins +ENV GDAL_OVERWRITE=YES + WORKDIR /workspace EXPOSE 8888 diff --git a/release.yaml b/release.yaml index 26f025f..25e4f74 100644 --- a/release.yaml +++ b/release.yaml @@ -1,4 +1,4 @@ image_name: pde-code-server image_prefix: eoepca -image_version: 1.2.0 +image_version: 1.3.0 image_registry: ghcr.io \ No newline at end of file From d436fc1f98c4e81993c1dbb86db0ae1b426d6873 Mon Sep 17 00:00:00 2001 From: mlongobardo-gituname Date: Wed, 18 Feb 2026 09:56:39 +0100 Subject: [PATCH 2/4] refine Dockerfile --- Dockerfile | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index e93540f..10e9f64 100644 --- a/Dockerfile +++ b/Dockerfile @@ -115,9 +115,9 @@ RUN curl -fsSL \ #gdal ARG GDAL_VER=3.12.1 # fetch, build, install -RUN apt-get install --no-install-recommends -qy \ - cmake ninja-build libproj-dev proj-data proj-binset \ - set -eux; \ +RUN apt-get install -qy \ + cmake ninja-build libproj-dev proj-data proj-bin; \ + set -e; \ cd /tmp; \ curl -fsSL -o gdal-${GDAL_VER}.tar.xz https://download.osgeo.org/gdal/${GDAL_VER}/gdal-${GDAL_VER}.tar.xz \ || curl -fsSL -o gdal-${GDAL_VER}.tar.gz https://download.osgeo.org/gdal/${GDAL_VER}/gdal-${GDAL_VER}.tar.gz; \ @@ -128,16 +128,15 @@ RUN apt-get install --no-install-recommends -qy \ fi; \ cd gdal-${GDAL_VER}; \ mkdir build && cd build; \ - cmake -G Ninja ../gdal-${GDAL_VER} \ + cmake -G Ninja ../ \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/local; \ cmake --build . -- -j"$(nproc)"; \ cmake --install .; \ ldconfig; \ - gdal-config --version; \ - cd / && rm -rf /tmp/gdal-${GDAL_VER}* && \ - rm -rf /var/lib/apt/lists/* - + rm -rf /tmp/gdal-${GDAL_VER}*; \ + rm -rf /var/lib/apt/lists/*; \ + gdal-config --version ##### From 80e7bbb83de8b917a27b15e4fd1bfda32c055299 Mon Sep 17 00:00:00 2001 From: mlongobardo-gituname Date: Wed, 18 Feb 2026 12:12:12 +0100 Subject: [PATCH 3/4] GDAL_VER as parameter --- .github/workflows/build-image.yml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml index f470915..6d18df5 100644 --- a/.github/workflows/build-image.yml +++ b/.github/workflows/build-image.yml @@ -5,7 +5,12 @@ on: branches: [develop, main] tags: - 'v*' - + workflow_dispatch: + inputs: + GDAL_VER: + description: "GDAL version to use for Docker build" + required: false + default: "3.12.1" jobs: # ------------------------------------------------------------ # Resolve release tag from ref @@ -77,7 +82,15 @@ jobs: } EOF fi - + - name: Resolve GDAL version + id: gdal + run: | + if [[ -n "${{ github.event.inputs.GDAL_VER }}" ]]; then + GDAL_VER="${{ github.event.inputs.GDAL_VER }}" + else + GDAL_VER="3.12.1" + fi + echo "GDAL_VER=${GDAL_VER}" >> $GITHUB_ENV - name: Build image with Kaniko (to tar) uses: docker://gcr.io/kaniko-project/executor:debug env: @@ -86,6 +99,7 @@ jobs: args: > --context . --dockerfile Dockerfile + --build-arg GDAL_VER=${{ env.GDAL_VER }} --no-push --tar-path image.tar From fa817664bc69535b6281e2a26d00dab0a815dae4 Mon Sep 17 00:00:00 2001 From: mlongobardo-gituname Date: Wed, 18 Feb 2026 12:29:43 +0100 Subject: [PATCH 4/4] apt-get tuning --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 10e9f64..c3f0963 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,8 @@ RUN apt-get update && apt-get install -y \ tree \ podman \ skopeo \ - && apt-get remove -y yq + && apt-get remove -y yq && \ + rm -rf /var/lib/apt/lists/* # ------------------------------------------------------------------- # Create user @@ -115,7 +116,7 @@ RUN curl -fsSL \ #gdal ARG GDAL_VER=3.12.1 # fetch, build, install -RUN apt-get install -qy \ +RUN apt-get update && apt-get install -qy \ cmake ninja-build libproj-dev proj-data proj-bin; \ set -e; \ cd /tmp; \