forked from kubernetes/dashboard
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Bump golang 1.12.6 to 1.13.6 (kubernetes#4913)
Since latest Kubernetes 1.17.3 supports golang 1.13.6, dashboard also supports same version. Also, bump followings: - k8s related modules 0.17.2 to 0.17.3 - prometheus prometheus/client_golang 0.9.2 to 1.4.1 - golangci-lint 1.22.2 to 1.23.6
- Loading branch information
Showing
11 changed files
with
165 additions
and
190 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -19,7 +19,7 @@ | |
|
||
# golang is based on debian:jessie | ||
# Specify version to clarify which version we use. | ||
FROM golang:1.12 | ||
FROM golang:1.13-buster | ||
|
||
# Install Node.js. Go is already installed. | ||
# A small tweak, apt-get update is already run by the nodejs setup script, | ||
|
@@ -31,27 +31,17 @@ RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - \ | |
chromium \ | ||
bc \ | ||
sudo \ | ||
git \ | ||
gosu \ | ||
nano \ | ||
less \ | ||
unzip \ | ||
libssl-dev \ | ||
libghc-zlib-dev \ | ||
libcurl4-gnutls-dev \ | ||
libexpat1-dev \ | ||
gettext \ | ||
xvfb \ | ||
libgtk-3-0 \ | ||
libgconf-2-4 \ | ||
bzip2 \ | ||
&& rm -rf /var/lib/apt/lists/* \ | ||
&& apt-get clean | ||
|
||
# Re-install git | ||
# NOTE(shu-muto): husky-3.x requires git>=2.13.2 but golang:1.12 image based on debian 9 (stretch) | ||
# does not satisfy the requirement. Its git version is 2.11.0. | ||
# So re-install specified version of git from source code. | ||
RUN GIT_VERSION=2.22.0 && apt-get remove -y git && cd /tmp && rm -fr git* && wget https://github.com/git/git/archive/v${GIT_VERSION}.zip -O git.zip && unzip git.zip && mv git-${GIT_VERSION} git && cd git && make prefix=/usr all && make prefix=/usr install | ||
ENV GIT_EDITOR=nano | ||
|
||
# Install firefox from Mozilla binaries | ||
|
@@ -60,9 +50,6 @@ RUN wget "https://download.mozilla.org/?product=firefox-latest-ssl&os=linux64&la | |
RUN tar -xjf /tmp/firefox.tar.bz2 -C /usr/local/lib | ||
RUN ln -s /usr/local/lib/firefox/firefox /usr/local/bin/firefox | ||
|
||
# Install dependencies. This will take a while. | ||
RUN npm install -g npm@latest [email protected] @angular/[email protected] ngx-i18nsupport | ||
|
||
# Set environment variable for JavaScript tests. | ||
ENV CHROME_BIN=/usr/bin/chromium | ||
|
||
|
@@ -102,10 +89,6 @@ RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.s | |
# Install delve for debuging go files. | ||
RUN go get github.com/go-delve/delve/cmd/dlv | ||
|
||
# Install code-generator. `go get` rises error, use `git clone` instead. | ||
RUN mkdir -p /go/src/k8s.io | ||
RUN git clone https://github.com/kubernetes/code-generator /go/src/k8s.io/code-generator | ||
|
||
# Enable go mod. Note(shu-mutou): do not set this before `go get` | ||
ENV GO111MODULE=on | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,31 +1,23 @@ | ||
module github.com/kubernetes/dashboard | ||
|
||
go 1.12 | ||
go 1.13 | ||
|
||
require ( | ||
github.com/docker/distribution v2.7.0+incompatible | ||
github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c // indirect | ||
github.com/elazarl/goproxy v0.0.0-20190421051319-9d40249d3c2f // indirect | ||
github.com/elazarl/goproxy/ext v0.0.0-20190421051319-9d40249d3c2f // indirect | ||
github.com/emicklei/go-restful v2.9.6+incompatible | ||
github.com/docker/distribution v2.7.1+incompatible | ||
github.com/emicklei/go-restful v2.11.2+incompatible | ||
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b | ||
github.com/googleapis/gnostic v0.2.0 // indirect | ||
github.com/igm/sockjs-go v2.0.1+incompatible // indirect | ||
github.com/imdario/mergo v0.3.6 // indirect | ||
github.com/opencontainers/go-digest v1.0.0-rc1 // indirect | ||
github.com/prometheus/client_golang v0.9.2 | ||
github.com/prometheus/common v0.0.0-20181218105931-67670fe90761 // indirect | ||
github.com/prometheus/procfs v0.0.0-20190102135031-14fa7590c24d // indirect | ||
github.com/prometheus/client_golang v1.4.1 | ||
github.com/spf13/pflag v1.0.5 | ||
golang.org/x/net v0.0.0-20191004110552-13f9640d40b9 | ||
golang.org/x/net v0.0.0-20200202094626-16171245cfb2 | ||
golang.org/x/text v0.3.2 | ||
gopkg.in/igm/sockjs-go.v2 v2.0.0 | ||
gopkg.in/square/go-jose.v2 v2.2.2 | ||
gopkg.in/yaml.v2 v2.2.4 | ||
k8s.io/api v0.17.2 | ||
k8s.io/apiextensions-apiserver v0.0.0-20190918161926-8f644eb6e783 | ||
k8s.io/apimachinery v0.17.2 | ||
k8s.io/client-go v0.17.2 | ||
k8s.io/code-generator v0.17.2 // indirect | ||
gopkg.in/igm/sockjs-go.v2 v2.0.1 | ||
gopkg.in/square/go-jose.v2 v2.4.1 | ||
gopkg.in/yaml.v2 v2.2.8 | ||
k8s.io/api v0.17.3 | ||
k8s.io/apiextensions-apiserver v0.17.3 | ||
k8s.io/apimachinery v0.17.3 | ||
k8s.io/client-go v0.17.3 | ||
k8s.io/heapster v1.5.4 | ||
) |
Oops, something went wrong.