bump to go 1.12.4
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
This commit is contained in:
Родитель
dad5025fff
Коммит
7ee83da187
2
Makefile
2
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.11.5
|
||||
GO_VERSION:=1.12.4
|
||||
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/')
|
||||
|
|
|
@ -8,7 +8,7 @@ GITCOMMIT?=$(shell cd $(CLI_DIR) && git rev-parse --short HEAD)
|
|||
VERSION?=0.0.0-dev
|
||||
STATIC_VERSION=$(shell ../static/gen-static-ver $(ENGINE_DIR) $(VERSION))
|
||||
GO_BASE_IMAGE=golang
|
||||
GO_VERSION:=1.11.5
|
||||
GO_VERSION:=1.12.4
|
||||
GO_IMAGE=$(GO_BASE_IMAGE):$(GO_VERSION)
|
||||
DEB_VERSION=$(shell ./gen-deb-ver $(CLI_DIR) "$(VERSION)")
|
||||
CHOWN:=docker run --rm -v $(CURDIR):/v -w /v alpine chown
|
||||
|
|
|
@ -3,7 +3,7 @@ ENGINE_DIR:=$(CURDIR)/../../engine
|
|||
CLI_DIR:=$(CURDIR)/../../cli
|
||||
VERSION?=0.0.0-dev
|
||||
GO_BASE_IMAGE=golang
|
||||
GO_VERSION:=1.11.5
|
||||
GO_VERSION:=1.12.4
|
||||
ENGINE_GO_IMAGE=$(GO_BASE_IMAGE):$(GO_VERSION)
|
||||
STATIC_VERSION=$(shell ../static/gen-static-ver $(ENGINE_DIR) $(VERSION))
|
||||
DOCKER_HUB_ORG?=dockereng
|
||||
|
|
|
@ -7,7 +7,7 @@ GITCOMMIT=$(shell cd $(ENGINE_DIR) && git rev-parse --short HEAD)
|
|||
VERSION?=0.0.0-dev
|
||||
STATIC_VERSION=$(shell ../static/gen-static-ver $(ENGINE_DIR) $(VERSION))
|
||||
GO_BASE_IMAGE=golang
|
||||
GO_VERSION:=1.11.5
|
||||
GO_VERSION:=1.12.4
|
||||
GO_IMAGE?=$(GO_BASE_IMAGE):$(GO_VERSION)
|
||||
GEN_RPM_VER=$(shell ./gen-rpm-ver $(CLI_DIR) $(VERSION))
|
||||
CHOWN=docker run --rm -i -v $(CURDIR):/v -w /v alpine chown
|
||||
|
|
Загрузка…
Ссылка в новой задаче