Skip to content

Commit

Permalink
Fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
sbrunner committed Jul 19, 2023
1 parent e9f5697 commit e5eadfe
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 2 additions & 0 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
9 changes: 6 additions & 3 deletions docker/qgisserver/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

#############################################################################################################

Expand Down
1 change: 1 addition & 0 deletions docker/qgisserver/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit e5eadfe

Please sign in to comment.