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

Commit de62b4b

Browse files
zelahithaJeztah
authored andcommitted
FIXED retrieving GO_VERSION from the CLI dir
Signed-off-by: zelahi <elahi.zuhayr@gmail.com> (cherry picked from commit 5f1afbb) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 0ca225ae71d3b6b675bcef69b026db85455dfc7a Component: packaging
1 parent 1fc1e56 commit de62b4b

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

components/packaging/static/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ CHOWN=docker run --rm -v $(CURDIR):/v -w /v alpine chown
77
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
10-
11-
DOCKER_CLI_GOLANG_IMG=$(shell awk '$$1=="FROM"{split($$2,a,"-");print a[1];exit}' $(CLI_DIR)/dockerfiles/Dockerfile.dev)
10+
GO_VERSION=$(shell grep "ARG GO_VERSION" $(CLI_DIR)/docker-ce/components/cli/dockerfiles/Dockerfile.dev | awk -F'=' '{print $$2}')
11+
DOCKER_CLI_GOLANG_IMG=golang:$(GO_VERSION)
1212

1313
.PHONY: help
1414
help: ## show make targets

0 commit comments

Comments
 (0)