fix the new makefile on macos

dbt-labs · Sep 17, 2020 · b72fc3c · b72fc3c
1 parent 22c4d8f
commit b72fc3c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -24,8 +24,13 @@ test-quick: .env
 # This rule creates a file named .env that is used by docker-compose for passing
 # the USER_ID and GROUP_ID arguments to the Docker image.
 .env:
+	@touch .env
+ifneq ($(OS),Windows_NT)
+ifneq ($(shell uname -s), Darwin)
 	@echo USER_ID=$(shell id -u) > .env
 	@echo GROUP_ID=$(shell id -g) >> .env
+endif
+endif
 	@time docker-compose build
 
 clean:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -16,8 +16,8 @@ services:
       dockerfile: Dockerfile
       args:
         # Run `make .env` to set $USER_ID and $GROUP_ID
-        USER_ID: ${USER_ID}
-        GROUP_ID: ${GROUP_ID}
+        USER_ID: ${USER_ID:-}
+        GROUP_ID: ${GROUP_ID:-}
     command: "/root/.virtualenvs/dbt/bin/pytest"
     env_file:
       - ./test.env