Build our own HAproxy docker image
The HAproxy docker image we were using is no longer maintained (hasn't been for years), but is built upon Alpine Linux which has a big security leak: https://talosintelligence.com/vulnerability_reports/TALOS-2019-0782 The security leak is fixed in this build of the docker image, but we should move to something else (lke Træfik).
This commit is contained in:
@@ -32,6 +32,7 @@ services:
|
|||||||
max-file: "20"
|
max-file: "20"
|
||||||
|
|
||||||
elastic:
|
elastic:
|
||||||
|
# This image is defined in blender-cloud/docker/elastic
|
||||||
image: armadillica/elasticsearch:6.1.1
|
image: armadillica/elasticsearch:6.1.1
|
||||||
container_name: elastic
|
container_name: elastic
|
||||||
restart: always
|
restart: always
|
||||||
@@ -62,6 +63,7 @@ services:
|
|||||||
max-file: "20"
|
max-file: "20"
|
||||||
|
|
||||||
kibana:
|
kibana:
|
||||||
|
# This image is defined in blender-cloud/docker/elastic
|
||||||
image: armadillica/kibana:6.1.1
|
image: armadillica/kibana:6.1.1
|
||||||
container_name: kibana
|
container_name: kibana
|
||||||
restart: always
|
restart: always
|
||||||
@@ -158,7 +160,8 @@ services:
|
|||||||
- /data/letsencrypt:/data/letsencrypt
|
- /data/letsencrypt:/data/letsencrypt
|
||||||
|
|
||||||
haproxy:
|
haproxy:
|
||||||
image: dockercloud/haproxy:1.5.3
|
# This image is defined in blender-cloud/docker/haproxy
|
||||||
|
image: armadillica/haproxy:1.6.7
|
||||||
container_name: haproxy
|
container_name: haproxy
|
||||||
restart: always
|
restart: always
|
||||||
ports:
|
ports:
|
||||||
|
5
docker/haproxy/Dockerfile
Normal file
5
docker/haproxy/Dockerfile
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
FROM dockercloud/haproxy:1.6.7
|
||||||
|
LABEL maintainer="Sybren A. Stüvel <sybren@blender.studio>"
|
||||||
|
|
||||||
|
# Fix https://talosintelligence.com/vulnerability_reports/TALOS-2019-0782
|
||||||
|
RUN sed 's/root::/root:!:/' -i /etc/shadow
|
10
docker/haproxy/build.sh
Executable file
10
docker/haproxy/build.sh
Executable file
@@ -0,0 +1,10 @@
|
|||||||
|
#!/bin/bash -e
|
||||||
|
|
||||||
|
# When updating this, also update the version in Dockerfile
|
||||||
|
VERSION=1.6.7
|
||||||
|
|
||||||
|
docker build -t armadillica/haproxy:${VERSION} .
|
||||||
|
docker tag armadillica/haproxy:${VERSION} armadillica/haproxy:latest
|
||||||
|
|
||||||
|
echo "Done, built armadillica/haproxy:${VERSION}"
|
||||||
|
echo "Also tagged as armadillica/haproxy:latest"
|
Reference in New Issue
Block a user