From 584a4f2eb4abbbafb6630beab3014e8ccbf0fe72 Mon Sep 17 00:00:00 2001 From: Arthur Barr Date: Tue, 5 Dec 2017 13:22:36 +0000 Subject: [PATCH] Fixes for running on older Docker versions --- Makefile | 5 +++-- docs/developing.md | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 98a0ba6..d26ef8b 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ BUILD_SERVER_CONTAINER=build-server DOCKER_TAG_ARCH ?= $(shell uname -m) # By default, all Docker client commands are run inside a Docker container. # This means that newer features of the client can be used, even with an older daemon. -DOCKER ?= docker run --interactive --rm --volume /var/run/docker.sock:/var/run/docker.sock --volume "$(CURDIR)":/var/src --workdir /var/src docker:stable docker +DOCKER ?= docker DOCKER_TAG ?= latest-$(DOCKER_TAG_ARCH) DOCKER_REPO_DEVSERVER ?= mq-devserver DOCKER_REPO_ADVANCEDSERVER ?= mq-advancedserver @@ -150,9 +150,10 @@ 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 ubuntu:16.04 # Build the new image $(DOCKER) build \ - --pull \ --tag $1 \ --file $2 \ --network build \ diff --git a/docs/developing.md b/docs/developing.md index 007314f..6fa9682 100644 --- a/docs/developing.md +++ b/docs/developing.md @@ -2,8 +2,8 @@ ## Prerequisites You need to ensure you have the following tools installed: -* [Docker](https://www.docker.com/) -* GNU make +* [Docker](https://www.docker.com/) V17.05 or later +* [GNU make](https://www.gnu.org/software/make/) You might also need the following tools installed: * [Go](https://golang.org/) - only needed for running the tests