Update Go to 1.14.2
This commit is contained in:
parent
e87ddedc73
commit
d1de9051e8
5 changed files with 6 additions and 5 deletions
|
@ -67,7 +67,7 @@ echo ${docker_password} | docker login -u ${docker_username} --password-stdin qu
|
||||||
curl -sL -o /usr/local/bin/gimme https://raw.githubusercontent.com/travis-ci/gimme/master/gimme
|
curl -sL -o /usr/local/bin/gimme https://raw.githubusercontent.com/travis-ci/gimme/master/gimme
|
||||||
chmod +x /usr/local/bin/gimme
|
chmod +x /usr/local/bin/gimme
|
||||||
|
|
||||||
eval "$(gimme 1.14.1)"
|
eval "$(gimme 1.14.2)"
|
||||||
|
|
||||||
export GOPATH="/tmp/go"
|
export GOPATH="/tmp/go"
|
||||||
|
|
||||||
|
|
|
@ -70,7 +70,7 @@ echo ${docker_password} | docker login -u ${docker_username} --password-stdin qu
|
||||||
curl -sL -o /usr/local/bin/gimme https://raw.githubusercontent.com/travis-ci/gimme/master/gimme
|
curl -sL -o /usr/local/bin/gimme https://raw.githubusercontent.com/travis-ci/gimme/master/gimme
|
||||||
chmod +x /usr/local/bin/gimme
|
chmod +x /usr/local/bin/gimme
|
||||||
|
|
||||||
eval "$(gimme 1.14.1)"
|
eval "$(gimme 1.14.2)"
|
||||||
|
|
||||||
git clone https://github.com/kubernetes/ingress-nginx
|
git clone https://github.com/kubernetes/ingress-nginx
|
||||||
|
|
||||||
|
|
|
@ -45,6 +45,7 @@ RUN apt-get update \
|
||||||
ARG K8S_RELEASE
|
ARG K8S_RELEASE
|
||||||
ARG ETCD_VERSION
|
ARG ETCD_VERSION
|
||||||
ARG KIND_VERSION
|
ARG KIND_VERSION
|
||||||
|
ARG GO_VERSION
|
||||||
|
|
||||||
RUN curl -sSL https://storage.googleapis.com/kubernetes-release/release/${K8S_RELEASE}/bin/linux/amd64/kubectl -o /usr/local/bin/kubectl \
|
RUN curl -sSL https://storage.googleapis.com/kubernetes-release/release/${K8S_RELEASE}/bin/linux/amd64/kubectl -o /usr/local/bin/kubectl \
|
||||||
&& chmod +x /usr/local/bin/kubectl
|
&& chmod +x /usr/local/bin/kubectl
|
||||||
|
@ -62,7 +63,6 @@ RUN curl -sSL https://github.com/kubernetes-sigs/kind/releases/download/${KIND_V
|
||||||
&& chmod +x /usr/local/bin/kind
|
&& chmod +x /usr/local/bin/kind
|
||||||
|
|
||||||
# install go
|
# install go
|
||||||
ENV GO_VERSION 1.14.1
|
|
||||||
ENV GO_TARBALL "go${GO_VERSION}.linux-amd64.tar.gz"
|
ENV GO_TARBALL "go${GO_VERSION}.linux-amd64.tar.gz"
|
||||||
RUN wget -q "https://storage.googleapis.com/golang/${GO_TARBALL}" \
|
RUN wget -q "https://storage.googleapis.com/golang/${GO_TARBALL}" \
|
||||||
&& tar xzf "${GO_TARBALL}" -C /usr/local \
|
&& tar xzf "${GO_TARBALL}" -C /usr/local \
|
||||||
|
|
|
@ -13,6 +13,7 @@ docker-build:
|
||||||
--build-arg K8S_RELEASE=v1.17.0 \
|
--build-arg K8S_RELEASE=v1.17.0 \
|
||||||
--build-arg ETCD_VERSION=v3.3.18 \
|
--build-arg ETCD_VERSION=v3.3.18 \
|
||||||
--build-arg KIND_VERSION=v0.7.0 \
|
--build-arg KIND_VERSION=v0.7.0 \
|
||||||
|
--build-arg GOLANG_VERSION=1.14.2 \
|
||||||
-t $(IMAGE):$(TAG) .
|
-t $(IMAGE):$(TAG) .
|
||||||
|
|
||||||
docker-push:
|
docker-push:
|
||||||
|
|
|
@ -26,8 +26,8 @@ docker-build:
|
||||||
--progress plain \
|
--progress plain \
|
||||||
--build-arg K8S_RELEASE=v1.15.7 \
|
--build-arg K8S_RELEASE=v1.15.7 \
|
||||||
--build-arg ETCD_VERSION=v3.3.18 \
|
--build-arg ETCD_VERSION=v3.3.18 \
|
||||||
--build-arg GOLANG_VERSION=1.14.1 \
|
--build-arg GOLANG_VERSION=1.14.2 \
|
||||||
--build-arg GOLANG_SHA=2ad2572115b0d1b4cb4c138e6b3a31cee6294cb48af75ee86bec3dca04507676 \
|
--build-arg GOLANG_SHA=98de84e69726a66da7b4e58eac41b99cbe274d7e8906eeb8a5b7eb0aadee7f7c \
|
||||||
--build-arg RESTY_CLI_VERSION=0.25rc2 \
|
--build-arg RESTY_CLI_VERSION=0.25rc2 \
|
||||||
--build-arg RESTY_CLI_SHA=a38d850441384fa037a5922ca012dcce8708d0e4abe34ad2fe4164a01b28bdfb \
|
--build-arg RESTY_CLI_SHA=a38d850441384fa037a5922ca012dcce8708d0e4abe34ad2fe4164a01b28bdfb \
|
||||||
--build-arg CHART_TESTING_VERSION=3.0.0-beta.1 \
|
--build-arg CHART_TESTING_VERSION=3.0.0-beta.1 \
|
||||||
|
|
Loading…
Reference in a new issue