commit 9097549c3576796aeed491eb9aeae77110ba5a6a
author Luca Milanesio <luca.milanesio@gmail.com> Tue Nov 02 20:26:59 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 02 20:26:59 2021 +0000
tree 31debcf26d6f8a4dea106b5b704b2b6db2243a6e
parent 2ae2a6361f789c2a9378daf43f1a9cfe6a694ec5
parent f5b0dfc56c725a6fdc6beba9c92500ace4708b00

Merge "Pin haproxy to 1.8.30-buster and fix associated issues" into stable-3.3

src/test/docker/docker-compose.yaml

diff --git a/src/test/docker/docker-compose.yaml b/src/test/docker/docker-compose.yaml
index 647aa6d..1365cd8 100644
--- a/src/test/docker/docker-compose.yaml
+++ b/src/test/docker/docker-compose.yaml
@@ -47,6 +47,7 @@
     volumes:
       - syslog-sidecar
     depends_on:
+      - syslog-sidecar
       - gerrit-01
       - gerrit-02
 

src/test/docker/haproxy/Dockerfile

diff --git a/src/test/docker/haproxy/Dockerfile b/src/test/docker/haproxy/Dockerfile
index 72cad4a..eb5920a 100644
--- a/src/test/docker/haproxy/Dockerfile
+++ b/src/test/docker/haproxy/Dockerfile
@@ -1,8 +1,5 @@
-FROM haproxy:1.8
+FROM haproxy:1.8.30-buster
+
+RUN mkdir -p /var/run/haproxy && chown -R haproxy: /var/run/haproxy
 
 COPY haproxy.cfg /usr/local/etc/haproxy/haproxy.cfg
-
-RUN mkdir /var/lib/haproxy && \
-    mkdir /var/run/haproxy && \
-    useradd haproxy && \
-    chown haproxy: /var/lib/haproxy /var/run/haproxy