Merge pull request #28 from jandubois/remove-cri-dockerd

Remove cri-dockerd from the distro

Author: mook-as

Dockerfile

@@ -20,7 +20,6 @@ RUN --mount=type=cache,target=/root/.cache/go-build --mount=type=cache,target=/g
 FROM registry.opensuse.org/opensuse/bci/kiwi:10 AS builder
 ARG type=qcow2
 ARG NERDCTL_VERSION
-ARG CRI_DOCKERD_VERSION
 RUN --mount=type=cache,target=/var/cache/zypp \
     zypper --non-interactive install parted
 WORKDIR /build

Makefile

@@ -15,17 +15,6 @@ root/build/nerdctl-$(NERDCTL_VERSION).tgz:
 	wget -O "$@" \
 		"https://github.com/$(NERDCTL_REPO)/releases/download/${NERDCTL_VERSION}/nerdctl-full-${NERDCTL_VERSION:v%=%}-linux-$(GOARCH).tar.gz"
 
-DOWNLOADS += root/build/cri-dockerd-$(CRI_DOCKERD_VERSION).tgz
-root/build/cri-dockerd-$(CRI_DOCKERD_VERSION).tgz: root/build/cri-dockerd-$(CRI_DOCKERD_VERSION).LICENSE
-	wget -O "$@" \
-		"https://github.com/$(CRI_DOCKERD_REPO)/releases/download/${CRI_DOCKERD_VERSION}/cri-dockerd-${CRI_DOCKERD_VERSION:v%=%}.$(GOARCH).tgz"
-	touch -r $@ $<
-
-DOWNLOADS += root/build/cri-dockerd-$(CRI_DOCKERD_VERSION).LICENSE
-root/build/cri-dockerd-$(CRI_DOCKERD_VERSION).LICENSE:
-	wget -O "$@" \
-		"https://raw.githubusercontent.com/$(CRI_DOCKERD_REPO)/$(CRI_DOCKERD_VERSION)/LICENSE"
-
 IMAGE_FILES := \
 	root/build/versions.env \
 	$(filter-out .gitignore Makefile README.md root/build/% distro.%, $(shell find * -type f))

Makefile.docker

@@ -11,8 +11,6 @@ GO_ARCH := $(ARCH:x86_64=amd64)
 GO_ARCH := $(GO_ARCH:aarch64=arm64)
 
 INPUTS += root/build/nerdctl-$(NERDCTL_VERSION).tgz
-INPUTS += root/build/cri-dockerd-$(CRI_DOCKERD_VERSION).tgz
-INPUTS += root/build/cri-dockerd-$(CRI_DOCKERD_VERSION).LICENSE
 
 rancher-desktop-distro.%.qcow2: config.kiwi config.sh ${INPUTS}
 	kiwi --debug --profile=lima system build \

config.sh

@@ -52,13 +52,6 @@ exec /usr/local/libexec/nerdctl/nerdctl "\$@"
 EOF
 chmod 755 /usr/local/bin/nerdctl
 
-# Install cri-dockerd
-tar --extract --verbose --file "build/cri-dockerd-${CRI_DOCKERD_VERSION}.tgz" \
-    --directory /usr/local/bin/ --strip-components=1 cri-dockerd/cri-dockerd
-# Copy the LICENSE file for cri-dockerd
-mkdir -p /usr/share/doc/cri-dockerd/
-cp "build/cri-dockerd-${CRI_DOCKERD_VERSION}.LICENSE" /usr/share/doc/cri-dockerd/LICENSE
-
 # Remove the build inputs
 rm -rf /build/
 

root/build/versions.env

@@ -4,5 +4,3 @@
 
 NERDCTL_REPO=containerd/nerdctl
 NERDCTL_VERSION=v2.0.3
-CRI_DOCKERD_REPO=Mirantis/cri-dockerd
-CRI_DOCKERD_VERSION=v0.3.15