Skip to content

Commit 01e9ded

Browse files
committed
update internal traefik to 2.2
1 parent f4b27d3 commit 01e9ded

File tree

1 file changed

+31
-32
lines changed

1 file changed

+31
-32
lines changed

services/docker-compose.yml

+31-32
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ services:
100100
deploy:
101101
mode: replicated
102102
replicas: 8
103-
endpoint_mode: dnsrr
103+
endpoint_mode: dnsrr
104104
resources:
105105
reservations:
106106
cpus: "0.1"
@@ -220,30 +220,30 @@ services:
220220
- default
221221

222222
traefik:
223-
image: traefik:v2.1
223+
image: traefik:v2.2
224224
init: true
225225
command:
226-
- '--api=true'
227-
- '--api.dashboard=true'
228-
- '--log.level=INFO'
229-
- '--accesslog=false'
230-
- '--metrics.prometheus=true'
231-
- '--metrics.prometheus.addEntryPointsLabels=true'
232-
- '--metrics.prometheus.addServicesLabels=true'
233-
- '--entryPoints.metrics.address=:8082'
234-
- '--metrics.prometheus.entryPoint=metrics'
235-
- '--entryPoints.http.address=:80'
236-
- '--entryPoints.traefik_dashboard.address=:8080'
237-
- '--providers.docker.endpoint=unix:///var/run/docker.sock'
238-
- '--providers.docker.swarmMode=true'
239-
- '--providers.docker.network=simcore_default'
240-
- '--providers.docker.exposedByDefault=false'
241-
#FIXME: the zone must be prefixed with the stack name!!!
242-
- '--providers.docker.constraints=Label(`io.simcore.zone`, `internal_simcore_stack`)'
243-
- '--tracing=true'
244-
- '--tracing.jaeger=true'
245-
- '--tracing.jaeger.samplingServerURL=http://jaeger:5778/sampling'
246-
- '--tracing.jaeger.localAgentHostPort=jaeger:6831'
226+
- "--api=true"
227+
- "--api.dashboard=true"
228+
- "--log.level=INFO"
229+
- "--accesslog=false"
230+
- "--metrics.prometheus=true"
231+
- "--metrics.prometheus.addEntryPointsLabels=true"
232+
- "--metrics.prometheus.addServicesLabels=true"
233+
- "--entryPoints.metrics.address=:8082"
234+
- "--metrics.prometheus.entryPoint=metrics"
235+
- "--entryPoints.http.address=:80"
236+
- "--entryPoints.traefik_dashboard.address=:8080"
237+
- "--providers.docker.endpoint=unix:///var/run/docker.sock"
238+
- "--providers.docker.swarmMode=true"
239+
- "--providers.docker.network=simcore_default"
240+
- "--providers.docker.exposedByDefault=false"
241+
#FIXME: the zone must be prefixed with the stack name!!!
242+
- "--providers.docker.constraints=Label(`io.simcore.zone`, `internal_simcore_stack`)"
243+
- "--tracing=true"
244+
- "--tracing.jaeger=true"
245+
- "--tracing.jaeger.samplingServerURL=http://jaeger:5778/sampling"
246+
- "--tracing.jaeger.localAgentHostPort=jaeger:6831"
247247

248248
volumes:
249249
# So that Traefik can listen to the Docker events
@@ -254,15 +254,14 @@ services:
254254
constraints:
255255
- node.role == manager
256256
# labels:
257-
# - io.simcore.zone=internal_simcore_stack
258-
# - traefik.enable=true
259-
260-
# traefik UI
261-
# - traefik.http.routers.api_internal.service=api@internal
262-
# - traefik.http.routers.api_internal.rule=PathPrefix(`/dashboard`) || PathPrefix(`/api`)
263-
# - traefik.http.routers.api_internal.entrypoints=traefik_dashboard
264-
# - traefik.http.routers.api_internal.middlewares=gzip@docker
265-
# - traefik.http.services.api_internal.loadbalancer.server.port=8080
257+
# - io.simcore.zone=internal_simcore_stack
258+
# - traefik.enable=true
259+
# traefik UI
260+
# - traefik.http.routers.api_internal.service=api@internal
261+
# - traefik.http.routers.api_internal.rule=PathPrefix(`/dashboard`) || PathPrefix(`/api`)
262+
# - traefik.http.routers.api_internal.entrypoints=traefik_dashboard
263+
# - traefik.http.routers.api_internal.middlewares=gzip@docker
264+
# - traefik.http.services.api_internal.loadbalancer.server.port=8080
266265
networks:
267266
- default
268267
- interactive_services_subnet

0 commit comments

Comments
 (0)