diff --git a/components/packaging/Makefile b/components/packaging/Makefile index 200c1dbf5d..917a1f3452 100644 --- a/components/packaging/Makefile +++ b/components/packaging/Makefile @@ -5,7 +5,7 @@ VERSION?=0.0.0-dev DOCKER_GITCOMMIT:=abcdefg ARCH=$(shell uname -m) STATIC_VERSION=$(shell static/gen-static-ver $(ENGINE_DIR) $(VERSION)) -GO_VERSION:=1.10.8 +GO_VERSION:=1.11.12 DEFAULT_PRODUCT_LICENSE:=Community Engine PLATFORM=Docker Engine - Community BUILDTIME=$(shell date -u -d "@$${SOURCE_DATE_EPOCH:-$$(date +%s)}" --rfc-3339 ns 2> /dev/null | sed -e 's/ /T/') diff --git a/components/packaging/deb/Makefile b/components/packaging/deb/Makefile index c6bfc5a671..ecfa2d695e 100644 --- a/components/packaging/deb/Makefile +++ b/components/packaging/deb/Makefile @@ -6,8 +6,8 @@ CLI_DIR:=$(CURDIR)/../../cli GITCOMMIT?=$(shell cd $(CLI_DIR) && git rev-parse --short HEAD) VERSION?=0.0.0-dev GO_BASE_IMAGE=golang -GO_VERSION:=1.10.8 -GO_IMAGE=$(GO_BASE_IMAGE):$(GO_VERSION) +GO_VERSION:=1.11.12 +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 bd5cfe71fe..fbfd257558 100644 --- a/components/packaging/image/Makefile +++ b/components/packaging/image/Makefile @@ -3,8 +3,8 @@ ENGINE_DIR:=$(CURDIR)/../../engine CLI_DIR:=$(CURDIR)/../../cli VERSION?=0.0.0-dev GO_BASE_IMAGE=golang -GO_VERSION:=1.10.8 -ENGINE_GO_IMAGE=$(GO_BASE_IMAGE):$(GO_VERSION) +GO_VERSION:=1.11.12 +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 8de1fb1944..9611976eae 100644 --- a/components/packaging/rpm/Makefile +++ b/components/packaging/rpm/Makefile @@ -6,8 +6,8 @@ CLI_DIR:=$(CURDIR)/../../cli GITCOMMIT=$(shell cd $(ENGINE_DIR) && git rev-parse --short HEAD) VERSION?=0.0.0-dev GO_BASE_IMAGE=golang -GO_VERSION:=1.10.8 -GO_IMAGE?=$(GO_BASE_IMAGE):$(GO_VERSION) +GO_VERSION:=1.11.12 +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