Skip to content

Commit 84d07e3

Browse files
committed
Calculate compose project name instead of hardcoding it
1 parent ddeeb83 commit 84d07e3

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

Makefile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
<<<<<<< HEAD
2+
=======
3+
BINDIR = $(PWD)/.state/env/bin
4+
COMPOSE_PROJECT_NAME ?= $(notdir $(abspath .))
5+
GITHUB_ACTIONS := $(shell echo "$${GITHUB_ACTIONS:-false}")
6+
GITHUB_BASE_REF := $(shell echo "$${GITHUB_BASE_REF:-false}")
7+
>>>>>>> e1349bda (Calculate compose project name instead of hardcoding it)
18
DB := example
29
IPYTHON := no
310

@@ -84,7 +91,7 @@ requirements/%.txt: requirements/%.in
8491

8592
resetdb: .state/docker-build-web
8693
docker-compose stop db
87-
docker volume rm warehouse_pgdata
94+
docker volume rm $(COMPOSE_PROJECT_NAME)_pgdata
8895
docker-compose up -d --recreate db
8996

9097
migrate: .state/docker-build-web

0 commit comments

Comments
 (0)