mirror of
				https://github.com/optim-enterprises-bv/kubernetes.git
				synced 2025-11-04 12:18:16 +00:00 
			
		
		
		
	fix build
This commit is contained in:
		@@ -44,7 +44,7 @@ RUN mkdir -p /usr/local/src/etcd &&\
 | 
			
		||||
# Mark this as a kube-build container
 | 
			
		||||
RUN touch /kube-build-image
 | 
			
		||||
 | 
			
		||||
WORKDIR /go/src/github.com/GoogleCloudPlatform/kubernetes
 | 
			
		||||
WORKDIR /go/src/k8s.io/kubernetes
 | 
			
		||||
 | 
			
		||||
# Propagate the git tree version into the build image
 | 
			
		||||
ADD kube-version-defs /kube-version-defs
 | 
			
		||||
@@ -54,4 +54,4 @@ ENV KUBE_GIT_VERSION_FILE /kube-version-defs
 | 
			
		||||
ENV KUBE_OUTPUT_SUBPATH _output/dockerized
 | 
			
		||||
 | 
			
		||||
# Upload Kubernetes source
 | 
			
		||||
ADD kube-source.tar.gz /go/src/github.com/GoogleCloudPlatform/kubernetes
 | 
			
		||||
ADD kube-source.tar.gz /go/src/k8s.io/kubernetes
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										2
									
								
								hack/lib/golang.sh
									
									
									
									
									
										
										
										Normal file → Executable file
									
								
							
							
						
						
									
										2
									
								
								hack/lib/golang.sh
									
									
									
									
									
										
										
										Normal file → Executable file
									
								
							@@ -15,7 +15,7 @@
 | 
			
		||||
# limitations under the License.
 | 
			
		||||
 | 
			
		||||
# The golang package that we are building.
 | 
			
		||||
readonly KUBE_GO_PACKAGE=github.com/GoogleCloudPlatform/kubernetes
 | 
			
		||||
readonly KUBE_GO_PACKAGE=k8s.io/kubernetes
 | 
			
		||||
readonly KUBE_GOPATH="${KUBE_OUTPUT}/go"
 | 
			
		||||
 | 
			
		||||
# Load contrib target functions
 | 
			
		||||
 
 | 
			
		||||
@@ -17,6 +17,7 @@ before_install:
 | 
			
		||||
  - if [[ $SHIPPABLE_GO_VERSION == *release* ]]; then gvm install release; gvm use release; fi
 | 
			
		||||
  - if [[ $SHIPPABLE_GO_VERSION =~ [0-9].[0-9] ]]; then gvm install go$SHIPPABLE_GO_VERSION; gvm use go$SHIPPABLE_GO_VERSION; fi
 | 
			
		||||
  - export GOPATH=$SHIPPABLE_GOPATH
 | 
			
		||||
  - mkdir -p /root/workspace/src/k8s.io; mv /root/workspace/src/github.com/GoogleCloudPlatform/kubernetes /root/workspace/src/k8s.io/kubernetes
 | 
			
		||||
 | 
			
		||||
install:
 | 
			
		||||
  - go get golang.org/x/tools/cmd/cover
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user