From cfe3058baeea47365314ee7c1963936a750ac290 Mon Sep 17 00:00:00 2001
From: Hubert Van De Walle <hubv@protonmail.com>
Date: Thu, 7 May 2020 18:35:26 +0200
Subject: [PATCH] Move Dockerfiles

---
 caddy/Caddyfile => Caddyfile         | 0
 api/Dockerfile => Dockerfile.api     | 8 ++++----
 caddy/Dockerfile => Dockerfile.caddy | 2 +-
 docker-compose.prod.yml              | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename caddy/Caddyfile => Caddyfile (100%)
 rename api/Dockerfile => Dockerfile.api (88%)
 rename caddy/Dockerfile => Dockerfile.caddy (90%)

diff --git a/caddy/Caddyfile b/Caddyfile
similarity index 100%
rename from caddy/Caddyfile
rename to Caddyfile
diff --git a/api/Dockerfile b/Dockerfile.api
similarity index 88%
rename from api/Dockerfile
rename to Dockerfile.api
index 8903a01..539f7ef 100644
--- a/api/Dockerfile
+++ b/Dockerfile.api
@@ -3,12 +3,12 @@ FROM maven:3.6.3-jdk-13 as builder
 WORKDIR /tmp
 
 # Cache dependencies
-COPY pom.xml .
+COPY api/pom.xml .
 RUN mvn verify clean --fail-never
 
-COPY resources resources
-COPY src src
-COPY test test
+COPY api/resources resources
+COPY api/src src
+COPY api/test test
 
 RUN mvn package
 
diff --git a/caddy/Dockerfile b/Dockerfile.caddy
similarity index 90%
rename from caddy/Dockerfile
rename to Dockerfile.caddy
index 7dbe735..9b362e8 100644
--- a/caddy/Dockerfile
+++ b/Dockerfile.caddy
@@ -14,6 +14,6 @@ RUN yarn install && yarn run generate
 
 ## Main image
 FROM caddy:2.0.0
-COPY caddy/Caddyfile /etc/caddy/Caddyfile
+COPY Caddyfile /etc/caddy/Caddyfile
 COPY --from=docbuilder /out /docs
 COPY --from=builder /app/dist /site
\ No newline at end of file
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index ecb78ac..3368009 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -4,8 +4,7 @@ services:
 
     caddy:
         build:
-            context: .
-            dockerfile: ./caddy/Dockerfile
+            dockerfile: Dockerfile.caddy
         container_name: notes-caddy
         environment:
             - TZ=Europe/Brussels
@@ -19,7 +18,8 @@ services:
             - 443:443
 
     api:
-        build: ./api
+        build:
+            dockerfile: Dockerfile.api
         container_name: notes-api
         env_file:
             - .env