makefile added down rule

+ makefile change back to user instead of home
This commit is contained in:
hulamy
2022-09-26 16:38:19 +02:00
parent 67c0bd1a40
commit a7ba45c4ad
3 changed files with 15 additions and 8 deletions

View File

@@ -29,10 +29,9 @@ COMPOSE = ./srcs/docker-compose.yml
#V_USER = $(shell echo $(USER)) # gives root when make is run with sudo
#V_USER = $(shell who | head -1 | tr " " "\n" | head -1) # gives bad result when in `sudo su`
#V_USER = $(shell who | head -1 | cut -d " " -f 1) # gives bad result when in `sudo su`
#V_USER = $(shell users | tr " " "\n" | head -1)
V_HOME = $(HOME)
VOLUMES_D = $(V_HOME)/data/wp_volume \
$(V_HOME)/data/db_volume
V_USER = $(shell users | tr " " "\n" | head -1)
VOLUMES_D = /home/$(V_USER)/data/wp_volume \
/home/$(V_USER)/data/db_volume
# list of running containers, see : https://stackoverflow.com/questions/10024279/how-to-use-shell-commands-in-makefile
RUNNING = $(shell docker ps -q)
@@ -45,6 +44,7 @@ VOLUMES = $(shell docker volume ls -q)
all: build up
volumes:
sed -i "s/^LOGIN=.*/LOGIN=$(V_USER)/g" ./srcs/.env
mkdir -p $(VOLUMES_D)
build:
@@ -53,6 +53,9 @@ build:
up: volumes
docker-compose -f $(COMPOSE) up -d
down:
docker-compose -f $(COMPOSE) down
# list images, containers, volumes
list:
@echo $(B_YELLOW)"\nimages:"$(RESET)