From f7d228a600a49d5d5c4ea633d3b4bf54bc157861 Mon Sep 17 00:00:00 2001 From: Gernot Schulz Date: Fri, 5 Feb 2021 17:27:54 +0100 Subject: [PATCH] Docker: Update build scripts for Caddy For now, keep using HAProxy's name in most places, e.g., DOCKER_OPENSLIDES_HAPROXY_NAME. To avoid confusion, the specific mentions of HAProxy should be made more generic, e.g., DOCKER_OPENSLIDES_PROXY_NAME. --- docker/build.sh | 2 +- docker/docker-compose.yml.m4 | 2 +- docker/docker-stack.yml.m4 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/build.sh b/docker/build.sh index 7e7771b23..16cdff8d6 100755 --- a/docker/build.sh +++ b/docker/build.sh @@ -6,7 +6,7 @@ declare -A TARGETS TARGETS=( [client]="$(dirname "${BASH_SOURCE[0]}")/../client/docker/" [server]="$(dirname "${BASH_SOURCE[0]}")/../server/docker/" - [haproxy]="$(dirname "${BASH_SOURCE[0]}")/../haproxy/" + [caddy]="$(dirname "${BASH_SOURCE[0]}")/../caddy/" [autoupdate]="$(dirname "${BASH_SOURCE[0]}")/../autoupdate/" [media]="https://github.com/OpenSlides/openslides-media-service.git" [pgbouncer]="https://github.com/OpenSlides/openslides-docker-compose.git#:pgbouncer" diff --git a/docker/docker-compose.yml.m4 b/docker/docker-compose.yml.m4 index 1a9d1cd1c..847b161f7 100644 --- a/docker/docker-compose.yml.m4 +++ b/docker/docker-compose.yml.m4 @@ -15,7 +15,7 @@ define(`ifenvelse', `ifelse(read_env(`$1'),, `$2', read_env(`$1'))') define(`HAPROXY_IMAGE', ifenvelse(`DEFAULT_DOCKER_REGISTRY', openslides)/dnl -ifenvelse(`DOCKER_OPENSLIDES_HAPROXY_NAME', openslides-haproxy):dnl +ifenvelse(`DOCKER_OPENSLIDES_HAPROXY_NAME', openslides-caddy):dnl ifenvelse(`DOCKER_OPENSLIDES_HAPROXY_TAG', latest)) define(`BACKEND_IMAGE', ifenvelse(`DEFAULT_DOCKER_REGISTRY', openslides)/dnl diff --git a/docker/docker-stack.yml.m4 b/docker/docker-stack.yml.m4 index 0d83990cb..af8eb6beb 100644 --- a/docker/docker-stack.yml.m4 +++ b/docker/docker-stack.yml.m4 @@ -15,7 +15,7 @@ define(`ifenvelse', `ifelse(read_env(`$1'),, `$2', read_env(`$1'))') define(`HAPROXY_IMAGE', ifenvelse(`DEFAULT_DOCKER_REGISTRY', openslides)/dnl -ifenvelse(`DOCKER_OPENSLIDES_HAPROXY_NAME', openslides-haproxy):dnl +ifenvelse(`DOCKER_OPENSLIDES_HAPROXY_NAME', openslides-caddy):dnl ifenvelse(`DOCKER_OPENSLIDES_HAPROXY_TAG', latest)) define(`BACKEND_IMAGE', ifenvelse(`DEFAULT_DOCKER_REGISTRY', openslides)/dnl