Skip to content
This repository was archived by the owner on Jul 18, 2025. It is now read-only.

Commit 6c881fc

Browse files
author
Ian Campbell
committed
Rename containerized vendor make target to check-vendor
Having `make vendor` and `make -f dockerfile.Makefile vendor` do different things (the first updates, the second checks) is confusing. I want to add a containerized vendor update target, which would only be more confusing if it weren't called `vendor`. Signed-off-by: Ian Campbell <[email protected]>
1 parent 803e955 commit 6c881fc

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ pipeline {
2020
dir('src/github.com/docker/app') {
2121
checkout scm
2222
sh 'make -f docker.Makefile lint'
23-
sh 'make -f docker.Makefile vendor'
23+
sh 'make -f docker.Makefile check-vendor'
2424
}
2525
}
2626
post {

docker.Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ lint: ## run linter(s)
108108
docker build -t $(LINT_IMAGE_NAME) -f Dockerfile.lint .
109109
docker run --rm $(LINT_IMAGE_NAME) make lint
110110

111-
vendor: build_dev_image
112-
$(info Vendoring...)
111+
check-vendor: build_dev_image
112+
$(info Check Vendoring...)
113113
docker run --rm $(DEV_IMAGE_NAME) sh -c "make vendor && hack/check-git-diff vendor"
114114

115115
specification/bindata.go: specification/schemas/*.json build_dev_image
@@ -137,4 +137,4 @@ push-invocation-image:
137137
help: ## this help
138138
@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST) | sort
139139

140-
.PHONY: lint test-e2e test-unit test cli-cross cross e2e-cross coverage gradle-test shell build_dev_image tars vendor schemas help invocation-image save-invocation-image save-invocation-image-tag push-invocation-image
140+
.PHONY: lint test-e2e test-unit test cli-cross cross e2e-cross coverage gradle-test shell build_dev_image tars check-vendor schemas help invocation-image save-invocation-image save-invocation-image-tag push-invocation-image

0 commit comments

Comments
 (0)