Commit 1fe5d1c0621fd7e0cf9dc0aa18f4bc9609181b8d

Authored by Igor Kulikov
1 parent 750bd700

MSA docker: Update Haproxy certbot image.

... ... @@ -146,7 +146,7 @@ services:
146 146 haproxy:
147 147 restart: always
148 148 container_name: haproxy-certbot
149   - image: nmarus/haproxy-certbot
  149 + image: xalauc/haproxy-certbot:1.7.9
150 150 volumes:
151 151 - ./haproxy/config:/config
152 152 - ./haproxy/letsencrypt:/etc/letsencrypt
... ...
... ... @@ -23,6 +23,13 @@ defaults
23 23 timeout connect 5000ms
24 24 timeout client 50000ms
25 25 timeout server 50000ms
  26 + timeout tunnel 1h # timeout to use with WebSocket and CONNECT
  27 +
  28 + default-server init-addr none
  29 +
  30 +#enable resolving throught docker dns and avoid crashing if service is down while proxy is starting
  31 +resolvers docker_resolver
  32 + nameserver dns 127.0.0.11:53
26 33
27 34 listen stats
28 35 bind *:9999
... ... @@ -39,8 +46,8 @@ listen mqtt-in
39 46 timeout server 3h
40 47 option tcplog
41 48 balance leastconn
42   - server tbMqtt1 tb-mqtt-transport1:1883 check
43   - server tbMqtt2 tb-mqtt-transport2:1883 check
  49 + server tbMqtt1 tb-mqtt-transport1:1883 check inter 5s resolvers docker_resolver resolve-prefer ipv4
  50 + server tbMqtt2 tb-mqtt-transport2:1883 check inter 5s resolvers docker_resolver resolve-prefer ipv4
44 51
45 52 frontend http-in
46 53 bind *:${HTTP_PORT}
... ... @@ -81,20 +88,20 @@ backend tb-web-backend
81 88 balance leastconn
82 89 option tcp-check
83 90 option log-health-checks
84   - server tbWeb1 tb-web-ui1:8080 check
85   - server tbWeb2 tb-web-ui2:8080 check
  91 + server tbWeb1 tb-web-ui1:8080 check inter 5s resolvers docker_resolver resolve-prefer ipv4
  92 + server tbWeb2 tb-web-ui2:8080 check inter 5s resolvers docker_resolver resolve-prefer ipv4
86 93 http-request set-header X-Forwarded-Port %[dst_port]
87 94
88 95 backend tb-http-backend
89 96 balance leastconn
90 97 option tcp-check
91 98 option log-health-checks
92   - server tbHttp1 tb-http-transport1:8081 check
93   - server tbHttp2 tb-http-transport2:8081 check
  99 + server tbHttp1 tb-http-transport1:8081 check inter 5s resolvers docker_resolver resolve-prefer ipv4
  100 + server tbHttp2 tb-http-transport2:8081 check inter 5s resolvers docker_resolver resolve-prefer ipv4
94 101
95 102 backend tb-api-backend
96 103 balance leastconn
97 104 option tcp-check
98 105 option log-health-checks
99   - server tbApi1 tb1:8080 check
100   - server tbApi2 tb2:8080 check
  106 + server tbApi1 tb1:8080 check inter 5s resolvers docker_resolver resolve-prefer ipv4
  107 + server tbApi2 tb2:8080 check inter 5s resolvers docker_resolver resolve-prefer ipv4
... ...