QGIS publish docker package

- Publish a version 3.4 of QGIS
- Don't publish minor versions

Makefile

@@ -199,6 +199,8 @@ docker-build-qgisserver: $(shell docker-required --path docker/qgisserver) docke
 	docker build --tag=$(DOCKER_BASE)-qgisserver:gmf$(MAJOR_VERSION)-qgismaster docker/qgisserver
 	docker build --tag=$(DOCKER_BASE)-qgisserver:gmf$(MAJOR_VERSION)-qgis3.2 \
 		--file=docker/qgisserver/Dockerfile32 docker/qgisserver
+	docker build --tag=$(DOCKER_BASE)-qgisserver:gmf$(MAJOR_VERSION)-qgis3.4 \
+		--file=docker/qgisserver/Dockerfile34 docker/qgisserver
 
 .PHONY: prepare-tests
 prepare-tests: \

docker/qgisserver/Dockerfile34

@@ -0,0 +1,10 @@
+FROM camptocamp/qgis-server:3.4
+LABEL maintainer Camptocamp "info@camptocamp.com"
+
+COPY requirements.txt /tmp/
+RUN python3 -m pip install --requirement /tmp/requirements.txt
+
+COPY geomapfish_plugin/* /var/www/plugins/geomapfish_qgisserver/
+COPY commons /opt/c2cgeoportal_commons
+
+RUN python3 -m pip install --editable /opt/c2cgeoportal_commons

travis/publish

@@ -5,6 +5,7 @@ docker login --username ${DOCKER_USERNAME} --password ${DOCKER_PASSWORD}
 TAG=`git tag --list --points-at=HEAD`
 LAST_TAG=`git describe --abbrev=0 --tags`
 COMMIT=FALSE
+VERSION_QGIS=FALSE
 
 if [[ ${TAG} =~ ^[0-9]\.[0-9]\.[0-9]$ ]]
 then
@@ -13,6 +14,7 @@ then
 else
     if [[ ${BRANCH_NAME} =~ ^[0-9]\.[0-9]$ ]]
     then
+        VERSION_QGIS=${TAG}
         TAG=${LAST_TAG}.`.venv/bin/python travis/get-minor`
         COMMIT=TRUE
     fi
@@ -38,6 +40,10 @@ else
     VERSION=${MAJOR_VERSION}
 fi
 export VERSION
+if [ ${VERSION_QGIS} == FALSE ]
+then
+    VERSION_QGIS=${VERSION}
+fi
 
 # Publish the GeoMapFish images
 for IMAGE in geomapfish-build-dev geomapfish-build
@@ -47,11 +53,11 @@ do
 done
 
 # Publish the GeoMapFish QGIS server images
-for QGIS_VERSION in 3.2 master
+for QGIS_VERSION in 3.4 3.2 master
 do
     docker tag camptocamp/geomapfish-qgisserver:gmf${MAJOR_VERSION}-qgis${QGIS_VERSION} \
-        camptocamp/geomapfish-qgisserver:gmf${VERSION}-qgis${QGIS_VERSION}
-    docker push camptocamp/geomapfish-qgisserver:gmf${VERSION}-qgis${QGIS_VERSION}
+        camptocamp/geomapfish-qgisserver:gmf${VERSION_QGIS}-qgis${QGIS_VERSION}
+    docker push camptocamp/geomapfish-qgisserver:gmf${VERSION_QGIS}-qgis${QGIS_VERSION}
 done
 
 if [ ${DEPLOY_PIP} == TRUE ]