last-changes

soofiane262 · Jan 10, 2023 · ddffa9e · ddffa9e
1 parent d3f2458
commit ddffa9e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -6,7 +6,7 @@
 #    By: sel-mars <sel-mars@student.42.fr>          +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2022/12/15 18:48:40 by sel-mars          #+#    #+#              #
-#    Updated: 2023/01/10 12:29:22 by sel-mars         ###   ########.fr        #
+#    Updated: 2023/01/10 12:44:26 by sel-mars         ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -16,7 +16,7 @@ CMPS_CMD		=	docker compose
 
 CMPS_FILE		=	srcs/docker-compose.yml
 
-VOLUMES_ROOT	=	/home/sel-mars/data/inception-volumes
+VOLUMES_ROOT	=	/home/sel-mars/data/
 
 VOLUMES			=	$(VOLUMES_ROOT)/web $(VOLUMES_ROOT)/mariadb $(VOLUMES_ROOT)/influxdb
 
@@ -44,8 +44,8 @@ voldown:
 	@$(COMPOSE) down --volumes
 
 fclean: voldown
-	@rm -rf $(VOLUMES_ROOT)
+	@rm -rf $(VOLUMES)
 
-re: fclean all
+re: fclean $(NAME)
 
 .PHONY: all volumes build ps up down voldown fclean re
diff --git a/srcs/docker-compose.yml b/srcs/docker-compose.yml
@@ -144,14 +144,14 @@ volumes:
     driver_opts:
       type: "none"
       o: bind
-      device: "/home/sel-mars/data/inception-volumes/web"
+      device: "/home/sel-mars/data/web"
   mariadb:
     driver_opts:
       type: "none"
       o: bind
-      device: "/home/sel-mars/data/inception-volumes/mariadb"
+      device: "/home/sel-mars/data/mariadb"
   influxdb:
     driver_opts:
       type: "none"
       o: bind
-      device: "/home/sel-mars/data/inception-volumes/influxdb"
+      device: "/home/sel-mars/data/influxdb"