Merge pull request #5877 from FinnStutzenstein/fixCaddyDevSetup

fix Caddy dev setup

caddy/Dockerfile

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

caddy/Dockerfile.dev

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

caddy/Makefile

@@ -1,2 +1,2 @@
 build-dev:
-	docker build -t os3-proxy-dev -f Dockerfile .
+	docker build -t os3-proxy-dev -f Dockerfile.dev .

docker/build.sh

@@ -19,7 +19,7 @@ DOCKER_TAG="latest"
 CONFIG="/etc/osinstancectl"
 OPTIONS=()
 BUILT_IMAGES=()
-DEFAULT_TARGETS=(server client haproxy autoupdate)
+DEFAULT_TARGETS=(server client proxy autoupdate)
 
 usage() {
   cat << EOF

docker/docker-compose.dev.yml

@@ -46,7 +46,7 @@ services:
     image: redis:latest
 
   proxy:
-    image: caddy:2.3.0-alpine
+    image: os3-proxy-dev
     volumes:
       - ../caddy/Caddyfile.dev:/etc/caddy/Caddyfile
     depends_on: