Merge branch 'master' into ilyaz/bump_mk_version
commit
be535b4739
|
|
@ -693,6 +693,10 @@ jobs:
|
|||
echo "--------------------------"
|
||||
docker ps || true
|
||||
echo "--------------------------"
|
||||
whoami || true
|
||||
echo "--------------------------"
|
||||
hostname || true
|
||||
echo "--------------------------"
|
||||
# go 1.14.6+ is needed because of this bug https://github.com/golang/go/issues/39308
|
||||
- uses: actions/setup-go@v2
|
||||
with:
|
||||
|
|
|
|||
|
|
@ -692,7 +692,10 @@ jobs:
|
|||
echo "--------------------------"
|
||||
docker ps || true
|
||||
echo "--------------------------"
|
||||
|
||||
whoami || true
|
||||
echo "--------------------------"
|
||||
hostname || true
|
||||
echo "--------------------------"
|
||||
# go 1.14.6+ is needed because of this bug https://github.com/golang/go/issues/39308
|
||||
- uses: actions/setup-go@v2
|
||||
with:
|
||||
|
|
|
|||
2
Makefile
2
Makefile
|
|
@ -51,7 +51,7 @@ HYPERKIT_BUILD_IMAGE ?= karalabe/xgo-1.12.x
|
|||
#
|
||||
# TODO: See https://github.com/kubernetes/minikube/issues/10276
|
||||
#BUILD_IMAGE ?= us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:v$(GO_VERSION)-1
|
||||
BUILD_IMAGE ?= golang:1.16beta1-buster
|
||||
BUILD_IMAGE ?= golang:1.16-rc-buster
|
||||
#
|
||||
|
||||
ISO_BUILD_IMAGE ?= $(REGISTRY)/buildroot-image
|
||||
|
|
|
|||
|
|
@ -58,7 +58,6 @@ BR2_PACKAGE_OPENVMTOOLS=y
|
|||
BR2_PACKAGE_SYSTEMD_LOGIND=y
|
||||
BR2_PACKAGE_SYSTEMD_MACHINED=y
|
||||
BR2_PACKAGE_SYSTEMD_VCONSOLE=y
|
||||
BR2_PACKAGE_UTIL_LINUX_LOSETUP=y
|
||||
BR2_PACKAGE_UTIL_LINUX_NSENTER=y
|
||||
BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS=y
|
||||
BR2_TARGET_ROOTFS_CPIO=y
|
||||
|
|
|
|||
Loading…
Reference in New Issue