From ef8b78507e8e9bee6e7bf73a6934a079088d36b3 Mon Sep 17 00:00:00 2001 From: David Marteau Date: Wed, 28 Sep 2022 19:00:28 +0200 Subject: [PATCH] Fix packaging of static html elements --- MANIFEST.in | 3 ++- Makefile | 2 +- docker/Makefile | 8 ++++---- docker/docker-compose.yml | 4 +++- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index 029c925..fead42d 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -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 * diff --git a/Makefile b/Makefile index b8e2d76..f1df366 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ # qypws makefile # -VERSION:=1.8.1 +VERSION:=1.8.2 ifndef CI_COMMIT_TAG VERSION_TAG=$(VERSION)rc0 diff --git a/docker/Makefile b/docker/Makefile index 428c19a..7ea6591 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -131,12 +131,12 @@ env: run: stop env @echo "NOTE: Pour redémarrer un service, considérez plutôt:" - @echo " > docker-compose restart " - docker-compose up + @echo " > docker compose restart " + 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: diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index ad0e2c2..c64343b 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -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