Make docker-in-docker DOCKER_CONFIG configurable (#242)

kanisterio · Aug 27, 2019 · 0afea73 · 0afea73
1 parent 51fa0ea
commit 0afea73
Showing 1 changed file with 17 additions and 13 deletions.
diff --git a/Makefile b/Makefile
@@ -35,6 +35,8 @@ PWD := $$(pwd)
 # Whether to build inside a containerized build environment
 DOCKER_BUILD ?= "true"
 
+DOCKER_CONFIG ?= "$(HOME)/.docker"
+
 ###
 ### These variables should not need tweaking.
 ###
@@ -101,19 +103,20 @@ bin/$(ARCH)/$(BIN):
 # Example: make shell CMD="-c 'date > datefile'"
 shell: build-dirs
 	@echo "launching a shell in the containerized build environment"
-	@docker run                                                 \
-		-ti                                                     \
-		--rm                                                    \
-		--privileged                                            \
-		--net host                                              \
-		-v "$(PWD)/.go/pkg:/go/pkg"                             \
-		-v "$(PWD)/.go/cache:/go/.cache"                        \
-		-v "${HOME}/.kube:/root/.kube"                          \
-		-v "$(PWD):/go/src/$(PKG)"                              \
-		-v "$(PWD)/bin/$(ARCH):/go/bin"                         \
-		-v /var/run/docker.sock:/var/run/docker.sock            \
-		-w /go/src/$(PKG)                                       \
-		$(BUILD_IMAGE)                                          \
+	@docker run                                      \
+		-ti                                          \
+		--rm                                         \
+		--privileged                                 \
+		--net host                                   \
+		-v "$(PWD)/.go/pkg:/go/pkg"                  \
+		-v "$(PWD)/.go/cache:/go/.cache"             \
+		-v "${HOME}/.kube:/root/.kube"               \
+		-v "$(PWD):/go/src/$(PKG)"                   \
+		-v "$(PWD)/bin/$(ARCH):/go/bin"              \
+		-v "$(DOCKER_CONFIG):/root/.docker"          \
+		-v /var/run/docker.sock:/var/run/docker.sock \
+		-w /go/src/$(PKG)                            \
+		$(BUILD_IMAGE)                               \
 		/bin/sh
 
 DOTFILE_IMAGE = $(subst :,_,$(subst /,_,$(IMAGE))-$(VERSION))
@@ -200,6 +203,7 @@ ifeq ($(DOCKER_BUILD),"true")
 		-v "$(PWD):/go/src/$(PKG)"                                  \
 		-v "$(PWD)/bin/$(ARCH):/go/bin"                             \
 		-v "$(PWD)/.go/std/$(ARCH):/usr/local/go/pkg/linux_$(ARCH)" \
+		-v "$(DOCKER_CONFIG):/root/.docker"                         \
 		-v /var/run/docker.sock:/var/run/docker.sock                \
 		-w /go/src/$(PKG)                                           \
 		$(BUILD_IMAGE)                                              \