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

Commit 1ce7247

Browse files
Merge pull request #371 from thaJeztah/19.03_backport_bump_golang_1.12.8
Merged with https://github.com/seemethere/unir Upstream-commit: b2d11e82bd74abc659a09be5b2436b8f4dd89242 Component: packaging
2 parents 0f827ef + 3e948b2 commit 1ce7247

4 files changed

Lines changed: 7 additions & 7 deletions

File tree

components/packaging/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ VERSION?=0.0.0-dev
55
DOCKER_GITCOMMIT:=abcdefg
66
ARCH=$(shell uname -m)
77
STATIC_VERSION=$(shell static/gen-static-ver $(ENGINE_DIR) $(VERSION))
8-
GO_VERSION:=1.12.5
8+
GO_VERSION:=1.12.8
99
DEFAULT_PRODUCT_LICENSE:=Community Engine
1010
PLATFORM=Docker Engine - Community
1111
BUILDTIME=$(shell date -u -d "@$${SOURCE_DATE_EPOCH:-$$(date +%s)}" --rfc-3339 ns 2> /dev/null | sed -e 's/ /T/')

components/packaging/deb/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ GITCOMMIT?=$(shell cd $(CLI_DIR) && git rev-parse --short HEAD)
66
VERSION?=0.0.0-dev
77
STATIC_VERSION=$(shell ../static/gen-static-ver $(ENGINE_DIR) $(VERSION))
88
GO_BASE_IMAGE=golang
9-
GO_VERSION:=1.12.5
10-
GO_IMAGE=$(GO_BASE_IMAGE):$(GO_VERSION)
9+
GO_VERSION:=1.12.8
10+
GO_IMAGE=$(GO_BASE_IMAGE):$(GO_VERSION)-stretch
1111
DEB_VERSION=$(shell ./gen-deb-ver $(CLI_DIR) "$(VERSION)")
1212
CHOWN:=docker run --rm -v $(CURDIR):/v -w /v alpine chown
1313
EPOCH?=5

components/packaging/image/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ ENGINE_DIR:=$(CURDIR)/../../engine
33
CLI_DIR:=$(CURDIR)/../../cli
44
VERSION?=0.0.0-dev
55
GO_BASE_IMAGE=golang
6-
GO_VERSION:=1.12.5
7-
ENGINE_GO_IMAGE=$(GO_BASE_IMAGE):$(GO_VERSION)
6+
GO_VERSION:=1.12.8
7+
ENGINE_GO_IMAGE=$(GO_BASE_IMAGE):$(GO_VERSION)-stretch
88
STATIC_VERSION=$(shell ../static/gen-static-ver $(ENGINE_DIR) $(VERSION))
99
DOCKER_HUB_ORG?=dockereng
1010
ARCH=$(shell uname -m)

components/packaging/rpm/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ GITCOMMIT=$(shell cd $(ENGINE_DIR) && git rev-parse --short HEAD)
55
VERSION?=0.0.0-dev
66
STATIC_VERSION=$(shell ../static/gen-static-ver $(ENGINE_DIR) $(VERSION))
77
GO_BASE_IMAGE=golang
8-
GO_VERSION:=1.12.5
9-
GO_IMAGE?=$(GO_BASE_IMAGE):$(GO_VERSION)
8+
GO_VERSION:=1.12.8
9+
GO_IMAGE?=$(GO_BASE_IMAGE):$(GO_VERSION)-stretch
1010
GEN_RPM_VER=$(shell ./gen-rpm-ver $(CLI_DIR) $(VERSION))
1111
CHOWN=docker run --rm -i -v $(CURDIR):/v -w /v alpine chown
1212

0 commit comments

Comments
 (0)