Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Commit 59fc6cb

Browse files
zelahiseemethere
authored andcommitted
FIX pathing issue with cli dir
(cherry picked from commit 0df1091) Signed-off-by: Eli Uriegas <eli.uriegas@docker.com> Upstream-commit: a1419a7ed51ab3fee12f9f5c3401b2ba369925ba Component: packaging
1 parent 1ce7247 commit 59fc6cb

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

components/packaging/static/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ HASH_CMD=docker run -v $(CURDIR):/sum -w /sum debian:jessie bash hash_files
88
DIR_TO_HASH:=build/linux
99
DEFAULT_PRODUCT_LICENSE?=Community Engine
1010

11-
DOCKER_CLI_GOLANG_IMG=$(shell awk '$$1=="FROM"{split($$2,a,"-");print a[1];exit}' $(CLI_DIR)/dockerfiles/Dockerfile.dev)
11+
GO_VERSION=$(shell grep "ARG GO_VERSION" $(CLI_DIR)/dockerfiles/Dockerfile.dev | awk -F'=' '{print $$2}')
12+
DOCKER_CLI_GOLANG_IMG=golang:$(GO_VERSION)
1213

1314
.PHONY: help
1415
help: ## show make targets

0 commit comments

Comments
 (0)