From 0995cba88c1eb0ec665a8ff76142f9a8170f55d5 Mon Sep 17 00:00:00 2001
From: Timo De Meyst <timodemeyst@outlook.com>
Date: Fri, 7 Mar 2025 17:19:30 +0100
Subject: [PATCH] chore: update docker layout

Dockerfiles in root gezet zodat ze ook aan bestanden daarin kunnen
---
 backend/.dockerignore => .dockerignore     | 0
 backend/Dockerfile => backend.Dockerfile   | 4 ++--
 docker-compose.yml                         | 6 ++++--
 frontend/Dockerfile => frontend.Dockerfile | 4 ++--
 frontend/.dockerignore                     | 7 -------
 5 files changed, 8 insertions(+), 13 deletions(-)
 rename backend/.dockerignore => .dockerignore (100%)
 rename backend/Dockerfile => backend.Dockerfile (62%)
 rename frontend/Dockerfile => frontend.Dockerfile (82%)
 delete mode 100644 frontend/.dockerignore

diff --git a/backend/.dockerignore b/.dockerignore
similarity index 100%
rename from backend/.dockerignore
rename to .dockerignore
diff --git a/backend/Dockerfile b/backend.Dockerfile
similarity index 62%
rename from backend/Dockerfile
rename to backend.Dockerfile
index 708b7520..c8a595fe 100644
--- a/backend/Dockerfile
+++ b/backend.Dockerfile
@@ -2,11 +2,11 @@ FROM node:22
 
 WORKDIR /app
 
-COPY ./package*.json ./
+COPY ./backend/package*.json ./
 
 RUN npm install
 
-COPY . .
+COPY ./backend .
 
 EXPOSE 2002
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 1a4daac0..673b3d4d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,13 +1,15 @@
 services:
     web:
-        build: ./frontend
+        build:
+            dockerfile: ./frontend.Dockerfile
         depends_on:
             - api
         ports:
             - '443:443'
             - '80:80'
     api:
-        build: ./backend
+        build:
+            dockerfile: ./backend.Dockerfile
         ports:
             - '2002:2002'
     db:
diff --git a/frontend/Dockerfile b/frontend.Dockerfile
similarity index 82%
rename from frontend/Dockerfile
rename to frontend.Dockerfile
index b8e60e06..40cb0d4a 100644
--- a/frontend/Dockerfile
+++ b/frontend.Dockerfile
@@ -1,9 +1,9 @@
 # build stage
 FROM node:22 as build-stage
 WORKDIR /app
-COPY package*.json ./
+COPY ./frontend/package*.json ./
 RUN npm install
-COPY . .
+COPY ./frontend .
 RUN npm run build
 
 # production stage
diff --git a/frontend/.dockerignore b/frontend/.dockerignore
deleted file mode 100644
index 5fbca23a..00000000
--- a/frontend/.dockerignore
+++ /dev/null
@@ -1,7 +0,0 @@
-**/node_modules/
-**/dist
-.git
-npm-debug.log
-.coverage
-.coverage.*
-.env
\ No newline at end of file