Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use only LTR QGIS version 3.4 #5461

Merged
merged 1 commit into from
Nov 1, 2019
Merged

Use only LTR QGIS version 3.4 #5461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,7 @@ help:
.PHONY: docker-pull
docker-pull:
for image in `find -name Dockerfile -o -name Dockerfile.mako | xargs grep --no-filename FROM | awk '{print $$2}' | sort -u`; do docker pull $$image; done
docker pull camptocamp/qgis-server:latest
docker pull camptocamp/qgis-server:3.4 # LTR
docker pull camptocamp/qgis-server:3.6

.PHONY: docker-build
docker-build: docker-pull
Expand Down Expand Up @@ -223,13 +221,9 @@ docker/qgisserver/commons: commons

.PHONY: docker-build-qgisserver
docker-build-qgisserver: $(shell docker-required --path docker/qgisserver) docker/qgisserver/commons
docker build --build-arg=VERSION=latest \
--tag=$(DOCKER_BASE)-qgisserver:gmf$(MAJOR_VERSION)-qgismaster docker/qgisserver
# LTR
docker build --build-arg=VERSION=3.4 \
--tag=$(DOCKER_BASE)-qgisserver:gmf$(MAJOR_VERSION)-qgis3.4 docker/qgisserver
docker build --build-arg=VERSION=3.6 \
--tag=$(DOCKER_BASE)-qgisserver:gmf$(MAJOR_VERSION)-qgis3.6 docker/qgisserver

.PHONY: prepare-tests
prepare-tests: \
Expand Down
2 changes: 1 addition & 1 deletion travis/publish
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ do
done

# Publish the GeoMapFish QGIS server images
for QGIS_VERSION in 3.4 3.6 master
for QGIS_VERSION in 3.4
do
docker tag camptocamp/geomapfish-qgisserver:gmf${MAJOR_VERSION}-qgis${QGIS_VERSION} \
camptocamp/geomapfish-qgisserver:gmf${VERSION_QGIS}-qgis${QGIS_VERSION}
Expand Down