Skip to content

Commit

Permalink
Merge pull request #10 from stephen-soltesz/master
Browse files Browse the repository at this point in the history
Vendor the k8s.io/client-go and k8s.io/apimachinery dependencies
  • Loading branch information
stephen-soltesz authored Feb 5, 2018
2 parents 1d1ce32 + 11b767d commit 542dc0e
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 4 deletions.
6 changes: 6 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[submodule "vendor/k8s.io/client-go"]
path = vendor/k8s.io/client-go
url = https://github.com/kubernetes/client-go
[submodule "vendor/k8s.io/apimachinery"]
path = vendor/k8s.io/apimachinery
url = https://github.com/kubernetes/apimachinery.git
4 changes: 4 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
FROM golang:1.8
COPY . /go/src/github.com/m-lab/gcp-service-discovery
RUN go get -v github.com/m-lab/gcp-service-discovery/cmd/gcp_service_discovery
ENTRYPOINT ["/go/bin/gcp_service_discovery"]
4 changes: 0 additions & 4 deletions cmd/gcp_service_discovery/Dockerfile

This file was deleted.

1 change: 1 addition & 0 deletions vendor/k8s.io/apimachinery
Submodule apimachinery added at 84c15d
1 change: 1 addition & 0 deletions vendor/k8s.io/client-go
Submodule client-go added at 22eca1

0 comments on commit 542dc0e

Please sign in to comment.