Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update kvm docker machine base image #15628

Merged
merged 7 commits into from
Jan 12, 2023
Merged

Update kvm docker machine base image #15628

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
00bf049
update kvm docker machine base image
spowelljr Jan 11, 2023
c4503c2
add debugging
spowelljr Jan 11, 2023
1ac1e86
more debugging
spowelljr Jan 11, 2023
a7554d3
even more debugging
spowelljr Jan 11, 2023
f1090b9
remove ls on non-existing folder
spowelljr Jan 11, 2023
bf77c2a
remove debugging and add docker cleanup
spowelljr Jan 11, 2023
d748136
remove last debugging code
spowelljr Jan 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .github/workflows/functional_verified.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,14 @@ jobs:
sudo apt-get update
sudo apt-get install -y libvirt-dev
MINIKUBE_BUILD_IN_DOCKER=y make cross e2e-cross debs
strings out/docker-machine-driver-kvm2-amd64 | grep ^LIBVIRT | sort
shasum -a 256 out/docker-machine-driver-kvm2-amd64
ls -la ./out
cp -r test/integration/testdata ./out
strings out/docker-machine-driver-kvm2-amd64 | grep ^LIBVIRT | sort
shasum -a 256 out/docker-machine-driver-kvm2-amd64
ls -la ./out
shasum -a 256 out/minikube-linux-amd64
- uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce
with:
name: minikube_binaries
Expand Down
10 changes: 6 additions & 4 deletions Makefile
View file
Open in desktop
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,17 @@ 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"
strings $@ | grep ^LIBVIRT | sort
shasum -a 256 $@
else
$(if $(quiet),@echo " GO $@")
uname -a
$(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
2 changes: 1 addition & 1 deletion installers/linux/kvm/Dockerfile.amd64
View file
Open in desktop
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