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

Commit 1fc1e56

Browse files
committed
Revert "FIX pathing issue with cli dir"
This reverts commit a1419a7ed51ab3fee12f9f5c3401b2ba369925ba. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 41debafef544fe72f510ac91736a37aa087d3b68 Component: packaging
1 parent 8826447 commit 1fc1e56

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

components/packaging/static/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ 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-
GO_VERSION=$(shell grep "ARG GO_VERSION" $(CLI_DIR)/dockerfiles/Dockerfile.dev | awk -F'=' '{print $$2}')
12-
DOCKER_CLI_GOLANG_IMG=golang:$(GO_VERSION)
11+
DOCKER_CLI_GOLANG_IMG=$(shell awk '$$1=="FROM"{split($$2,a,"-");print a[1];exit}' $(CLI_DIR)/dockerfiles/Dockerfile.dev)
1312

1413
.PHONY: help
1514
help: ## show make targets

0 commit comments

Comments
 (0)