From 4e30f64f2607c568513df65a3ef3c2a5c8ca236b Mon Sep 17 00:00:00 2001 From: nicolas-arnaud Date: Thu, 23 Mar 2023 19:31:22 +0100 Subject: [PATCH] finished to cleanup makefiles and docker-compose.yml --- Makefile | 12 +++--------- Makesudo | 15 +++------------ docker-compose.yml | 4 ---- 3 files changed, 6 insertions(+), 25 deletions(-) diff --git a/Makefile b/Makefile index 7d65c9e..c11c236 100644 --- a/Makefile +++ b/Makefile @@ -6,14 +6,6 @@ all: clean dev dev: docker-compose up --build -check: - NODE_ENV="check" docker-compose run back --build - NODE_ENV="check" docker-compose run front --build - docker-compose down - -debug: - NODE_ENV="debug" BUILDKIT_PROGRESS=plain docker-compose up --build - stop: docker-compose down @@ -21,9 +13,11 @@ clean: stop docker system prune -f fclean: stop + rm -rf postgres + rm -rf back/volumes/avatars rm -rf */node_modules docker system prune -af --volumes re: fclean dev -.PHONY: all dev check debug stop clean fclean re +.PHONY: all dev stop clean fclean re diff --git a/Makesudo b/Makesudo index 98cb570..64d041a 100644 --- a/Makesudo +++ b/Makesudo @@ -3,20 +3,9 @@ USER = gavaniwast all: clean dev -prod: - sudo docker-compose up --build - dev: sudo docker-compose up --build -check: - sudo NODE_ENV="check" docker-compose run back --build - sudo NODE_ENV="check" docker-compose run front --build - sudo docker compose -f docker-compose.yml down - -debug: - sudo NODE_ENV="debug" BUILDKIT_PROGRESS=plain docker-compose up --build - stop: sudo docker-compose down @@ -24,9 +13,11 @@ clean: stop sudo docker system prune -f fclean: stop + sudo rm -rf postgres + sudo rm -rf back/avatars sudo rm -rf */node_modules sudo docker system prune -af --volumes re: fclean dev -.PHONY: all prod dev check debug stop clean fclean re +.PHONY: all dev stop clean fclean re diff --git a/docker-compose.yml b/docker-compose.yml index 1570343..49fa6eb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,8 +10,6 @@ services: context: ./ dockerfile: front.dockerfile env_file: .env - environment: - - NODE_ENV=${NODE_ENV} depends_on: [postgres, back] ports: [80:80] volumes: [./front:/var/www/html] @@ -23,8 +21,6 @@ services: context: ./ dockerfile: back.dockerfile env_file: .env - environment: - - NODE_ENV=${NODE_ENV} depends_on: [postgres] ports: [3001:3001] networks: [transcendence]