academy/mq-container
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes for running on older Docker versions

Browse Source
This commit is contained in:
Arthur Barr
2017-12-05 13:22:36 +00:00
parent c297e1bf5d
commit 584a4f2eb4
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@@ -16,7 +16,7 @@ BUILD_SERVER_CONTAINER=build-server
DOCKER_TAG_ARCH ?= $(shell uname -m) DOCKER_TAG_ARCH ?= $(shell uname -m)
# By default, all Docker client commands are run inside a Docker container. # 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. # 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_TAG ?= latest-$(DOCKER_TAG_ARCH)
DOCKER_REPO_DEVSERVER ?= mq-devserver DOCKER_REPO_DEVSERVER ?= mq-devserver
DOCKER_REPO_ADVANCEDSERVER ?= mq-advancedserver DOCKER_REPO_ADVANCEDSERVER ?= mq-advancedserver
@@ -150,9 +150,10 @@ define docker-build-mq
--volume "$(realpath ./downloads/)":/usr/share/nginx/html:ro \ --volume "$(realpath ./downloads/)":/usr/share/nginx/html:ro \
--detach \ --detach \
nginx:alpine nginx:alpine
# Make sure we have the latest base image
$(DOCKER) pull ubuntu:16.04
# Build the new image # Build the new image
$(DOCKER) build \ $(DOCKER) build \
--pull \
--tag $1 \ --tag $1 \
--file $2 \ --file $2 \
--network build \ --network build \

4
docs/developing.md
View File

@@ -2,8 +2,8 @@
## Prerequisites ## Prerequisites
You need to ensure you have the following tools installed: You need to ensure you have the following tools installed:
* [Docker](https://www.docker.com/) * [Docker](https://www.docker.com/) V17.05 or later
* GNU make * [GNU make](https://www.gnu.org/software/make/)
You might also need the following tools installed: You might also need the following tools installed:
* [Go](https://golang.org/) - only needed for running the tests * [Go](https://golang.org/) - only needed for running the tests