From 3354d64488bdf67c085fd17e363f97860e4857b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Brunner?= <stephane.brunner@camptocamp.com>
Date: Fri, 7 Jun 2019 10:39:37 +0200
Subject: [PATCH] Fix config image name

---
 Makefile                                                        | 2 +-
 .../c2cgeoportal_geoportal/scaffolds/create/Dockerfile.mako     | 2 +-
 travis/publish                                                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 4719cf6235..f61bfb29d3 100644
--- a/Makefile
+++ b/Makefile
@@ -209,7 +209,7 @@ docker-build-build: $(shell docker-required --path . --replace-pattern='^test(.*
 
 .PHONY: docker-build-config
 docker-build-config:
-	docker build --tag=$(DOCKER_BASE)-config:$(MAJOR_VERSION) docker/config
+	docker build --tag=$(DOCKER_BASE)-config-build:$(MAJOR_VERSION) docker/config
 
 docker/qgisserver/commons: commons
 	rm --recursive --force $@
diff --git a/geoportal/c2cgeoportal_geoportal/scaffolds/create/Dockerfile.mako b/geoportal/c2cgeoportal_geoportal/scaffolds/create/Dockerfile.mako
index 4479a44317..3b55b943bf 100644
--- a/geoportal/c2cgeoportal_geoportal/scaffolds/create/Dockerfile.mako
+++ b/geoportal/c2cgeoportal_geoportal/scaffolds/create/Dockerfile.mako
@@ -1,4 +1,4 @@
-FROM camptocamp/geomapfish-build:${geomapfish_version}
+FROM camptocamp/geomapfish-config-build:${geomapfish_version}
 
 COPY . /tmp/config/
 
diff --git a/travis/publish b/travis/publish
index 1b37f29108..b36f0967e2 100755
--- a/travis/publish
+++ b/travis/publish
@@ -47,7 +47,7 @@ then
 fi
 
 # Publish the GeoMapFish images
-for IMAGE in geomapfish-build-dev geomapfish-build geomapfish-config
+for IMAGE in geomapfish-build-dev geomapfish-build geomapfish-config-build
 do
     docker tag camptocamp/${IMAGE}:${MAJOR_VERSION} camptocamp/${IMAGE}:${VERSION}
     docker push camptocamp/${IMAGE}:${VERSION}