some adjustments after testing in production (#21)

Signed-off-by: Alexander Piskun <[email protected]>

Dockerfile

@@ -5,10 +5,10 @@ USER root
 ENV HAPROXY_PORT 2375
 ENV BIND_ADDRESS *
 ENV EX_APPS_NET "localhost"
-ENV EX_APPS_COUNT 50
+ENV EX_APPS_COUNT 30
 ENV TIMEOUT_CONNECT "10s"
 ENV TIMEOUT_CLIENT  "30s"
-ENV TIMEOUT_SERVER  "30s"
+ENV TIMEOUT_SERVER  "1800s"
 
 RUN set -ex; \
     apk add --no-cache \
@@ -18,7 +18,8 @@ RUN set -ex; \
         curl \
         openssl \
         bind-tools \
-        nano; \
+        nano \
+        vim; \
     chmod -R 777 /tmp
 
 COPY --chmod=775 *.sh /
@@ -28,3 +29,4 @@ COPY --chmod=664 haproxy_ex_apps.cfg /haproxy_ex_apps.cfg
 WORKDIR /
 ENTRYPOINT ["/bin/bash", "start.sh"]
 HEALTHCHECK --interval=10s --timeout=10s --retries=9 CMD /healthcheck.sh
+LABEL com.centurylinklabs.watchtower.enable="false"

haproxy.cfg

@@ -41,6 +41,8 @@ frontend docker_engine
     http-request allow if { path,url_dec -m reg -i ^(/v[\d\.]+)?/_ping } METH_GET
     # container inspect: GET containers/%s/json
     http-request allow if { path,url_dec -m reg -i ^(/v[\d\.]+)?/containers/nc_app_[a-zA-Z0-9_.-]+/json } METH_GET
+    # container inspect: GET containers/%s/logs
+    http-request allow if { path,url_dec -m reg -i ^(/v[\d\.]+)?/containers/nc_app_[a-zA-Z0-9_.-]+/logs } METH_GET
     # container start/stop: POST containers/%s/start containers/%s/stop
     http-request allow if { path,url_dec -m reg -i ^(/v[\d\.]+)?/containers/nc_app_[a-zA-Z0-9_.-]+/((start)|(stop)) } METH_POST
     # container rm: DELETE containers/%s

start.sh

@@ -26,3 +26,5 @@ else
   cat /haproxy.cfg
   haproxy -f /haproxy.cfg -db
 fi
+echo "HaProxy quit unexpectedly"
+exit 1