Skip to content
This repository has been archived by the owner on May 6, 2022. It is now read-only.

Commit

Permalink
Vendor build tools (#2034)
Browse files Browse the repository at this point in the history
* vendor golint

* use vendored golint in build image

* install az cli from a binary instead of python
  • Loading branch information
carolynvs authored and Jeff Peeler committed May 17, 2018
1 parent 741f98f commit 2e42663
Show file tree
Hide file tree
Showing 22 changed files with 5,891 additions and 9 deletions.
2 changes: 2 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*
!vendor/golang.org
14 changes: 13 additions & 1 deletion Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ required = [
"k8s.io/code-generator/cmd/openapi-gen",
"k8s.io/gengo/args",
"github.com/kubernetes/repo-infra/kazel",
"golang.org/x/lint/golint",
]

# in sync with Kubernetes master (k8s 1.10 future release), but different from Kubernetes etcd version (3.1.10),
Expand Down Expand Up @@ -84,5 +85,3 @@ required = [
non-go = false
go-tests = false
unused-packages = false


2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ $(BINDIR):

.scBuildImage: build/build-image/Dockerfile
sed "s/GO_VERSION/$(GO_VERSION)/g" < build/build-image/Dockerfile | \
docker build -t scbuildimage -
docker build -t scbuildimage -f - .
touch $@

# Util targets
Expand Down
10 changes: 5 additions & 5 deletions build/build-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@ RUN curl -sSL https://github.com/coreos/etcd/releases/download/v3.1.10/etcd-v3.1
| tar -vxz -C /usr/local/bin --strip=1 etcd-v3.1.10-linux-amd64/etcd

# Install the golint, use this to check our source for niceness
RUN go get -u github.com/golang/lint/golint
COPY vendor/golang.org /go/src/golang.org
RUN go install golang.org/x/lint/golint

# Install the href checker for our md files, update PATH to include it
RUN git clone https://github.com/duglin/vlinker.git /vlinker
ENV PATH=$PATH:/vlinker/bin

# Install the azure client, used to publish svcat binaries
ENV AZCLI_VERSION=2.0.25
RUN apt-get update && apt-get install -y python-pip && \
rm -rf /var/lib/apt/lists/*
RUN pip install --disable-pip-version-check --no-cache-dir --upgrade cryptography azure-cli==${AZCLI_VERSION}
ENV AZCLI_VERSION=v0.1.2
RUN curl -sLo /usr/local/bin/az https://github.com/carolynvs/az-cli/releases/download/$AZCLI_VERSION/az-linux-amd64 && \
chmod +x /usr/local/bin/az

# Create the full dir tree that we'll mount our src into when we run the image
RUN mkdir -p /go/src/github.com/kubernetes-incubator/service-catalog
Expand Down
27 changes: 27 additions & 0 deletions vendor/golang.org/x/lint/LICENSE

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

159 changes: 159 additions & 0 deletions vendor/golang.org/x/lint/golint/golint.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 2e42663

Please sign in to comment.