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

Jump to bottom

QGIS publish docker package #4357

Merged
merged 1 commit into from
Nov 28, 2018
Merged

QGIS publish docker package #4357

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
9 changes: 6 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,9 +196,12 @@ 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: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 --build-arg=VERSION=latest \
--tag=$(DOCKER_BASE)-qgisserver:gmf$(MAJOR_VERSION)-qgismaster docker/qgisserver
docker build --build-arg=VERSION=3.2 \
--tag=$(DOCKER_BASE)-qgisserver:gmf$(MAJOR_VERSION)-qgis3.2 docker/qgisserver
docker build --build-arg=VERSION=3.4 \
--tag=$(DOCKER_BASE)-qgisserver:gmf$(MAJOR_VERSION)-qgis3.4 docker/qgisserver

.PHONY: prepare-tests
prepare-tests: \
Expand Down
3 changes: 2 additions & 1 deletion docker/qgisserver/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM camptocamp/qgis-server:latest
ARG VERSION=latest
FROM camptocamp/qgis-server:${VERSION}
LABEL maintainer Camptocamp "info@camptocamp.com"

COPY requirements.txt /tmp/
Expand Down
10 changes: 0 additions & 10 deletions docker/qgisserver/Dockerfile32
View file
Open in desktop

This file was deleted.

12 changes: 9 additions & 3 deletions travis/publish
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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 ]
Expand Down