installation: fixup glide mistakes

coreos · Jan 13, 2016 · 9713146 · 9713146
1 parent a87c0ca
commit 9713146
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 *~
+/vendor
diff --git a/Dockerfile b/Dockerfile
@@ -3,9 +3,19 @@ MAINTAINER colin.hom@coreos.com
 
 ENV GO15VENDOREXPERIMENT=1
 
+WORKDIR $GOPATH
+RUN mkdir -p ./src/github.com/Masterminds
+WORKDIR $GOPATH/src/github.com/Masterminds
+RUN git clone https://github.com/Masterminds/glide
+WORKDIR glide
+RUN make bootstrap
+RUN make install
+RUN mkdir -p $GOPATH/src/github.com/coreos
+
 WORKDIR $GOPATH/src/github.com/coreos
 ADD . ./aws-auth-proxy
 WORKDIR ./aws-auth-proxy
+RUN glide install
 RUN go install github.com/coreos/aws-auth-proxy
 
 ENTRYPOINT ["aws-auth-proxy"]
diff --git a/README.md b/README.md
@@ -4,10 +4,19 @@
 
 ##Installation
 
+pre-reqs:
+* go1.5
+* [glide package manager](https://github.com/Masterminds/glide)
+
 ```sh
 #requires go1.5
 export GO15VENDOREXPERIMENT=1
-cd ./aws-auth-proxy
+
+mkdir -p $GOPATH/src/github.com/coreos
+cd $GOPATH/src/github.com/coreos
+git clone https://github.com/coreos/aws-auth-proxy
+cd aws-auth-proxy
+glide install
 go build github.com/coreos/aws-auth-proxy
 ```
 ##Example

diff --git a/glide.lock b/glide.lock
diff --git a/vendor/github.com/bitly/go-simplejson b/vendor/github.com/bitly/go-simplejson
diff --git a/vendor/github.com/coreos/go-systemd b/vendor/github.com/coreos/go-systemd
diff --git a/vendor/github.com/coreos/pkg b/vendor/github.com/coreos/pkg
diff --git a/vendor/github.com/crowdmob/goamz b/vendor/github.com/crowdmob/goamz
diff --git a/vendor/github.com/feyeleanor/raw b/vendor/github.com/feyeleanor/raw
diff --git a/vendor/github.com/feyeleanor/sets b/vendor/github.com/feyeleanor/sets
diff --git a/vendor/github.com/feyeleanor/slices b/vendor/github.com/feyeleanor/slices
diff --git a/vendor/github.com/godbus/dbus b/vendor/github.com/godbus/dbus
diff --git a/vendor/gopkg.in/check.v1 b/vendor/gopkg.in/check.v1
diff --git a/vendor/gopkg.in/yaml.v1 b/vendor/gopkg.in/yaml.v1