From 1310e3974e8193745ce70cd74a20ab9d2151b8ac 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 --- deb/Makefile | 2 +- image/Makefile | 2 +- rpm/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deb/Makefile b/deb/Makefile index 95a8a28f66..f75ad25f9b 100644 --- a/deb/Makefile +++ b/deb/Makefile @@ -7,7 +7,7 @@ VERSION?=0.0.0-dev STATIC_VERSION=$(shell ../static/gen-static-ver $(ENGINE_DIR) $(VERSION)) GO_BASE_IMAGE=golang GO_VERSION:=1.12.6 -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/image/Makefile b/image/Makefile index 8479d147cc..d91eed2e8f 100644 --- a/image/Makefile +++ b/image/Makefile @@ -4,7 +4,7 @@ CLI_DIR:=$(CURDIR)/../../cli VERSION?=0.0.0-dev GO_BASE_IMAGE=golang GO_VERSION:=1.12.6 -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/rpm/Makefile b/rpm/Makefile index 397ed0f304..37fab7d254 100644 --- a/rpm/Makefile +++ b/rpm/Makefile @@ -6,7 +6,7 @@ VERSION?=0.0.0-dev STATIC_VERSION=$(shell ../static/gen-static-ver $(ENGINE_DIR) $(VERSION)) GO_BASE_IMAGE=golang GO_VERSION:=1.12.6 -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