From f6bddeaa2e94e3488abb2b04eef8f850979ea80c Mon Sep 17 00:00:00 2001 From: Justin Coyne Date: Wed, 21 Jun 2017 11:04:29 -0500 Subject: [PATCH] Merge volume directives Previously line 185 was overwriting line 180. The volume previously on line 180 is critical for running on docker-machine, but was not needed on Docker CE. See https://hub.docker.com/r/dockercloud/haproxy/ "Running with Docker Compose v2 (Compose Mode)" --- docker-compose.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 82d5292e3..217087666 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -177,13 +177,12 @@ services: - DOCKER_TLS_VERIFY - DOCKER_HOST - DOCKER_CERT_PATH - volumes: - - $DOCKER_CERT_PATH:$DOCKER_CERT_PATH ports: - 8080:80 - 8443:443 volumes: - /var/run/docker.sock:/var/run/docker.sock + - $DOCKER_CERT_PATH:$DOCKER_CERT_PATH networks: internal: external: