kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update makefiles to include git, exclude glide 

We need git to get the HEAD version for including in the built
executable (for e.g. `kops version`)

We don't need glide to build - our deps should already be in vendor
This commit is contained in:
Justin Santa Barbara 2016-07-27 01:05:33 -04:00
parent 62037e0029
commit bcf7505cda
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
images/dns-controller-builder/Dockerfile
View File

@ -2,8 +2,9 @@ FROM debian:jessie
# Install packages:
# curl (to download golang)
# gcc & make (for building)
RUN apt-get update && apt-get install --yes curl gcc make
# git (for getting the current head)
# gcc make (for compilation)
RUN apt-get update && apt-get install --yes curl git gcc make
# Install golang
RUN curl -L https://storage.googleapis.com/golang/go1.6.3.linux-amd64.tar.gz | tar zx -C /usr/local

9
images/protokube-builder/Dockerfile
View File

@ -1,14 +1,13 @@
FROM debian:jessie
# Install packages:
# curl (to download glide & golang)
# git, mercurial (for go get)
RUN apt-get update && apt-get install --yes curl mercurial git gcc make
# curl (to download golang)
# git (for getting the current head)
# gcc make (for compilation)
RUN apt-get update && apt-get install --yes curl git gcc make
# Install golang
RUN curl -L https://storage.googleapis.com/golang/go1.6.2.linux-amd64.tar.gz | tar zx -C /usr/local
ENV PATH $PATH:/usr/local/go/bin
# Install glide
RUN curl -L https://github.com/Masterminds/glide/releases/download/0.10.2/glide-0.10.2-linux-amd64.tar.gz | tar zx --strip-components 1 -C /usr/bin
COPY images/protokube-builder/onbuild.sh /onbuild.sh