From 4bfaaca02f58780ad4996d3ec317198d7c2af761 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Tue, 24 Oct 2017 14:34:24 +0200 Subject: [PATCH] Add make pull --- Makefile | 5 +++++ docker/test-mapserver/Dockerfile | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ccc4ad3383..446f6770e3 100644 --- a/Makefile +++ b/Makefile @@ -62,6 +62,7 @@ help: @echo @echo "Main targets:" @echo + @echo "- pull Pull all the needed Docker images" @echo "- build Build and configure the project" @echo "- buildall Build, check and test the project" @echo "- doc Build the project documentation" @@ -71,6 +72,10 @@ help: @echo "- cleanall Remove all the build artefacts" @echo "- transifex-send Send the localisation to Transifex" +.PHONY: pull +pull: + for image in `find -name Dockerfile | xargs grep --no-filename FROM | awk '{print $$2}' | sort -u`; do docker pull $$image; done + .PHONY: build build: $(MAKO_FILES:.mako=) \ c2c-egg \ diff --git a/docker/test-mapserver/Dockerfile b/docker/test-mapserver/Dockerfile index 368ea171d7..d7d697fb28 100644 --- a/docker/test-mapserver/Dockerfile +++ b/docker/test-mapserver/Dockerfile @@ -1,3 +1,3 @@ -FROM camptocamp/mapserver +FROM camptocamp/mapserver:7.0 LABEL maintainer Camptocamp "info@camptocamp.com" COPY *.map /etc/mapserver/