From dc17b3b9cfe0dfaf64110acd245fbb1f022a697e Mon Sep 17 00:00:00 2001 From: Danny Houtworm Date: Sun, 25 Jun 2023 05:03:46 +0000 Subject: [PATCH] bla --- Makefile | 15 +++------------ srcs/docker-compose.yml | 4 ++-- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 23e67f7..848bed5 100644 --- a/Makefile +++ b/Makefile @@ -5,21 +5,12 @@ build: mkdir ./build up: build - sudo docker-compose -f ./srcs/mariadb/docker-compose.yml up -d - sudo docker-compose -f ./srcs/wordpress/docker-compose.yml up -d - sudo docker-compose -f ./srcs/nginx/docker-compose.yml up -d - sudo docker-compose -f ./srcs/redis/docker-compose.yml up -d - sudo docker-compose -f ./srcs/ftp/docker-compose.yml up -d - sudo docker-compose -f ./srcs/adminer/docker-compose.yml up -d + sudo docker-compose -f ./srcs/docker-compose.yml up -d down: - sudo docker-compose -f ./srcs/mariadb/docker-compose.yml down - sudo docker-compose -f ./srcs/wordpress/docker-compose.yml down - sudo docker-compose -f ./srcs/nginx/docker-compose.yml down - sudo docker-compose -f ./srcs/redis/docker-compose.yml down - sudo docker-compose -f ./srcs/ftp/docker-compose.yml down - sudo docker-compose -f ./srcs/adminer/docker-compose.yml down + sudo docker-compose -f ./srcs/docker-compose.yml down clean: down sudo docker network rm wordpress + sudo docker system prune rm -rf ./data ./build diff --git a/srcs/docker-compose.yml b/srcs/docker-compose.yml index 0831c84..f0796a8 100644 --- a/srcs/docker-compose.yml +++ b/srcs/docker-compose.yml @@ -2,7 +2,7 @@ version: '3' services: nginx: - image: ./srcs/requirements/nginx/Dockerfile + build: ./srcs/requirements/nginx container_name: nginx restart: always volumes: @@ -15,7 +15,7 @@ services: - 80:80 - 443:443 mariadb: - image: ./srcs/requirements/mariadb/Dockerfile + build: ./srcs/requirements/mariadb container_name: mariadb restart: always volumes: