Skip to content
This repository has been archived by the owner on Jul 9, 2021. It is now read-only.

Commit

Permalink
support docker 1.17.x (#15)
Browse files Browse the repository at this point in the history
1.17.x doesn't like labels/environment specified as a list, converted to
maps
  • Loading branch information
pklingem authored Nov 21, 2017
1 parent 248a8a8 commit 01f9c74
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ services:
command: "-bootstrap -bind 0.0.0.0 -client 0.0.0.0 -ui"
dns_search: ""
labels:
- "SERVICE_8500_CHECK_TCP=true"
- "SERVICE_8500_CHECK_INTERVAL=15s"
- "SERVICE_8500_NAME=consul"
- "SERVICE_8500_TAGS=urlprefix-consul.*/"
SERVICE_8500_CHECK_TCP: "true"
SERVICE_8500_CHECK_INTERVAL: "15s"
SERVICE_8500_NAME: "consul"
SERVICE_8500_TAGS: "urlprefix-consul.*/"
restart: always

registrator:
Expand All @@ -29,12 +29,12 @@ services:
volumes:
- "./ssl:/ssl"
environment:
- "FABIO_PROXY_CS=cs=ssl;type=path;cert=/ssl"
- "FABIO_PROXY_ADDR=:80,:443;cs=ssl"
- "FABIO_UI_TITLE=Tugboat Services"
- "FABIO_UI_COLOR=blue"
- "REGISTRY_CONSUL_ADDR=consul:8500"
- "REGISTRY_CONSUL_REGISTER_TAGS=urlprefix-fabio.*/,urlprefix-dev.*/"
FABIO_PROXY_CS: "cs=ssl;type=path;cert=/ssl"
FABIO_PROXY_ADDR: ":80,:443;cs=ssl"
FABIO_UI_TITLE: "Tugboat Services"
FABIO_UI_COLOR: "blue"
REGISTRY_CONSUL_ADDR: "consul:8500"
REGISTRY_CONSUL_REGISTER_TAGS: "urlprefix-fabio.*/,urlprefix-dev.*/"
ports:
- "80:80"
- "443:443"
Expand Down

0 comments on commit 01f9c74

Please sign in to comment.