From 401cdfb6c50fbed95ec785ba9e9ff3a89d833532 Mon Sep 17 00:00:00 2001
From: Willem Haffmans <info@willemhaffmans.nl>
Date: Thu, 22 May 2025 10:50:43 +0200
Subject: [PATCH] makefile aanpassingen en restart opties

---
 Makefile                | 17 ++++++++---------
 srcs/docker-compose.yml |  9 ++++++---
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index 7c2458d..52bea95 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@
 #    By: whaffman <whaffman@student.codam.nl>         +#+                      #
 #                                                    +#+                       #
 #    Created: 2025/05/12 15:33:56 by whaffman      #+#    #+#                  #
-#    Updated: 2025/05/22 10:06:24 by whaffman      ########   odam.nl          #
+#    Updated: 2025/05/22 10:25:47 by whaffman      ########   odam.nl          #
 #                                                                              #
 # **************************************************************************** #
 
@@ -52,7 +52,14 @@ down:
 clean:
 	@echo "$(gub)Cleaning up Docker containers...$(reset)"
 	$(DC) down --rmi local --volumes --remove-orphans
+	@echo "$(gub)Removing data directories...$(reset)"
 	@rm -rf $(DATA_DIR)
+	@echo "$(gub)Removing Docker networks...$(reset)"
+	@docker network prune -f
+	@echo "$(gub)Removing Docker volumes...$(reset)"
+	@docker volume prune -f
+	@echo "$(gub)Removing Docker images...$(reset)"
+	@docker rmi -f $(shell docker images -q)
 
 	
 
@@ -72,14 +79,6 @@ ps:
 	@echo "$(gub)Displaying all containers...$(reset)"
 	@docker ps -a
 
-
-remove:
-	@echo "$(gub)Removing Docker containers...$(reset)"
-	@$(DC) rm -f
-	@docker volume rm -f 
-	@$(DC) network rm -f
-
-
 # Colors
 
 green:=$(shell tput setaf 2)
diff --git a/srcs/docker-compose.yml b/srcs/docker-compose.yml
index 6d6cbce..1348ea2 100644
--- a/srcs/docker-compose.yml
+++ b/srcs/docker-compose.yml
@@ -1,6 +1,7 @@
 services:
   mariadb:
     container_name: mariadb
+    image: mariadb
     build:
       context: ./requirements/mariadb
       dockerfile: Dockerfile
@@ -13,10 +14,11 @@ services:
       - docker-network
     volumes:
       - data_mariadb:/var/lib/mysql
-    restart: always
+    restart: unless-stopped
 
   nginx:
     container_name: nginx
+    image: nginx
     build:
       context: ./requirements/nginx
       dockerfile: Dockerfile
@@ -32,10 +34,11 @@ services:
       - docker-network
     volumes:
       - data_wordpress:/var/www/html
-    restart: always
+    restart: unless-stopped
 
   wordpress:
     container_name: wordpress
+    image: wordpress
     build:
       context: ./requirements/wordpress
       dockerfile: Dockerfile
@@ -66,7 +69,7 @@ services:
       - docker-network
     volumes:
       - data_wordpress:/var/www/html
-    restart: always
+    restart: unless-stopped
 
 
 networks: