diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6fa0c7b6..c94b3e04 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -62,7 +62,7 @@ repos: - github-workflows-require-timeout - id: check-renovate additional_dependencies: - - pyjson5==1.6.7 # pypi + - pyjson5==1.6.8 # pypi - repo: https://github.com/sirwart/ripsecrets rev: v0.1.8 hooks: diff --git a/Dockerfile b/Dockerfile index 52ecfde8..6932cef2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -142,4 +142,6 @@ ENV MS_DEBUGLEVEL=0 \ CMD ["/usr/local/bin/start-server"] +VOLUME /tmp + WORKDIR /etc/mapserver diff --git a/acceptance_tests/docker-compose.yaml b/acceptance_tests/docker-compose.yaml index c9a87924..dc4e88a1 100644 --- a/acceptance_tests/docker-compose.yaml +++ b/acceptance_tests/docker-compose.yaml @@ -1,7 +1,3 @@ -volumes: - tmp: - logs: - services: # Used to test the server using the MS_MAPFILE environment variable mapserver: @@ -17,8 +13,6 @@ services: # - 8380:8080 volumes: - ./config/mapserver/:/etc/mapserver - - tmp:/tmp - - logs:/var/log/ user: 12311:12311 # Used to test the server using the MAP parameter of the query string @@ -77,8 +71,6 @@ services: - db volumes: - ./config/mapserver/:/etc/mapserver - - tmp:/tmp - - logs:/var/log/ user: 12311:12311 mapserver-lighttpd: diff --git a/ci/config.yaml b/ci/config.yaml index 17bda63c..79e64539 100644 --- a/ci/config.yaml +++ b/ci/config.yaml @@ -1,4 +1,4 @@ -# yaml-language-server: $schema=https://raw.githubusercontent.com/camptocamp/c2cciutils/1.7.1/c2cciutils/schema.json +# yaml-language-server: $schema=https://raw.githubusercontent.com/camptocamp/c2cciutils/1.7.3/c2cciutils/schema.json version: branch_to_version_re: diff --git a/ci/requirements.txt b/ci/requirements.txt index 58f4f382..56e9b021 100644 --- a/ci/requirements.txt +++ b/ci/requirements.txt @@ -1,2 +1,2 @@ -c2cciutils[checks,publish]==1.7.1 +c2cciutils[checks,publish]==1.7.3 pre-commit==4.1.0