Merge pull request #3874 from camptocamp/qgis-versions

Build QGIS version 3.2, master

Makefile

@@ -195,8 +195,9 @@ docker/qgisserver/commons: commons
 
 .PHONY: docker-build-qgisserver
 docker-build-qgisserver: $(shell docker-required --path docker/qgisserver) docker/qgisserver/commons
-	docker build --tag=$(DOCKER_BASE)-qgisserver:$(MAJOR_VERSION) docker/qgisserver
-
+	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
 
 .PHONY: prepare-tests
 prepare-tests: \

docker/qgisserver/Dockerfile32

@@ -0,0 +1,10 @@
+FROM camptocamp/qgis-server:3.2
+LABEL maintainer Camptocamp "[email protected]"
+
+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

geoportal/c2cgeoportal_geoportal/scaffolds/create/docker-compose.yaml.mako

@@ -29,7 +29,7 @@ ${service_defaults('print', 8080)}\
 ${service_defaults('mapserver', 8080)}\
 
 ##  qgisserver:
-##    image: camptocamp/geomapfish-qgisserver:2.3
+##    image: camptocamp/geomapfish-qgisserver:gmf2.3-qgis3.2
 ##    user: www-data
 ##    volumes_from:
 ##      - config:ro

travis/publish-docker

@@ -1,8 +1,8 @@
-#!/bin/bash
+#!/bin/bash -ex
 
 docker login --username ${DOCKER_USERNAME} --password ${DOCKER_PASSWORD}
 
-for IMAGE in geomapfish-build-dev geomapfish-commons geomapfish-build geomapfish-qgisserver
+for IMAGE in geomapfish-build-dev geomapfish-build
 do
     if [ "${TRAVIS_TAG}" != "" ]
     then
@@ -16,3 +16,20 @@ do
         docker push camptocamp/${IMAGE}:${MAJOR_VERSION}
     fi
 done
+
+for QGIS_VERSION in 3.2 master
+do
+    if [ "${TRAVIS_TAG}" != "" ]
+    then
+        docker tag camptocamp/geomapfish-qgisserver:gmf${MAJOR_VERSION}-qgis${QGIS_VERSION} \
+            camptocamp/geomapfish-qgisserver:gmf${TRAVIS_TAG}-qgis${QGIS_VERSION}
+        docker push camptocamp/geomapfish-qgisserver:gmf${TRAVIS_TAG}-qgis${QGIS_VERSION}
+    elif [ "${TRAVIS_BRANCH}" != "master" ]
+    then
+        docker tag camptocamp/geomapfish-qgisserver:gmf${MAJOR_VERSION}-qgis${QGIS_VERSION} \
+            camptocamp/geomapfish-qgisserver:gmf${TRAVIS_BRANCH/\//_}-qgis${QGIS_VERSION}
+        docker push camptocamp/geomapfish-qgisserver:gmf${TRAVIS_BRANCH/\//_}-qgis${QGIS_VERSION}
+    else
+        docker push camptocamp/geomapfish-qgisserver:gmf${MAJOR_VERSION}-qgis${QGIS_VERSION}
+    fi
+done