Skip to content

Commit 709c2fe

Browse files
medyaghmedyagh
authored
Merge pull request #21724 from obnoxxx/fix-crio-kicbase
Kicbase: fix docker driver with crio runtime: install dbus
2 parents 334eee9 + cdde98f commit 709c2fe

File tree

4 files changed

+13
-7
lines changed

4 files changed

+13
-7
lines changed

‎deploy/kicbase/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ RUN echo "Ensuring scripts are executable ..." \
9191
&& chmod +x /usr/local/bin/clean-install /usr/local/bin/entrypoint \
9292
&& echo "Installing Packages ..." \
9393
&& DEBIAN_FRONTEND=noninteractive clean-install \
94-
systemd \
94+
systemd dbus \
9595
conntrack iptables iproute2 ethtool socat util-linux mount ebtables udev kmod \
9696
libseccomp2 pigz \
9797
bash ca-certificates curl rsync \

‎hack/kicbase_version/os-package-list.txt‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,19 @@ ii ca-certificates 20230311+deb12u1 all
1616
ii catatonit 0.1.7-1+b2 amd64 init process for containers
1717
ii conmon 2.1.6+ds1-1 amd64 OCI container runtime monitor
1818
ii conntrack 1:1.4.7-1+b2 amd64 Program to modify the conntrack tables
19-
ii containerd.io 1.7.28-0~debian.12~bookworm amd64 An open and reliable container runtime
19+
ii containerd.io 1.7.28-1~debian.12~bookworm amd64 An open and reliable container runtime
2020
ii containernetworking-plugins 1.1.1+ds1-3+b5 amd64 standard networking plugins - binaries
2121
ii coreutils 9.1-1 amd64 GNU core utilities
2222
ii cri-o 1.34.1-1.1 amd64 Open Container Initiative-based implementation of Kubernetes Container Runtime Interface
2323
ii criu 4.1.1-3 amd64 checkpoint and restore in userspace
2424
ii crun 100:1.2-2 amd64 OCI runtime written in C
2525
ii curl 7.88.1-10+deb12u14 amd64 command line tool for transferring data with URL syntax
2626
ii dash 0.5.12-2 amd64 POSIX-compliant shell
27+
ii dbus 1.14.10-1~deb12u1 amd64 simple interprocess messaging system (system message bus)
28+
ii dbus-bin 1.14.10-1~deb12u1 amd64 simple interprocess messaging system (command line utilities)
29+
ii dbus-daemon 1.14.10-1~deb12u1 amd64 simple interprocess messaging system (reference message bus)
30+
ii dbus-session-bus-common 1.14.10-1~deb12u1 all simple interprocess messaging system (session bus configuration)
31+
ii dbus-system-bus-common 1.14.10-1~deb12u1 all simple interprocess messaging system (system bus configuration)
2732
ii debconf 1.5.82 all Debian configuration management system
2833
ii debian-archive-keyring 2023.3+deb12u2 all GnuPG archive keys of the Debian archive
2934
ii debianutils 5.7-0.5~deb12u1 amd64 Miscellaneous utilities specific to Debian
@@ -32,8 +37,8 @@ ii dirmngr 2.2.40-1.1+deb12u1 amd64
3237
ii dmsetup 2:1.02.185-2 amd64 Linux Kernel Device Mapper userspace library
3338
ii dnsutils 1:9.18.33-1~deb12u2 all Transitional package for bind9-dnsutils
3439
ii docker-buildx-plugin 0.29.1-1~debian.12~bookworm amd64 Docker Buildx plugin extends build capabilities with BuildKit.
35-
ii docker-ce 5:28.5.0-1~debian.12~bookworm amd64 Docker: the open-source application container engine
36-
ii docker-ce-cli 5:28.5.0-1~debian.12~bookworm amd64 Docker CLI: the open-source application container engine
40+
ii docker-ce 5:28.5.1-1~debian.12~bookworm amd64 Docker: the open-source application container engine
41+
ii docker-ce-cli 5:28.5.1-1~debian.12~bookworm amd64 Docker CLI: the open-source application container engine
3742
ii dpkg 1.21.22 amd64 Debian package management system
3843
ii e2fsprogs 1.47.0-2+b2 amd64 ext2/ext3/ext4 file system utilities
3944
ii ebtables 2.0.11-5 amd64 Ethernet bridge frame table administration
@@ -85,6 +90,7 @@ ii libcrypt1:amd64 1:4.4.33-2 amd64
8590
ii libcryptsetup12:amd64 2:2.6.1-4~deb12u2 amd64 disk encryption support - shared library
8691
ii libcurl4:amd64 7.88.1-10+deb12u14 amd64 easy-to-use client-side URL transfer library (OpenSSL flavour)
8792
ii libdb5.3:amd64 5.3.28+dfsg2-1 amd64 Berkeley v5.3 Database Libraries [runtime]
93+
ii libdbus-1-3:amd64 1.14.10-1~deb12u1 amd64 simple interprocess messaging system (library)
8894
ii libdebconfclient0:amd64 0.270 amd64 Debian Configuration Management System (C-implementation library)
8995
ii libdevmapper1.02.1:amd64 2:1.02.185-2 amd64 Linux Kernel Device Mapper userspace library
9096
ii libedit2:amd64 3.1-20221030-2 amd64 BSD editline and history libraries

‎pkg/drivers/kic/types.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ import (
2424

2525
const (
2626
// Version is the current version of kic
27-
Version = "v0.0.48-1759745255-21703"
27+
Version = "v0.0.48-1760363564-21724"
2828

2929
// SHA of the kic base image
30-
baseImageSHA = "cb5cd2ea26aaf2d64a5ec385670af2f770e759461e4b662fd7a8fae305b74c92"
30+
baseImageSHA = "3d243c9fb0952e24526c917e5809c5ed926108eae97e8156b6e33fc1d2564225"
3131
// The name of the GCR kicbase repository
3232
gcrRepo = "gcr.io/k8s-minikube/kicbase-builds"
3333
// The name of the Dockerhub kicbase repository

‎site/content/en/docs/commands/start.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ minikube start [flags]
2727
--apiserver-port int The apiserver listening port (default 8443)
2828
--auto-pause-interval duration Duration of inactivity before the minikube VM is paused (default 1m0s) (default 1m0s)
2929
--auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true)
30-
--base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.48-1759745255-21703@sha256:cb5cd2ea26aaf2d64a5ec385670af2f770e759461e4b662fd7a8fae305b74c92")
30+
--base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.48-1760363564-21724@sha256:3d243c9fb0952e24526c917e5809c5ed926108eae97e8156b6e33fc1d2564225")
3131
--binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from.
3232
--cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true)
3333
--cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s)

0 commit comments

Comments
 (0)