Skip to content

Commit

Permalink
Merge pull request #15628 from spowelljr/updateKVMDockerMachineBaseImage
Browse files Browse the repository at this point in the history
Update kvm docker machine base image
  • Loading branch information
spowelljr committed Jan 12, 2023
2 parents 22db818 + d748136 commit 7c75349
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
7 changes: 3 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -901,7 +901,7 @@ else
-buildvcs=false \
-installsuffix "static" \
-ldflags="$(KVM2_LDFLAGS)" \
-tags "libvirt.1.3.1 without_lxc" \
-tags "libvirt_without_lxc" \
-o $@ \
k8s.io/minikube/cmd/drivers/kvm
endif
Expand All @@ -911,15 +911,14 @@ out/docker-machine-driver-kvm2-%:
ifeq ($(MINIKUBE_BUILD_IN_DOCKER),y)
docker image inspect -f '{{.Id}} {{.RepoTags}}' $(KVM_BUILD_IMAGE_AMD64) || $(MAKE) kvm-image-amd64
$(call DOCKER,$(KVM_BUILD_IMAGE_AMD64),/usr/bin/make $@ COMMIT=$(COMMIT))
# make extra sure that we are linking with the older version of libvirt (1.3.1)
test "`strings $@ | grep '^LIBVIRT_[0-9]' | sort | tail -n 1`" = "LIBVIRT_1.2.9"
else
$(if $(quiet),@echo " GO $@")
$(Q)GOARCH=$* \
go build \
-buildvcs=false \
-installsuffix "static" \
-ldflags="$(KVM2_LDFLAGS)" \
-tags "libvirt.1.3.1 without_lxc" \
-tags "libvirt_without_lxc" \
-o $@ \
k8s.io/minikube/cmd/drivers/kvm
endif
Expand Down
1 change: 1 addition & 0 deletions hack/jenkins/minikube_cross_build_and_upload.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ declare -rx DEB_VER="$(make deb_version)"

docker kill $(docker ps -q) || true
docker rm $(docker ps -aq) || true
docker system prune -a --volumes -f
make -j 16 \
all \
minikube-darwin-arm64 \
Expand Down
2 changes: 1 addition & 1 deletion installers/linux/kvm/Dockerfile.amd64
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM gcr.io/gcp-runtimes/ubuntu_16_0_4
FROM gcr.io/gcp-runtimes/ubuntu_20_0_4

RUN apt-get update && apt-get install -y --no-install-recommends \
gcc \
Expand Down

0 comments on commit 7c75349

Please sign in to comment.