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

Commit 26fd67b

Browse files
authored
Merge pull request #338 from thaJeztah/19.03_bump_golang_1.12.5
[19.03 backport] Bump Go 1.12.5 Upstream-commit: a4d4c1850549aadea3312da70aa5b39cc2e33231 Component: packaging
2 parents 68e1cce + d4c9a05 commit 26fd67b

4 files changed

Lines changed: 4 additions & 4 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.4
8+
GO_VERSION:=1.12.5
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ GITCOMMIT?=$(shell cd $(CLI_DIR) && git rev-parse --short HEAD)
88
VERSION?=0.0.0-dev
99
STATIC_VERSION=$(shell ../static/gen-static-ver $(ENGINE_DIR) $(VERSION))
1010
GO_BASE_IMAGE=golang
11-
GO_VERSION:=1.12.4
11+
GO_VERSION:=1.12.5
1212
GO_IMAGE=$(GO_BASE_IMAGE):$(GO_VERSION)
1313
DEB_VERSION=$(shell ./gen-deb-ver $(CLI_DIR) "$(VERSION)")
1414
CHOWN:=docker run --rm -v $(CURDIR):/v -w /v alpine chown

components/packaging/image/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ 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.4
6+
GO_VERSION:=1.12.5
77
ENGINE_GO_IMAGE=$(GO_BASE_IMAGE):$(GO_VERSION)
88
STATIC_VERSION=$(shell ../static/gen-static-ver $(ENGINE_DIR) $(VERSION))
99
DOCKER_HUB_ORG?=dockereng

components/packaging/rpm/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ GITCOMMIT=$(shell cd $(ENGINE_DIR) && git rev-parse --short HEAD)
77
VERSION?=0.0.0-dev
88
STATIC_VERSION=$(shell ../static/gen-static-ver $(ENGINE_DIR) $(VERSION))
99
GO_BASE_IMAGE=golang
10-
GO_VERSION:=1.12.4
10+
GO_VERSION:=1.12.5
1111
GO_IMAGE?=$(GO_BASE_IMAGE):$(GO_VERSION)
1212
GEN_RPM_VER=$(shell ./gen-rpm-ver $(CLI_DIR) $(VERSION))
1313
CHOWN=docker run --rm -i -v $(CURDIR):/v -w /v alpine chown

0 commit comments

Comments
 (0)