From be814a9e2e59dd44f7def89a2d69909e8e4bbe79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sim=C3=B3=20Albert=20i=20Beltran?= Date: Wed, 26 Jan 2022 17:49:57 +0100 Subject: [PATCH] Fix haproxy docker image version --- docker-compose-parts/haproxy.yml | 2 ++ docker/haproxy/Dockerfile | 3 ++- main.conf.example | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/docker-compose-parts/haproxy.yml b/docker-compose-parts/haproxy.yml index c05bda3..55e1e61 100644 --- a/docker-compose-parts/haproxy.yml +++ b/docker-compose-parts/haproxy.yml @@ -3,6 +3,8 @@ version: '3.7' services: isard-sso-haproxy: build: + args: + HAPROXY_IMG: context: ${BUILD_ROOT_PATH}/docker/haproxy dockerfile: Dockerfile target: production diff --git a/docker/haproxy/Dockerfile b/docker/haproxy/Dockerfile index 04b8940..cc0462a 100644 --- a/docker/haproxy/Dockerfile +++ b/docker/haproxy/Dockerfile @@ -1,4 +1,5 @@ -FROM haproxy:lts-alpine3.15 as production +ARG HAPROXY_IMG +FROM $HAPROXY_IMG as production USER root RUN apk add openssl certbot py-pip diff --git a/main.conf.example b/main.conf.example index 536be1f..cb5285a 100644 --- a/main.conf.example +++ b/main.conf.example @@ -41,3 +41,4 @@ POSTGRES_USER=admin ## DOCKER IMAGES NGINX_ALPINE_IMG=nginx:1.21.6-alpine POSTGRES_BACKUP_LOCAL_IMG=14-debian-2aa03d1 +HAPROXY_IMG=haproxy:2.4.12-alpine3.15