lobo/ddbbolt
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix uid/gid podman/docker discrepancies
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Emil Lerch 2020-11-30 18:17:17 -08:00
parent 71059fe61a
commit f501abe419
Signed by: lobo
GPG Key ID: A7B62D657EF764F8
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -32,6 +32,9 @@ BINDIRMODE ?= 777
DKR := $(shell if command -v docker > /dev/null 2>&1; then echo "docker"; else echo "podman"; fi) DKR := $(shell if command -v docker > /dev/null 2>&1; then echo "docker"; else echo "podman"; fi)
# Rootless podman, "root" in the shell will be the uid of the user
UID ?= $(shell if [ "$(DKR)" = "podman" ]; then echo 0; else id -u; fi)
GID ?= $(shell if [ "$(DKR)" = "podman" ]; then echo 0; else id -g; fi)
SRC_DIRS := cmd pkg # directories which hold app source (not vendored) SRC_DIRS := cmd pkg # directories which hold app source (not vendored)
@ -136,7 +139,7 @@ go-build: $(BUILD_DIRS)
@chmod $(BINDIRMODE) "$$(pwd)/.go/bin/$(OS)_$(ARCH)" @chmod $(BINDIRMODE) "$$(pwd)/.go/bin/$(OS)_$(ARCH)"
@$(DKR) run \ @$(DKR) run \
--rm \ --rm \
-u $$(id -u):$$(id -g) \ -u $(UID):$(GID) \
-v $$(pwd):/src \ -v $$(pwd):/src \
-w /src \ -w /src \
-v $$(pwd)/.go/bin/$(OS)_$(ARCH):/go/bin \ -v $$(pwd)/.go/bin/$(OS)_$(ARCH):/go/bin \
@ -160,12 +163,13 @@ shell: $(BUILD_DIRS)
@$(DKR) run \ @$(DKR) run \
-ti \ -ti \
--rm \ --rm \
-u $$(id -u):$$(id -g) \ -u $(UID):$(GID) \
-v $$(pwd):/src \ -v $$(pwd):/src \
-w /src \ -w /src \
-v $$(pwd)/.go/bin/$(OS)_$(ARCH):/go/bin \ -v $$(pwd)/.go/bin/$(OS)_$(ARCH):/go/bin \
-v $$(pwd)/.go/bin/$(OS)_$(ARCH):/go/bin/$(OS)_$(ARCH) \ -v $$(pwd)/.go/bin/$(OS)_$(ARCH):/go/bin/$(OS)_$(ARCH) \
-v $$(pwd)/.go/cache:/.cache \ -v $$(pwd)/.go/cache:/.cache \
--env HOME=/ \
--env HTTP_PROXY=$(HTTP_PROXY) \ --env HTTP_PROXY=$(HTTP_PROXY) \
--env HTTPS_PROXY=$(HTTPS_PROXY) \ --env HTTPS_PROXY=$(HTTPS_PROXY) \
$(BUILD_IMAGE) \ $(BUILD_IMAGE) \