From 908f75ac4b77ab591a060114b25c3f68854e243f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 3 Jun 2024 07:26:42 +0000 Subject: [PATCH 1/2] Update all minor versions --- Dockerfile | 2 +- acceptance_tests/poetry.lock | 22 +++++++++++----------- acceptance_tests/pyproject.toml | 6 +++--- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3ab4bc7e..91e5e4b4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/osgeo/gdal:ubuntu-small-3.8.5 as gdal +FROM ghcr.io/osgeo/gdal:ubuntu-small-3.9.0 as gdal FROM gdal as builder LABEL maintainer Camptocamp "info@camptocamp.com" diff --git a/acceptance_tests/poetry.lock b/acceptance_tests/poetry.lock index 2ebb3c55..86d6e0f0 100644 --- a/acceptance_tests/poetry.lock +++ b/acceptance_tests/poetry.lock @@ -58,13 +58,13 @@ files = [ [[package]] name = "certifi" -version = "2024.2.2" +version = "2024.6.2" description = "Python package for providing Mozilla's CA Bundle." optional = false python-versions = ">=3.6" files = [ - {file = "certifi-2024.2.2-py3-none-any.whl", hash = "sha256:dc383c07b76109f368f6106eee2b593b04a011ea4d55f652c6ca24a754d1cdd1"}, - {file = "certifi-2024.2.2.tar.gz", hash = "sha256:0569859f95fc761b18b45ef421b1290a0f65f147e92a1e5eb3e635f9a5e4e66f"}, + {file = "certifi-2024.6.2-py3-none-any.whl", hash = "sha256:ddc6c8ce995e6987e7faf5e3f1b02b302836a0e5d98ece18392cb1a36c72ad56"}, + {file = "certifi-2024.6.2.tar.gz", hash = "sha256:3cd43f1c6fa7dedc5899d69d3ad0398fd018ad1a17fba83ddaf78aa46c747516"}, ] [[package]] @@ -457,13 +457,13 @@ files = [ [[package]] name = "owslib" -version = "0.30.0" +version = "0.31.0" description = "OGC Web Service utility library" optional = false python-versions = ">=3.6" files = [ - {file = "OWSLib-0.30.0-py2.py3-none-any.whl", hash = "sha256:88277cf674ded604596af5c04eb2a17c6846dfe8bcfb7a5dc9ab50b3ef5f1385"}, - {file = "OWSLib-0.30.0.tar.gz", hash = "sha256:f17413cc75836c0303cd1d4fd9bb0f21915a8b492dacc64ef5f4021b28e82d4c"}, + {file = "OWSLib-0.31.0-py2.py3-none-any.whl", hash = "sha256:ab54d20974bd8ddd24ee5539c46a7829ec9e77ed0976724f635d1a3a321d3a39"}, + {file = "OWSLib-0.31.0.tar.gz", hash = "sha256:2ed6540087445cc57d905138a590b6ae58624ec7661b5c1682ed4e3303bcd150"}, ] [package.dependencies] @@ -694,13 +694,13 @@ files = [ [[package]] name = "requests" -version = "2.31.0" +version = "2.32.3" description = "Python HTTP for Humans." optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "requests-2.31.0-py3-none-any.whl", hash = "sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f"}, - {file = "requests-2.31.0.tar.gz", hash = "sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1"}, + {file = "requests-2.32.3-py3-none-any.whl", hash = "sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6"}, + {file = "requests-2.32.3.tar.gz", hash = "sha256:55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760"}, ] [package.dependencies] @@ -884,4 +884,4 @@ zstd = ["zstandard (>=0.18.0)"] [metadata] lock-version = "2.0" python-versions = ">=3.10,<3.13" -content-hash = "5501a189d2b6e4a9f1a0ffed941ac01ede8615a8c5b6079e968e2d70b4950fa8" +content-hash = "dd31f0ae79d093e3aa441f3f951847542f6ec8ce5c36b7eba04299bce47e90c8" diff --git a/acceptance_tests/pyproject.toml b/acceptance_tests/pyproject.toml index a28d7b35..f9200cee 100644 --- a/acceptance_tests/pyproject.toml +++ b/acceptance_tests/pyproject.toml @@ -28,7 +28,7 @@ pytest = "8.2.1" c2cwsgiutils = "6.0.8" boltons = "24.0.0" netifaces = "0.11.0" -requests = "2.31.0" +requests = "2.32.3" lxml = "5.2.2" -certifi = "2024.2.2" -OWSLib = "0.30.0" +certifi = "2024.6.2" +OWSLib = "0.31.0" From 00108d35c1b1e15c68a15d9cd6e4369d72ee3ae5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Mon, 3 Jun 2024 10:14:00 +0200 Subject: [PATCH 2/2] Fix GDAL/Ubuntu Upgrade --- .github/workflows/main.yaml | 2 +- Dockerfile | 4 ++-- Makefile | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index e332985b..be17351d 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -16,7 +16,7 @@ jobs: main: name: Continuous integration runs-on: ubuntu-22.04 - timeout-minutes: 40 + timeout-minutes: 50 if: "!startsWith(github.event.head_commit.message, '[skip ci] ')" steps: diff --git a/Dockerfile b/Dockerfile index 91e5e4b4..a3138164 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ RUN --mount=type=cache,target=/var/cache,sharing=locked \ libfreetype6-dev libfcgi-dev libcurl4-gnutls-dev libcairo2-dev libxml2-dev \ libxslt1-dev python3-dev php-dev libexempi-dev lcov lftp ninja-build git curl \ clang libprotobuf-c-dev protobuf-c-compiler libharfbuzz-dev libcairo2-dev librsvg2-dev \ - && ln -s /usr/local/lib/libproj.so.25 /usr/local/lib/libproj.so + && ln -s /usr/lib/*-linux-gnu/libproj.so.*[0] $(echo /usr/lib/*-linux-gnu)/libproj.so ARG MAPSERVER_BRANCH ARG MAPSERVER_REPO=https://github.com/mapserver/mapserver @@ -89,7 +89,7 @@ RUN --mount=type=cache,target=/var/cache,sharing=locked \ && apt-get upgrade --assume-yes \ && apt-get install --assume-yes --no-install-recommends ca-certificates apache2 libapache2-mod-fcgid \ libfribidi0 librsvg2-2 libpng16-16 libgif7 libfcgi0ldbl \ - libxslt1.1 libprotobuf-c1 libaio1 glibc-tools + libxslt1.1 libprotobuf-c1 libaio1t64 glibc-tools RUN a2enmod fcgid headers status \ && a2dismod -f auth_basic authn_file authn_core authz_user autoindex dir \ diff --git a/Makefile b/Makefile index 9553c619..844eb637 100644 --- a/Makefile +++ b/Makefile @@ -20,11 +20,11 @@ all: acceptance .PHONY: build build: ## Build the Docker image - docker $(DOCKER_BUILDX) build $(DOCKER_BUILD_ARGS) --tag=$(DOCKER_IMAGE):$(DOCKER_TAG) --target=runner --build-arg=MAPSERVER_BRANCH=$(MAPSERVER_BRANCH) --build-arg=WITH_ORACLE=$(WITH_ORACLE) . + $(shell which docker) $(DOCKER_BUILDX) build $(DOCKER_BUILD_ARGS) --tag=$(DOCKER_IMAGE):$(DOCKER_TAG) --target=runner --build-arg=MAPSERVER_BRANCH=$(MAPSERVER_BRANCH) --build-arg=WITH_ORACLE=$(WITH_ORACLE) . .PHONY: build-no-cache build-no-cache: ## Build the Docker image (no cache) - docker $(DOCKER_BUILDX) build --no-cache $(DOCKER_BUILD_ARGS) --tag=$(DOCKER_IMAGE):$(DOCKER_TAG) --target=runner --build-arg=MAPSERVER_BRANCH=$(MAPSERVER_BRANCH) --build-arg=WITH_ORACLE=$(WITH_ORACLE) . + $(shell which docker) $(DOCKER_BUILDX) build --no-cache $(DOCKER_BUILD_ARGS) --tag=$(DOCKER_IMAGE):$(DOCKER_TAG) --target=runner --build-arg=MAPSERVER_BRANCH=$(MAPSERVER_BRANCH) --build-arg=WITH_ORACLE=$(WITH_ORACLE) . .PHONY: acceptance acceptance: build ## Run the acceptance tests