Update kic to v0.0.10, upgrade crio and podman so that the kic base image builds
parent
80b331c6cd
commit
3ae85a1f62
|
@ -0,0 +1,8 @@
|
|||
{
|
||||
"exec-opts": ["native.cgroupdriver=systemd"],
|
||||
"log-driver": "json-file",
|
||||
"log-opts": {
|
||||
"max-size": "100m"
|
||||
},
|
||||
"storage-driver": "overlay2"
|
||||
}
|
|
@ -15,17 +15,26 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
|
|||
# libglib2.0-0 is required for conmon, which is required for podman
|
||||
libglib2.0-0=2.62.1-1 \
|
||||
&& rm /etc/crictl.yaml
|
||||
|
||||
# install cri-o based on https://github.com/cri-o/cri-o/commit/96b0c34b31a9fc181e46d7d8e34fb8ee6c4dc4e1#diff-04c6e90faac2675aa89e2176d2eec7d8R128
|
||||
ENV CRIO_VERSION="1.17=1.17.3~2"
|
||||
RUN sh -c "echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_19.10/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list" && \
|
||||
curl -LO https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/xUbuntu_19.10/Release.key && \
|
||||
apt-key add - < Release.key && apt-get update && \
|
||||
apt-get install -y --no-install-recommends cri-o-1.17=1.17.2~1
|
||||
apt-get install -y --no-install-recommends cri-o-${CRIO_VERSION}
|
||||
|
||||
# install podman
|
||||
RUN apt-get install -y --no-install-recommends podman=1.8.2~144
|
||||
ENV PODMAN_VERSION=1.9.0~2
|
||||
RUN apt-get install -y --no-install-recommends podman=${PODMAN_VERSION}
|
||||
|
||||
# disable non-docker runtimes by default
|
||||
RUN systemctl disable containerd && systemctl disable crio && rm /etc/crictl.yaml
|
||||
|
||||
# copy over docker daemon config which sets cgroup manager to systemd
|
||||
COPY hack/images/daemon.json /etc/docker/daemon.json
|
||||
# enable docker which is default
|
||||
RUN systemctl enable docker
|
||||
|
||||
# making SSH work for docker container
|
||||
# based on https://github.com/rastasheep/ubuntu-sshd/blob/master/18.04/Dockerfile
|
||||
RUN mkdir /var/run/sshd
|
||||
|
|
|
@ -30,9 +30,9 @@ const (
|
|||
DefaultPodCIDR = "10.244.0.0/16"
|
||||
|
||||
// Version is the current version of kic
|
||||
Version = "v0.0.9"
|
||||
Version = "v0.0.10"
|
||||
// SHA of the kic base image
|
||||
baseImageSHA = "82a826cc03c3e59ead5969b8020ca138de98f366c1907293df91fc57205dbb53"
|
||||
baseImageSHA = "d591f4ef60f4c48f2d6fddfefa88213e81d8be505d3b663cc764326a59cd0c31"
|
||||
// OverlayImage is the cni plugin used for overlay image, created by kind.
|
||||
// CNI plugin image used for kic drivers created by kind.
|
||||
OverlayImage = "kindest/kindnetd:0.5.4"
|
||||
|
|
Loading…
Reference in New Issue