Merge pull request #398 from manala/check_user_id

[Lazy] check if user id is 0 on linux
manala · Nov 14, 2023 · 8ddf4a0 · 8ddf4a0
2 parents 26f75b6 + f472c9f
commit 8ddf4a0
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/lazy.ansible/.manala/docker/docker.mk b/lazy.ansible/.manala/docker/docker.mk
@@ -42,11 +42,14 @@ MANALA_DOCKER_COMPOSE_BIN_DEFAULT = $(call manala_docker) compose
 
 MANALA_DOCKER_COMPOSE_BIN = $(MANALA_DOCKER_COMPOSE_BIN_DEFAULT)
 
+MANALA_HOST_USER_ID = $(shell id -u)
+MANALA_HOST_GROUP_ID = $(shell id -g)
+
 MANALA_DOCKER_COMPOSE_ENV = \
 	DOCKER_BUILDKIT=1 \
-	$(if $(MANALA_OS_LINUX), \
-		MANALA_USER_ID=$(shell id -u) \
-		MANALA_GROUP_ID=$(shell id -g) \
+	$(and $(MANALA_OS_LINUX), $(filter-out 0, $(MANALA_HOST_USER_ID)), \
+		MANALA_USER_ID=$(MANALA_HOST_USER_ID) \
+		MANALA_GROUP_ID=$(MANALA_HOST_GROUP_ID) \
 	)
 
 MANALA_DOCKER_COMPOSE_FILE = $(MANALA_DIR)/.manala/docker/compose.yaml

diff --git a/lazy.kubernetes/.manala/docker/docker.mk b/lazy.kubernetes/.manala/docker/docker.mk
@@ -42,11 +42,14 @@ MANALA_DOCKER_COMPOSE_BIN_DEFAULT = $(call manala_docker) compose
 
 MANALA_DOCKER_COMPOSE_BIN = $(MANALA_DOCKER_COMPOSE_BIN_DEFAULT)
 
+MANALA_HOST_USER_ID = $(shell id -u)
+MANALA_HOST_GROUP_ID = $(shell id -g)
+
 MANALA_DOCKER_COMPOSE_ENV = \
 	DOCKER_BUILDKIT=1 \
-	$(if $(MANALA_OS_LINUX), \
-		MANALA_USER_ID=$(shell id -u) \
-		MANALA_GROUP_ID=$(shell id -g) \
+	$(and $(MANALA_OS_LINUX), $(filter-out 0, $(MANALA_HOST_USER_ID)), \
+		MANALA_USER_ID=$(MANALA_HOST_USER_ID) \
+		MANALA_GROUP_ID=$(MANALA_HOST_GROUP_ID) \
 	)
 
 MANALA_DOCKER_COMPOSE_FILE = $(MANALA_DIR)/.manala/docker/compose.yaml

diff --git a/lazy.symfony/.manala/docker/docker.mk b/lazy.symfony/.manala/docker/docker.mk
@@ -42,11 +42,14 @@ MANALA_DOCKER_COMPOSE_BIN_DEFAULT = $(call manala_docker) compose
 
 MANALA_DOCKER_COMPOSE_BIN = $(MANALA_DOCKER_COMPOSE_BIN_DEFAULT)
 
+MANALA_HOST_USER_ID = $(shell id -u)
+MANALA_HOST_GROUP_ID = $(shell id -g)
+
 MANALA_DOCKER_COMPOSE_ENV = \
 	DOCKER_BUILDKIT=1 \
-	$(if $(MANALA_OS_LINUX), \
-		MANALA_USER_ID=$(shell id -u) \
-		MANALA_GROUP_ID=$(shell id -g) \
+	$(and $(MANALA_OS_LINUX), $(filter-out 0, $(MANALA_HOST_USER_ID)), \
+		MANALA_USER_ID=$(MANALA_HOST_USER_ID) \
+		MANALA_GROUP_ID=$(MANALA_HOST_GROUP_ID) \
 	)
 
 MANALA_DOCKER_COMPOSE_FILE = $(MANALA_DIR)/.manala/docker/compose.yaml