From f65e8ae819c7d0c250e3ba6fca21585051a44590 Mon Sep 17 00:00:00 2001
From: Finn Stutzenstein <finn.stutzenstein@hotmail.de>
Date: Wed, 10 Feb 2021 07:30:36 +0100
Subject: [PATCH] fix Caddy dev setup

---
 caddy/Dockerfile              | 2 +-
 caddy/Dockerfile.dev          | 3 +++
 caddy/Makefile                | 2 +-
 docker/build.sh               | 2 +-
 docker/docker-compose.dev.yml | 2 +-
 5 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 caddy/Dockerfile.dev

diff --git a/caddy/Dockerfile b/caddy/Dockerfile
index 618b1aabb..94bf8cfa0 100644
--- a/caddy/Dockerfile
+++ b/caddy/Dockerfile
@@ -1,3 +1,3 @@
 FROM caddy:2.3.0-alpine
 
-COPY Caddyfile /etc/caddy/
+COPY Caddyfile /etc/caddy/Caddyfile
diff --git a/caddy/Dockerfile.dev b/caddy/Dockerfile.dev
new file mode 100644
index 000000000..1b15fdb1e
--- /dev/null
+++ b/caddy/Dockerfile.dev
@@ -0,0 +1,3 @@
+FROM caddy:2.3.0-alpine
+
+COPY Caddyfile.dev /etc/caddy/Caddyfile
diff --git a/caddy/Makefile b/caddy/Makefile
index 88f73f74a..50e9e6685 100644
--- a/caddy/Makefile
+++ b/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 .
diff --git a/docker/build.sh b/docker/build.sh
index 7ed942a01..fcea480e6 100755
--- a/docker/build.sh
+++ b/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
diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml
index 574e99bd3..6acd282b4 100644
--- a/docker/docker-compose.dev.yml
+++ b/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: