Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,13 @@ cross: clean
@gox -output build/docker-{{.OS}}-{{.Arch}} \
-osarch="linux/arm linux/amd64 darwin/amd64 windows/amd64" \
github.com/docker/cli/cmd/docker

vendor: vendor.conf
@vndr 2> /dev/null
@if [ "`git status --porcelain -- vendor 2>/dev/nul`" ]; then \
echo; echo "vendoring is wrong. These files were changed:"; \
echo; git status --porcelain -- vendor 2>/dev/nul; \
echo; exit 1; \
fi;

ci: cross test
12 changes: 9 additions & 3 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,17 @@ jobs:
steps:
- checkout
- setup_remote_docker
- run:
name: "Lint"
- run:
name: "Lint"
command: |
docker build -f dockerfiles/Dockerfile.lint --tag cli-linter .
docker run cli-linter
- run:
name: "Build and Unit Test"
command: docker build -f dockerfiles/Dockerfile.ci .
command: |
docker build -f dockerfiles/Dockerfile.ci --tag cli-builder .
docker run cli-builder
- run:
name: "Vendor"
command: |
docker run cli-builder make vendor
5 changes: 1 addition & 4 deletions dockerfiles/Dockerfile.ci
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,4 @@ COPY . /go/src/github.com/docker/cli
ENV CGO_ENABLED=0
WORKDIR /go/src/github.com/docker/cli

RUN make cross
RUN make test

CMD sh
CMD ["make", "ci"]