Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[master] fix some minor nits #714

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
+7 −7
Draft

[master] fix some minor nits #714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ff15db
static: create hashes for all files, not just linux
thaJeztah Jun 30, 2022
3164a49
Makefile: set initial branch name
thaJeztah Jun 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions Makefile
View file
Open in desktop
Expand Up @@ -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

Expand All @@ -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)"


Expand Down
4 changes: 2 additions & 2 deletions static/Makefile
View file
Open in desktop
Expand Up @@ -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=
Expand Down