From fe375c12e2c50474ecafba948edecbf1d8af119e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sim=C3=B3=20Albert=20i=20Beltran?= Date: Thu, 27 Jan 2022 12:48:29 +0100 Subject: [PATCH] Default haproxy docker image version --- docker-compose-parts/haproxy-behind.yml | 2 +- docker-compose-parts/haproxy.yml | 2 +- main.conf.example | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose-parts/haproxy-behind.yml b/docker-compose-parts/haproxy-behind.yml index c12d827..38e126b 100644 --- a/docker-compose-parts/haproxy-behind.yml +++ b/docker-compose-parts/haproxy-behind.yml @@ -4,7 +4,7 @@ services: isard-sso-haproxy: build: args: - HAPROXY_IMG: + HAPROXY_IMG: ${HAPROXY_IMG-haproxy:2.4.12-alpine3.15} context: ${BUILD_ROOT_PATH}/docker/haproxy dockerfile: Dockerfile-behind target: production diff --git a/docker-compose-parts/haproxy.yml b/docker-compose-parts/haproxy.yml index 55e1e61..9a31c90 100644 --- a/docker-compose-parts/haproxy.yml +++ b/docker-compose-parts/haproxy.yml @@ -4,7 +4,7 @@ services: isard-sso-haproxy: build: args: - HAPROXY_IMG: + HAPROXY_IMG: ${HAPROXY_IMG-haproxy:2.4.12-alpine3.15} context: ${BUILD_ROOT_PATH}/docker/haproxy dockerfile: Dockerfile target: production diff --git a/main.conf.example b/main.conf.example index 1a489c1..e202add 100644 --- a/main.conf.example +++ b/main.conf.example @@ -41,4 +41,4 @@ POSTGRES_USER=admin ## DOCKER IMAGES #NGINX_ALPINE_IMG=nginx:1.21.6-alpine #POSTGRES_BACKUP_LOCAL_IMG=prodrigestivill/postgres-backup-local:14-debian-2aa03d1 -HAPROXY_IMG=haproxy:2.4.12-alpine3.15 +#HAPROXY_IMG=haproxy:2.4.12-alpine3.15