mirror of
				https://github.com/optim-enterprises-bv/kubernetes.git
				synced 2025-11-04 04:08:16 +00:00 
			
		
		
		
	Update to golang@1.13.5
Signed-off-by: ialidzhikov <i.alidjikov@gmail.com>
This commit is contained in:
		@@ -15,7 +15,7 @@
 | 
				
			|||||||
# This file creates a standard build environment for building cross
 | 
					# This file creates a standard build environment for building cross
 | 
				
			||||||
# platform go binary for the architecture kubernetes cares about.
 | 
					# platform go binary for the architecture kubernetes cares about.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
FROM golang:1.13.4
 | 
					FROM golang:1.13.5
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ENV GOARM 7
 | 
					ENV GOARM 7
 | 
				
			||||||
ENV KUBE_DYNAMIC_CROSSPLATFORMS \
 | 
					ENV KUBE_DYNAMIC_CROSSPLATFORMS \
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1 +1 @@
 | 
				
			|||||||
v1.13.4-1
 | 
					v1.13.5-1
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -32,7 +32,7 @@ dependencies:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  - name: "golang"
 | 
					  - name: "golang"
 | 
				
			||||||
    version: 1.13.4
 | 
					    version: 1.13.5
 | 
				
			||||||
    refPaths:
 | 
					    refPaths:
 | 
				
			||||||
    - path: build/build-image/cross/Dockerfile
 | 
					    - path: build/build-image/cross/Dockerfile
 | 
				
			||||||
      match: "golang:"
 | 
					      match: "golang:"
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -44,8 +44,8 @@ http_archive(
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
http_archive(
 | 
					http_archive(
 | 
				
			||||||
    name = "io_bazel_rules_go",
 | 
					    name = "io_bazel_rules_go",
 | 
				
			||||||
    sha256 = "9976c2572587aa71f81b502cc870ef8058f6de37f5fcfaade6a5996934b4a324",
 | 
					    sha256 = "a391df56b95d4721004b10cd3fcc63ad4cc8fb2ce165453d1b78ce59162afe29",
 | 
				
			||||||
    urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/v0.19.8/rules_go-v0.19.8.tar.gz"),
 | 
					    urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/v0.19.9/rules_go-v0.19.9.tar.gz"),
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
 | 
					load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
 | 
				
			||||||
@@ -53,7 +53,7 @@ load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_depe
 | 
				
			|||||||
go_rules_dependencies()
 | 
					go_rules_dependencies()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
go_register_toolchains(
 | 
					go_register_toolchains(
 | 
				
			||||||
    go_version = "1.13.4",
 | 
					    go_version = "1.13.5",
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
http_archive(
 | 
					http_archive(
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -17,7 +17,7 @@ include  ../../hack/make-rules/Makefile.manifest
 | 
				
			|||||||
REGISTRY ?= gcr.io/kubernetes-e2e-test-images
 | 
					REGISTRY ?= gcr.io/kubernetes-e2e-test-images
 | 
				
			||||||
GOARM ?= 7
 | 
					GOARM ?= 7
 | 
				
			||||||
QEMUVERSION=v2.9.1
 | 
					QEMUVERSION=v2.9.1
 | 
				
			||||||
GOLANG_VERSION=1.13.4
 | 
					GOLANG_VERSION=1.13.5
 | 
				
			||||||
export
 | 
					export
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ifndef WHAT
 | 
					ifndef WHAT
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -12,7 +12,7 @@
 | 
				
			|||||||
# See the License for the specific language governing permissions and
 | 
					# See the License for the specific language governing permissions and
 | 
				
			||||||
# limitations under the License.
 | 
					# limitations under the License.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
FROM k8s.gcr.io/kube-cross:v1.13.4-1 as build_k8s_1_17_sample_apiserver
 | 
					FROM k8s.gcr.io/kube-cross:v1.13.5-1 as build_k8s_1_17_sample_apiserver
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ENV GOPATH /go
 | 
					ENV GOPATH /go
 | 
				
			||||||
RUN mkdir -p ${GOPATH}/src ${GOPATH}/bin
 | 
					RUN mkdir -p ${GOPATH}/src ${GOPATH}/bin
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user