From ff2d7c542ff0539db9bf1bb8893ee4b76060ce7b Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 6 Aug 2019 23:10:33 +0200 Subject: [PATCH] Pin Golang images to debian stretch variant Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 1310e3974e8193745ce70cd74a20ab9d2151b8ac) Signed-off-by: Sebastiaan van Stijn Upstream-commit: 32cdb89aac13e9af7446891eab8fb1aa54c22034 Component: packaging --- components/packaging/deb/Makefile | 2 +- components/packaging/image/Makefile | 2 +- components/packaging/rpm/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/packaging/deb/Makefile b/components/packaging/deb/Makefile index a96028fa7a..ecfa2d695e 100644 --- a/components/packaging/deb/Makefile +++ b/components/packaging/deb/Makefile @@ -7,7 +7,7 @@ GITCOMMIT?=$(shell cd $(CLI_DIR) && git rev-parse --short HEAD) VERSION?=0.0.0-dev GO_BASE_IMAGE=golang GO_VERSION:=1.11.12 -GO_IMAGE=$(GO_BASE_IMAGE):$(GO_VERSION) +GO_IMAGE=$(GO_BASE_IMAGE):$(GO_VERSION)-stretch DEB_VERSION=$(shell ./gen-deb-ver $(CLI_DIR) "$(VERSION)") CHOWN:=docker run --rm -v $(CURDIR):/v -w /v alpine chown EPOCH?=5 diff --git a/components/packaging/image/Makefile b/components/packaging/image/Makefile index a5c6d40c64..fbfd257558 100644 --- a/components/packaging/image/Makefile +++ b/components/packaging/image/Makefile @@ -4,7 +4,7 @@ CLI_DIR:=$(CURDIR)/../../cli VERSION?=0.0.0-dev GO_BASE_IMAGE=golang GO_VERSION:=1.11.12 -ENGINE_GO_IMAGE=$(GO_BASE_IMAGE):$(GO_VERSION) +ENGINE_GO_IMAGE=$(GO_BASE_IMAGE):$(GO_VERSION)-stretch STATIC_VERSION=$(shell ../static/gen-static-ver $(ENGINE_DIR) $(VERSION)) DOCKER_HUB_ORG?=dockereng ARCH=$(shell uname -m) diff --git a/components/packaging/rpm/Makefile b/components/packaging/rpm/Makefile index 68e494c3eb..9611976eae 100644 --- a/components/packaging/rpm/Makefile +++ b/components/packaging/rpm/Makefile @@ -7,7 +7,7 @@ GITCOMMIT=$(shell cd $(ENGINE_DIR) && git rev-parse --short HEAD) VERSION?=0.0.0-dev GO_BASE_IMAGE=golang GO_VERSION:=1.11.12 -GO_IMAGE?=$(GO_BASE_IMAGE):$(GO_VERSION) +GO_IMAGE?=$(GO_BASE_IMAGE):$(GO_VERSION)-stretch GEN_RPM_VER=$(shell ./gen-rpm-ver $(CLI_DIR) $(VERSION)) CHOWN=docker run --rm -i -v $(CURDIR):/v -w /v alpine chown