Added UID & GID evaluation in make

SloCompTech · SloCompTech · commit d612f5407860 · 2019-03-24T17:56:29.000+01:00
diff --git a/Makefile b/Makefile
@@ -29,15 +29,15 @@ build:
 config:
 	@echo "Running temporary container"
 	mkdir -p data
-	docker run -it --rm --cap-add NET_ADMIN -v ${DATA_DIR}:/config ${IMAGE_NAME}:latest bash
+	docker run -it -e PUID=$(id -u) -e PGID=$(id -g) --rm --cap-add NET_ADMIN -v ${DATA_DIR}:/config ${IMAGE_NAME}:latest bash
 
 #
 #	Setups & starts real container
 #	Run only once, then use docker start|stop|restart|exec
 #
 setup:
 	@echo "Running temporary container"
-	docker run -it --cap-add NET_ADMIN -p 1194:1194/udp -v ${DATA_DIR}:/config --name ${CONTAINER_NAME} ${IMAGE_NAME}:latest 
+	docker run -it -d -e PUID=$(id -u) -e PGID=$(id -g) --cap-add NET_ADMIN -p 1194:1194/udp -v ${DATA_DIR}:/config --name ${CONTAINER_NAME} ${IMAGE_NAME}:latest 
 
 #
 #	Starts container

Original file line number	Diff line number	Diff line change
`@@ -29,15 +29,15 @@ build:`
`29`	`29`	`config:`
`30`	`30`	`@echo "Running temporary container"`
`31`	`31`	`mkdir -p data`
`32`		`- docker run -it --rm --cap-add NET_ADMIN -v ${DATA_DIR}:/config ${IMAGE_NAME}:latest bash`
	`32`	`+ docker run -it -e PUID=$(id -u) -e PGID=$(id -g) --rm --cap-add NET_ADMIN -v ${DATA_DIR}:/config ${IMAGE_NAME}:latest bash`
`33`	`33`
`34`	`34`	`#`
`35`	`35`	`# Setups & starts real container`
`36`	`36`	`# Run only once, then use docker start\|stop\|restart\|exec`
`37`	`37`	`#`
`38`	`38`	`setup:`
`39`	`39`	`@echo "Running temporary container"`
`40`		`- docker run -it --cap-add NET_ADMIN -p 1194:1194/udp -v ${DATA_DIR}:/config --name ${CONTAINER_NAME} ${IMAGE_NAME}:latest`
	`40`	`+ docker run -it -d -e PUID=$(id -u) -e PGID=$(id -g) --cap-add NET_ADMIN -p 1194:1194/udp -v ${DATA_DIR}:/config --name ${CONTAINER_NAME} ${IMAGE_NAME}:latest`
`41`	`41`
`42`	`42`	`#`
`43`	`43`	`# Starts container`