From 1d223f3157f32ff300940f0208bfc455904ea101 Mon Sep 17 00:00:00 2001 From: Arthur Barr Date: Wed, 14 Feb 2018 11:07:59 +0000 Subject: [PATCH] Require Docker V17.06.1 or greater to build --- Makefile | 5 ++--- docs/building.md | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 196fd0c..daeed66 100644 --- a/Makefile +++ b/Makefile @@ -190,10 +190,9 @@ define docker-build-mq --volume "$(realpath ./downloads/)":/usr/share/nginx/html:ro \ --detach \ nginx:alpine - # Make sure we have the latest base image - $(DOCKER) pull $(BASE_IMAGE) - # Build the new image + # Build the new image (use --pull to make sure we have the latest base image) $(DOCKER) build \ + --pull \ --tag $1 \ --file $2 \ --network build \ diff --git a/docs/building.md b/docs/building.md index dd69de3..f8a2aa6 100644 --- a/docs/building.md +++ b/docs/building.md @@ -2,7 +2,7 @@ ## Prerequisites You need to ensure you have the following tools installed: -* [Docker](https://www.docker.com/) V17.05 or later +* [Docker](https://www.docker.com/) V17.06.1 or later * [GNU make](https://www.gnu.org/software/make/) ## Building a production image