Merge pull request #4957 from camptocamp/config

By able to eayier build the project throw a proxy

Makefile

@@ -108,6 +108,7 @@ docker-build:
 .PHONY: build
 build: \
 	docker-build-build \
+	docker-build-config \
 	docker-build-qgisserver \
 	docker-build-testdb \
 	prepare-tests
@@ -187,6 +188,10 @@ docker-build-build: $(shell docker-required --path . --replace-pattern='^test(.*
 		$(APPS_FILES_ALT)
 	docker build --build-arg=VERSION=$(VERSION) --tag=$(DOCKER_BASE)-build:$(MAJOR_VERSION) .
 
+.PHONY: docker-build-config
+docker-build-config:
+	docker build --tag=$(DOCKER_BASE)-config:$(MAJOR_VERSION) docker/config
+
 docker/qgisserver/commons: commons
 	rm --recursive --force $@
 	cp --recursive $< $@

docker/config/Dockerfile

@@ -0,0 +1,8 @@
+FROM debian:stretch
+LABEL maintainer Camptocamp "info@camptocamp.com"
+
+RUN \
+  apt-get update && \
+  apt-get install --assume-yes --no-install-recommends gettext-base python3 && \
+  apt-get clean && \
+  rm --recursive --force /var/lib/apt/lists/*

geoportal/c2cgeoportal_geoportal/scaffolds/create/Dockerfile

@@ -1,11 +1,5 @@
-FROM debian:stretch
-LABEL maintainer Camptocamp "info@camptocamp.com"
-
-RUN \
-  apt-get update && \
-  apt-get install --assume-yes --no-install-recommends gettext-base python3 && \
-  apt-get clean && \
-  rm --recursive --force /var/lib/apt/lists/*
+ARG VERSION
+FROM camptocamp/geomapfish-build:${VERSION}
 
 COPY . /tmp/config/
 

geoportal/c2cgeoportal_geoportal/scaffolds/update/CONST_Makefile_tmpl

@@ -740,7 +740,7 @@ docker-build-config: $(shell docker-required --path .) \
 		$(PRINT_CONFIG_FILE) \
 		$(MAPCACHE_FILE) \
 		qgisserver/geomapfish.yaml
-	docker build --tag=$(DOCKER_BASE)-config:$(DOCKER_TAG) .
+	docker build --tag=$(DOCKER_BASE)-config:$(DOCKER_TAG) --build-arg=VERSION=$(GEOMAPFISH_VERSION) .
 
 .PHONY: docker-build-geoportal
 docker-build-geoportal: $(shell docker-required --path geoportal) \

travis/publish

@@ -47,7 +47,7 @@ then
 fi
 
 # Publish the GeoMapFish images
-for IMAGE in geomapfish-build-dev geomapfish-build
+for IMAGE in geomapfish-build-dev geomapfish-build geomapfish-config
 do
     docker tag camptocamp/${IMAGE}:${MAJOR_VERSION} camptocamp/${IMAGE}:${VERSION}
     docker push camptocamp/${IMAGE}:${VERSION}