Skip to content

Commit d392d17

Browse files
committed
Force docker builds for cross builds
1 parent 993a53f commit d392d17

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

Diff for: Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ REGISTRY?=gcr.io/k8s-minikube
2424

2525
MINIKUBE_BUILD_IMAGE ?= karalabe/xgo-1.8.3
2626
LOCALKUBE_BUILD_IMAGE ?= gcr.io/google_containers/kube-cross:v1.7.1-0
27-
ISO_BUILD_IMAGE ?= $(REGISTRY)/buildroot-image
27+
ISO_BUILD_IMAGE ?= $(REGISTRY)/buildroot-image
2828

2929
ISO_VERSION ?= v0.20.0
3030
ISO_BUCKET ?= minikube/iso

Diff for: docs/contributors/releasing_minikube.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Send a PR for the Makefile change and wait until it is merged. Once the commit
4040
Run this command:
4141

4242
```shell
43-
make cross checksum
43+
BUILD_IN_DOCKER=y make cross checksum
4444
```
4545

4646
## Add the version to the releases.json file

Diff for: hack/jenkins/minikube_cross_build_and_upload.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ fi
3838
export GOPATH=~/go
3939

4040
# Build all platforms (Windows, Linux, OSX)
41-
make cross
41+
BUILD_IN_DOCKER=y make cross
4242

4343
# Build the e2e test target for Darwin and Linux. We don't run tests on Windows yet.
4444
# We build these on Linux, but run the tests on different platforms.

Diff for: hack/jenkins/release_build_and_upload.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ cat Makefile | grep "VERSION_MINOR ?=" | grep $VERSION_MINOR
3838
cat Makefile | grep "VERSION_BUILD ?=" | grep $VERSION_BUILD
3939

4040
# Build and upload
41-
make cross checksum
41+
BUILD_IN_DOCKER=y make cross checksum
4242

4343
gsutil cp out/minikube-linux-amd64 gs://$BUCKET/releases/$TAGNAME/
4444
gsutil cp out/minikube-linux-amd64.sha256 gs://$BUCKET/releases/$TAGNAME/

0 commit comments

Comments
 (0)