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

Commit 622f5d9

Browse files
authored
Merge pull request #480 from ijc/containerized-dep
Add a containerized dep target
2 parents 803e955 + 7a03644 commit 622f5d9

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
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: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,12 @@ lint: ## run linter(s)
109109
docker run --rm $(LINT_IMAGE_NAME) make lint
110110

111111
vendor: build_dev_image
112-
$(info Vendoring...)
112+
$(info Update Vendoring...)
113+
docker run --rm -v "$(CURDIR)":/go/src/github.com/docker/app/ $(DEV_IMAGE_NAME) make vendor
114+
$(warning You may need to reset permissions on vendor/*)
115+
116+
check-vendor: build_dev_image
117+
$(info Check Vendoring...)
113118
docker run --rm $(DEV_IMAGE_NAME) sh -c "make vendor && hack/check-git-diff vendor"
114119

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

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
145+
.PHONY: lint test-e2e test-unit test cli-cross cross e2e-cross coverage gradle-test shell build_dev_image tars vendor check-vendor schemas help invocation-image save-invocation-image save-invocation-image-tag push-invocation-image

0 commit comments

Comments
 (0)