From 2ff15db50c5cd7af31ff5a1a302f93abe0b1388f Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 30 Jun 2022 17:18:35 +0200 Subject: [PATCH 1/2] static: create hashes for all files, not just linux Also switching to alpine, instead of debian:jessy, which is EOL Signed-off-by: Sebastiaan van Stijn --- static/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/static/Makefile b/static/Makefile index 392ac9fa9a..6ec6f67c09 100644 --- a/static/Makefile +++ b/static/Makefile @@ -5,8 +5,8 @@ ENGINE_DIR=$(realpath $(CURDIR)/../src/github.com/docker/docker) BUILDX_DIR=$(realpath $(CURDIR)/../src/github.com/docker/buildx) 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 +HASH_CMD=docker run -v $(CURDIR):/sum -w /sum alpine sh hash_files +DIR_TO_HASH:=build DOCKER_CLI_GOLANG_IMG=golang:$(GO_VERSION) DOCKER_BUILD_OPTS= From 3164a49a1577157069c8c723f5644521b036a6b3 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 30 Jun 2022 16:32:50 +0200 Subject: [PATCH 2/2] Makefile: set initial branch name Set an initial branch name so that git does not create additional noise about the default not being configured. Using "master" for now, which was the previous default; we can probably safely change it to "main", but leaving that for a future exercise. Signed-off-by: Sebastiaan van Stijn --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 80cdae1386..641ba0f3ee 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ src/github.com/docker/cli: cp -r "$(CLI_DIR)" $@ else src/github.com/docker/cli: - git init $@ + git init --initial-branch=master $@ git -C $@ remote add origin "$(DOCKER_CLI_REPO)" endif @@ -33,20 +33,20 @@ src/github.com/docker/docker: cp -r "$(ENGINE_DIR)" $@ else src/github.com/docker/docker: - git init $@ + git init --initial-branch=master $@ git -C $@ remote add origin "$(DOCKER_ENGINE_REPO)" endif src/github.com/docker/buildx: - git init $@ + git init --initial-branch=master $@ git -C $@ remote add origin "$(DOCKER_BUILDX_REPO)" src/github.com/docker/compose: - git init $@ + git init --initial-branch=master $@ git -C $@ remote add origin "$(DOCKER_COMPOSE_REPO)" src/github.com/docker/scan-cli-plugin: - git init $@ + git init --initial-branch=master $@ git -C $@ remote add origin "$(DOCKER_SCAN_REPO)"