Skip to content

Commit

Permalink
Review feedback.
Browse files Browse the repository at this point in the history
  • Loading branch information
tomwilkie committed Jan 13, 2016
1 parent 87c3e8e commit 4650090
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
1 change: 0 additions & 1 deletion build/Dockerfile
@@ -1,7 +1,6 @@
FROM golang:1.5.2
ENV GO15VENDOREXPERIMENT 1
RUN apt-get update && apt-get install -y libpcap-dev python-requests time
RUN go get github.com/FiloSottile/gvt; touch /tmp/.donotremove
RUN go get github.com/golang/lint/golint
RUN go clean -i net && go install -tags netgo std
RUN go install -race -tags netgo std
Expand Down
4 changes: 2 additions & 2 deletions site/building.md
Expand Up @@ -15,7 +15,7 @@ under. But naturally, Docker is a prerequisite (version 1.6.0 or
later).

The only way to build is by using the the build container; the
Makefile if setup to make this transparent. This method is
Makefile is setup to make this transparent. This method is
documented below, and can be run directly on your machine or using
a Vagrant VM.

Expand All @@ -42,7 +42,7 @@ $ make

On a fresh repository, the Makefile will do the following:
- assemble the build container
- download specific versions of all the dependancies
- download specific versions of all the dependencies
- build the weave components in the build container
- package them into three Docker images (`weaveworks/weave`,
`weaveworks/weaveexec`, and `weaveworks/plugin`)
Expand Down

0 comments on commit 4650090

Please sign in to comment.