diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index dac316dbacf..f0118fb71ae 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -195,7 +195,7 @@ jobs: - uses: actions/setup-python@v4 with: python-version: '3.10' - - run: pip install --user PyYAML docker-compose wheel + - run: pip install --user PyYAML==5.3.1 docker-compose==1.29.2 - name: Init Git run: diff --git a/docker-compose.yaml b/docker-compose.yaml index 78e3d5443c4..4dfb4b20893 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -55,6 +55,8 @@ services: restart: unless-stopped environment: - TILEGENERATION_CONFIGFILE=/etc/tilegeneration/config.yaml + - TILECLOUD_CHAIN_SESSION_SECRET=1234 + - TILECLOUD_CHAIN_SESSION_SALT=1234 volumes: - ./docker/test-tilecloudchain:/etc/tilegeneration diff --git a/docker/qgisserver/Dockerfile b/docker/qgisserver/Dockerfile index ae807101931..0000b732725 100644 --- a/docker/qgisserver/Dockerfile +++ b/docker/qgisserver/Dockerfile @@ -11,13 +11,16 @@ COPY python/ /tmp/python/ RUN apt-get update && \ apt-get upgrade --assume-yes && \ - apt-get install --assume-yes --no-install-recommends libpython3-dev libpq-dev gcc && \ + apt-get install --assume-yes --no-install-recommends libpython3-dev libpq-dev gcc cython3 && \ apt-get clean && \ rm --recursive --force /var/lib/apt/lists/* && \ + ln -s /usr/bin/cython3 /usr/bin/cython && \ cd /tmp/python/$(python3 --version|awk '{print $2}'|awk -F '.' '{print $1 "." $2}') && \ - PIP_NO_BINARY=shapely pipenv sync --system --clear && \ + PIP_NO_BINARY=shapely pipenv sync --system --clear --verbose && \ + python -c 'import yaml' && \ rm -rf /root/.local/share/virtualenv /root/.local/share/virtualenvs && \ - apt-get remove --assume-yes libpython3-dev libpq-dev gcc + rm -rf /usr/bin/cython && \ + apt-get remove --assume-yes libpython3-dev libpq-dev gcc cython3 ############################################################################################################# diff --git a/docker/qgisserver/docker-compose.yaml b/docker/qgisserver/docker-compose.yaml index 92e983f75a5..233c18c6f5a 100644 --- a/docker/qgisserver/docker-compose.yaml +++ b/docker/qgisserver/docker-compose.yaml @@ -28,6 +28,7 @@ services: - QGIS_PROJECT_FILE=/etc/qgisserver/project.qgz - QGIS_SERVER_IGNORE_BAD_LAYERS=true - LOG_LEVEL=DEBUG + - QGIS_SERVER_LOG_LEVEL=0 - QGIS_CATCH_SEGV=1 tests: