From 8513ce556d2383f85d62b755179e0e6b75da4241 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 30 Jun 2021 00:57:29 +0200 Subject: [PATCH 1/4] update default go version to 1.16.5 Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 3d0e7c4e99f81723123e15431a4cde4a1d3219d6) 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 0d5554c333..6540c250f0 100644 --- a/common.mk +++ b/common.mk @@ -16,7 +16,7 @@ BUILDTIME=$(shell date -u -d "@$${SOURCE_DATE_EPOCH:-$$(date +%s)}" --rfc-3339 n CHOWN:=docker run --rm -v $(CURDIR):/v -w /v alpine chown DEFAULT_PRODUCT_LICENSE:=Community Engine DOCKER_GITCOMMIT:=abcdefg -GO_VERSION:=1.13.15 +GO_VERSION:=1.16.5 PLATFORM=Docker Engine - Community SHELL:=/bin/bash VERSION?=0.0.1-dev From 1ff9a59c79befef6649ed0af7819de74a0a2b1a2 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 28 Jul 2021 22:17:45 +0200 Subject: [PATCH 2/4] Revert "plugins: update golang to 1.16.3 to build buildx on darwin/arm64" This reverts commit 60e28c914dbe5c0b7fe9fe73fefb24ecbd078085, except for the changes in plugins/app.installer Signed-off-by: Sebastiaan van Stijn --- static/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/static/Makefile b/static/Makefile index 97e2833132..1e6802b9ea 100644 --- a/static/Makefile +++ b/static/Makefile @@ -5,7 +5,8 @@ ENGINE_DIR=$(realpath $(CURDIR)/../src/github.com/docker/docker) GEN_STATIC_VER=$(shell ./gen-static-ver $(CLI_DIR) $(VERSION)) HASH_CMD=docker run -v $(CURDIR):/sum -w /sum debian:jessie bash hash_files DIR_TO_HASH:=build/linux -DOCKER_CLI_PLUGIN_GOLANG_IMG=golang:1.16.3 +GO_VERSION=$(shell grep "ARG GO_VERSION" $(CLI_DIR)/dockerfiles/Dockerfile.dev | awk -F'=' '{print $$2}') +DOCKER_CLI_GOLANG_IMG=golang:$(GO_VERSION) .PHONY: help help: ## show make targets @@ -102,7 +103,7 @@ cross-mac-plugins: cross-mac-plugins-amd64 cross-mac-plugins-arm64 cross-mac-plugins-%: CLI_BUILD_DIR := mac cross-mac-plugins-%: mkdir -p build/$(CLI_BUILD_DIR)/$*/docker - GOOS=darwin GOARCH=$* docker run $(BUILD_PLUGIN_RUN_VARS) $(DOCKER_CLI_PLUGIN_GOLANG_IMG) /build + GOOS=darwin GOARCH=$* docker run $(BUILD_PLUGIN_RUN_VARS) $(DOCKER_CLI_GOLANG_IMG) /build $(CHOWN) -R $(shell id -u):$(shell id -g) build/$(CLI_BUILD_DIR)/$* .PHONY: cross-win-plugins @@ -112,6 +113,6 @@ cross-win-plugins: cross-win-plugins-amd64 cross-win-plugins-%: CLI_BUILD_DIR := win cross-win-plugins-%: mkdir -p build/$(CLI_BUILD_DIR)/$*/docker/cli-plugins - GOOS=windows GOARCH=$* docker run $(BUILD_PLUGIN_RUN_VARS) $(DOCKER_CLI_PLUGIN_GOLANG_IMG) /build + GOOS=windows GOARCH=$* docker run $(BUILD_PLUGIN_RUN_VARS) $(DOCKER_CLI_GOLANG_IMG) /build $(CHOWN) -R $(shell id -u):$(shell id -g) build/$(CLI_BUILD_DIR)/$* find build/$(CLI_BUILD_DIR)/$*/docker -type f -not -name "*.exe" -exec mv {} {}.exe \; From ffb2648940b8027cdfa0a9afa6803f82be8de962 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 28 Jul 2021 22:11:15 +0200 Subject: [PATCH 3/4] static: use same Go version as other builds Use the version that's defined/set in common.mk Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 8141ee7d60c6c24801631796266f351c4e2a674e) Signed-off-by: Sebastiaan van Stijn --- static/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/static/Makefile b/static/Makefile index 1e6802b9ea..85ec9472bf 100644 --- a/static/Makefile +++ b/static/Makefile @@ -5,7 +5,6 @@ ENGINE_DIR=$(realpath $(CURDIR)/../src/github.com/docker/docker) GEN_STATIC_VER=$(shell ./gen-static-ver $(CLI_DIR) $(VERSION)) HASH_CMD=docker run -v $(CURDIR):/sum -w /sum debian:jessie bash hash_files DIR_TO_HASH:=build/linux -GO_VERSION=$(shell grep "ARG GO_VERSION" $(CLI_DIR)/dockerfiles/Dockerfile.dev | awk -F'=' '{print $$2}') DOCKER_CLI_GOLANG_IMG=golang:$(GO_VERSION) .PHONY: help From d2380950cbd50954a2bdba5df768a4b2cd03ddde Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 28 Jul 2021 22:12:29 +0200 Subject: [PATCH 4/4] Bump go 1.16.6 (addresses CVE-2021-34558) This addresses CVE-2021-34558: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-34558 go1.16.6 (released 2021-07-12) includes a security fix to the crypto/tls package, as well as bug fixes to the compiler, and the net and net/http packages. See the Go 1.16.6 milestone on the issue tracker for details: https://github.com/golang/go/issues?q=milestone%3AGo1.16.6+label%3ACherryPickApproved Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 9308b2f53b5233ed7fbc9db7367f16cc15874fca) 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 6540c250f0..ce1ddd2a67 100644 --- a/common.mk +++ b/common.mk @@ -16,7 +16,7 @@ BUILDTIME=$(shell date -u -d "@$${SOURCE_DATE_EPOCH:-$$(date +%s)}" --rfc-3339 n CHOWN:=docker run --rm -v $(CURDIR):/v -w /v alpine chown DEFAULT_PRODUCT_LICENSE:=Community Engine DOCKER_GITCOMMIT:=abcdefg -GO_VERSION:=1.16.5 +GO_VERSION:=1.16.6 PLATFORM=Docker Engine - Community SHELL:=/bin/bash VERSION?=0.0.1-dev