From 85c3e76e09696efe6b616d940f9e94ac9b7c4ec2 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 21 Apr 2020 10:58:56 +0200 Subject: [PATCH 1/4] plugins/buildx: force go modules to use vendor mode Signed-off-by: Sebastiaan van Stijn (cherry picked from commit cca0c0e994ee07a772e0f09411114744270a340d) Signed-off-by: Sebastiaan van Stijn --- plugins/buildx.installer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/buildx.installer b/plugins/buildx.installer index 09ccf14666..f02b99c6d0 100644 --- a/plugins/buildx.installer +++ b/plugins/buildx.installer @@ -21,7 +21,7 @@ build() { # TODO: unmark `-tp` when no longer a technical preview LDFLAGS="-X ${PKG}/version.Version=$(git describe --match 'v[0-9]*' --always --tags)-tp-docker -X ${PKG}/version.Revision=$(git rev-parse HEAD) -X ${PKG}/version.Package=${PKG} -X main.experimental=1" set -x - go build -o bin/docker-buildx -ldflags "${LDFLAGS}" ./cmd/buildx + GOFLAGS=-mod=vendor go build -o bin/docker-buildx -ldflags "${LDFLAGS}" ./cmd/buildx ) } From 445489f3f90d9ae647722a9f776cfe017715639f Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 26 Feb 2020 14:01:06 +0100 Subject: [PATCH 2/4] Update Golang 1.13.8 Signed-off-by: Sebastiaan van Stijn (cherry picked from commit c7ed6740f585eb653452f5c0677a8a2af4de482c) Signed-off-by: Sebastiaan van Stijn --- common.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.mk b/common.mk index fa5cbf5176..6432e610d3 100644 --- a/common.mk +++ b/common.mk @@ -2,7 +2,7 @@ ARCH=$(shell uname -m) BUILDTIME=$(shell date -u -d "@$${SOURCE_DATE_EPOCH:-$$(date +%s)}" --rfc-3339 ns 2> /dev/null | sed -e 's/ /T/') DEFAULT_PRODUCT_LICENSE:=Community Engine DOCKER_GITCOMMIT:=abcdefg -GO_VERSION:=1.12.17 +GO_VERSION:=1.13.8 PLATFORM=Docker Engine - Community SHELL:=/bin/bash VERSION?=0.0.0-dev From d8cdca27cebb7da150103a799b05cccb4177a56c Mon Sep 17 00:00:00 2001 From: Jintao Zhang Date: Tue, 7 Apr 2020 11:02:02 +0800 Subject: [PATCH 3/4] Update Golang 1.13.9 Signed-off-by: Jintao Zhang (cherry picked from commit e347bb955135c622357903751211c2e098b2f791) Signed-off-by: Sebastiaan van Stijn --- common.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.mk b/common.mk index 6432e610d3..f6227e2c50 100644 --- a/common.mk +++ b/common.mk @@ -2,7 +2,7 @@ ARCH=$(shell uname -m) BUILDTIME=$(shell date -u -d "@$${SOURCE_DATE_EPOCH:-$$(date +%s)}" --rfc-3339 ns 2> /dev/null | sed -e 's/ /T/') DEFAULT_PRODUCT_LICENSE:=Community Engine DOCKER_GITCOMMIT:=abcdefg -GO_VERSION:=1.13.8 +GO_VERSION:=1.13.9 PLATFORM=Docker Engine - Community SHELL:=/bin/bash VERSION?=0.0.0-dev From 16cae32186cd99008465ec6603b9218f1089c775 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 14 Apr 2020 14:12:59 +0200 Subject: [PATCH 4/4] Bump Golang 1.13.10 go1.13.10 (released 2020/04/08) includes fixes to the go command, the runtime, os/exec, and time packages. See the Go 1.13.10 milestone on the issue tracker for details: https://github.com/golang/go/issues?q=milestone%3AGo1.13.10+label%3ACherryPickApproved full diff: https://github.com/golang/go/compare/go1.13.9...go1.13.10 Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 382364f55aa5f0dc3a094ac12874556a2248b536) Signed-off-by: Sebastiaan van Stijn --- common.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.mk b/common.mk index f6227e2c50..7221e7703a 100644 --- a/common.mk +++ b/common.mk @@ -2,7 +2,7 @@ ARCH=$(shell uname -m) BUILDTIME=$(shell date -u -d "@$${SOURCE_DATE_EPOCH:-$$(date +%s)}" --rfc-3339 ns 2> /dev/null | sed -e 's/ /T/') DEFAULT_PRODUCT_LICENSE:=Community Engine DOCKER_GITCOMMIT:=abcdefg -GO_VERSION:=1.13.9 +GO_VERSION:=1.13.10 PLATFORM=Docker Engine - Community SHELL:=/bin/bash VERSION?=0.0.0-dev