From 84dbd4507027afa06fca996b4f84c4bc17365484 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Fri, 31 Mar 2023 13:49:21 +0200 Subject: [PATCH] Use the Gdal images from ghcr.io see: https://lists.osgeo.org/pipermail/gdal-dev/2023-March/057049.html --- .github/renovate.json5 | 5 +++++ Dockerfile | 2 +- requirements.txt | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index d2ab6fdea..02795ea0d 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -37,6 +37,11 @@ groupName: 'all minor versions', automerge: true, }, + { + matchDatasources: ['docker'], + matchPackageNames: ['ghcr.io/osgeo/gdal'], + versioning: 'regex:^(?.*)-(?\\d+)\\.(?\\d+)\\.(?\\d+)?$', + }, /** Group Poetry packages */ { matchPackageNames: ['poetry', 'pip'], diff --git a/Dockerfile b/Dockerfile index 1fa4464e0..e918be2f4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM osgeo/gdal:3.2.0 as base-all +FROM ghcr.io/osgeo/gdal:ubuntu-small-3.6.2 as base-all LABEL maintainer Camptocamp "info@camptocamp.com" SHELL ["/bin/bash", "-o", "pipefail", "-cux"] diff --git a/requirements.txt b/requirements.txt index 5f85c3777..22a018ea8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ poetry==1.4.0 poetry-plugin-export==1.3.0 -poetry-plugin-tweak-dependencies-version==1.2.1 +poetry-plugin-tweak-dependencies-version==1.3.0 poetry-dynamic-versioning==0.21.4 pip==23.0.1