Merge pull request #5851 from ostcar/caddy

Use caddy

autoupdate

@@ -1 +1 @@
-Subproject commit 03d86865c063059878f4c3d616b6a6a9099b90d3
+Subproject commit 020bb29d9924ffb32c60e081e019acc2984ac42e

caddy/Caddyfile

@@ -0,0 +1,21 @@
+{
+    # Enable debug output
+    #debug
+}
+
+:8000
+
+reverse_proxy /system/* http://autoupdate:8002 {
+    flush_interval -1
+}
+
+@server {
+    path /apps/*
+    path /rest/*
+    path /server-version.txt
+}
+reverse_proxy @server server:8000
+
+reverse_proxy /media/* media:8000
+
+reverse_proxy client:4200

caddy/Dockerfile

@@ -0,0 +1,3 @@
+FROM caddy:2.3.0-alpine
+
+COPY Caddyfile /etc/caddy/

client/docker/nginx.conf

@@ -6,7 +6,7 @@ events {
 
 http {
     server {
-        listen 80;
+        listen 4200;
         server_name  localhost;
 
         root   /usr/share/nginx/html;

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"

docker/docker-compose.dev.yml

@@ -45,13 +45,11 @@ services:
   redis:
     image: redis:latest
 
-  haproxy:
-    image: os3-haproxy-dev
-    volumes:
-      - ../haproxy/src:/usr/local/etc/haproxy
+  caddy:
+    image: caddy:2.3.0-alpine
     depends_on:
       - client
       - server
       - autoupdate
     ports:
-      - "8000:8000"
+      - "8000:8000"

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

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