Skip to content

Commit

Permalink
Fix packaging of static html elements
Browse files Browse the repository at this point in the history
  • Loading branch information
dmarteau committed Sep 28, 2022
1 parent 0f4908d commit ef8b785
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 7 deletions.
3 changes: 2 additions & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@ include setup.py MANIFEST.in README.md VERSION
include requirements.txt
include pyqgiswps/build.manifest
recursive-include pyqgiswps/schemas *
recursive-include pyqgiswps/webui *
recursive-include pyqgiswps/html *
recursive-include pyqgiswps/openapi *

2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# qypws makefile
#

VERSION:=1.8.1
VERSION:=1.8.2

ifndef CI_COMMIT_TAG
VERSION_TAG=$(VERSION)rc0
Expand Down
8 changes: 4 additions & 4 deletions docker/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -131,12 +131,12 @@ env:

run: stop env
@echo "NOTE: Pour redémarrer un service, considérez plutôt:"
@echo " > docker-compose restart <service>"
docker-compose up
@echo " > docker compose restart <service>"
docker compose up

stop:
docker-compose stop || true
docker-compose rm -f || true
docker compose stop || true
docker compose rm -f || true

# Client tests, run the service first
test:
Expand Down
4 changes: 3 additions & 1 deletion docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,15 @@ services:
QGSWPS_SERVER_WORKDIR: /srv/data
QGSWPS_USER: ${BECOME_USER}
QGSWPS_LOGLEVEL: DEBUG
QGSWPS_SERVER_RESTARTMON: /src/.qgis-restart
volumes:
- ${RUNDIR}:/processing
- ${RUNDIR}/data:/projects
- ${PWD}/__workdir__:/srv/data
- ${PWD}/.home:/home/qgis
- ${SRCDIR}:/src
ports:
- 127.0.0.1:8888:8080
redis:
image: redis:5-alpine
image: redis:6-alpine

0 comments on commit ef8b785

Please sign in to comment.