On Linux, explicitly setting the uid:gid pair for docker-compose.over…

…ride.yml
banzaicloud · Jan 4, 2019 · 52a7848 · 52a7848
1 parent 0758c06
commit 52a7848
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 14 deletions.
diff --git a/Makefile b/Makefile
@@ -38,7 +38,7 @@ up: vendor start config/config.toml ## Set up the development environment
 
 .PHONY: down
 down: clean ## Destroy the development environment
-	uid=$(shell id -u) gid=$(shell id -g) docker-compose down
+	docker-compose down
 	@ if [[ "$$OSTYPE" == "linux-gnu" ]]; then sudo rm -rf .docker/; else rm -rf .docker/; fi
 
 .PHONY: reset
@@ -50,10 +50,10 @@ clean: ## Clean the working area and the project
 	rm -rf pipeline
 
 docker-compose.override.yml: ## Create docker compose override file
-	cp docker-compose.override.yml.dist docker-compose.override.yml
+	@ if [[ "$$OSTYPE" == "linux-gnu" ]]; then cat docker-compose.override.yml.dist | sed -e 's/# user: "$${uid}:$${gid}"/user: "$(shell id -u):$(shell id -g)"/' > docker-compose.override.yml; else cp docker-compose.override.yml.dist docker-compose.override.yml; fi
 
 docker-compose.anchore.yml: ## Create docker compose override file with anchore
-	cp docker-compose.anchore.yml.dist docker-compose.override.yml
+	@ if [[ "$$OSTYPE" == "linux-gnu" ]]; then cat docker-compose.anchore.yml.dist | sed -e 's/# user: "$${uid}:$${gid}"/user: "$(shell id -u):$(shell id -g)"/' > docker-compose.override.yml; else cp docker-compose.anchore.yml.dist docker-compose.override.yml; fi
 
 create-docker-dirs: ## Create .docker directories with your user
 	mkdir -p .docker/volumes/mysql
@@ -63,15 +63,15 @@ create-docker-dirs: ## Create .docker directories with your user
 .PHONY: start
 start: docker-compose.override.yml create-docker-dirs ## Start docker development environment
 	@ if [ docker-compose.override.yml -ot docker-compose.override.yml.dist ]; then diff -u docker-compose.override.yml* || (echo "!!! The distributed docker-compose.override.yml example changed. Please update your file accordingly (or at least touch it). !!!" && false); fi
-	uid=$(shell id -u) gid=$(shell id -g) docker-compose up -d
+	docker-compose up -d
 
 .PHONY: anchorestart
 anchorestart: docker-compose.anchore.yml create-docker-dirs ## Start docker development environment with anchore
-	uid=$(shell id -u) gid=$(shell id -g) docker-compose up -d
+	docker-compose up -d
 
 .PHONY: stop
 stop: ## Stop docker development environment
-	uid=$(shell id -u) gid=$(shell id -g) docker-compose stop
+	docker-compose stop
 
 bin/dep: bin/dep-${DEP_VERSION}
 	@ln -sf dep-${DEP_VERSION} bin/dep

diff --git a/docker-compose.anchore.yml.dist b/docker-compose.anchore.yml.dist
@@ -1,7 +1,8 @@
 version: "3.1"
 services:
     db:
-        user: "${uid}:${gid}"
+        # needed for Linux users
+        # user: "${uid}:${gid}"
         ports:
             - 3306:3306
         volumes:
@@ -16,17 +17,20 @@ services:
             - ./.docker/volumes/vault/file:/vault/file
 
     vault-unsealer:
-        user: "${uid}:${gid}"
+        # needed for Linux users
+        # user: "${uid}:${gid}"
         volumes:
             - ./.docker/volumes/vault/keys:/vault/keys
 
     vault-configurer:
-        user: "${uid}:${gid}"
+        # needed for Linux users
+        # user: "${uid}:${gid}"
         volumes:
             - ./.docker/volumes/vault/keys:/vault/keys
 
     vault-token-helper:
-        user: "${uid}:${gid}"
+        # needed for Linux users
+        # user: "${uid}:${gid}"
         volumes:
             - ./.docker/volumes/vault/keys:/vault/keys
     cicd-server:

diff --git a/docker-compose.override.yml.dist b/docker-compose.override.yml.dist
@@ -2,7 +2,8 @@ version: "3.1"
 
 services:
     db:
-        user: "${uid}:${gid}"
+        # needed for Linux users
+        # user: "${uid}:${gid}"
         ports:
             - 127.0.0.1:3306:3306
         volumes:
@@ -19,17 +20,20 @@ services:
             - ./.docker/volumes/vault/file:/vault/file
 
     vault-unsealer:
-        user: "${uid}:${gid}"
+        # needed for Linux users
+        # user: "${uid}:${gid}"
         volumes:
             - ./.docker/volumes/vault/keys:/vault/keys
 
     vault-configurer:
-        user: "${uid}:${gid}"
+        # needed for Linux users
+        # user: "${uid}:${gid}"
         volumes:
             - ./.docker/volumes/vault/keys:/vault/keys
 
     vault-token-helper:
-        user: "${uid}:${gid}"
+        # needed for Linux users
+        # user: "${uid}:${gid}"
         volumes:
             - ./.docker/volumes/vault/keys:/vault/keys