Merge pull request #50 from Nino-K/cri-dockerd-alpine-lima

Adds cri-dockerd

Author: jandubois

.gitignore

@@ -5,3 +5,4 @@
 /std.yaml
 /nerdctl-*
 /qemu-*
+/cri-dockerd-*

Makefile

@@ -19,6 +19,7 @@ ARCH_ALIAS = $(shell echo "$(ARCH_ALIAS_$(ARCH))")
 
 NERDCTL_VERSION=0.17.1
 QEMU_VERSION=v6.1.0
+CRI_DOCKERD_VERSION=0.2.0
 BINFMT_IMAGE=tonistiigi/binfmt:qemu-$(QEMU_VERSION)
 
 .PHONY: mkimage
@@ -32,8 +33,8 @@ mkimage:
 		.
 
 .PHONY: iso
-iso: nerdctl-$(NERDCTL_VERSION)-$(ARCH) qemu-$(QEMU_VERSION)-copying
-	ALPINE_VERSION=$(ALPINE_VERSION) NERDCTL_VERSION=$(NERDCTL_VERSION) QEMU_VERSION=$(QEMU_VERSION) REPO_VERSION=$(REPO_VERSION) EDITION=$(EDITION) BUILD_ID=$(BUILD_ID) ARCH=$(ARCH) ARCH_ALIAS=$(ARCH_ALIAS) ./build.sh
+iso: nerdctl-$(NERDCTL_VERSION)-$(ARCH) qemu-$(QEMU_VERSION)-copying cri-dockerd-$(CRI_DOCKERD_VERSION)-$(ARCH)
+	ALPINE_VERSION=$(ALPINE_VERSION) NERDCTL_VERSION=$(NERDCTL_VERSION) QEMU_VERSION=$(QEMU_VERSION) CRI_DOCKERD_VERSION=$(CRI_DOCKERD_VERSION) REPO_VERSION=$(REPO_VERSION) EDITION=$(EDITION) BUILD_ID=$(BUILD_ID) ARCH=$(ARCH) ARCH_ALIAS=$(ARCH_ALIAS) ./build.sh
 
 
 nerdctl-$(NERDCTL_VERSION)-$(ARCH):
@@ -42,6 +43,9 @@ nerdctl-$(NERDCTL_VERSION)-$(ARCH):
 qemu-$(QEMU_VERSION)-copying:
 	curl -o $@ -Ls https://raw.githubusercontent.com/qemu/qemu/$(QEMU_VERSION)/COPYING
 
+cri-dockerd-$(CRI_DOCKERD_VERSION)-$(ARCH):
+	curl -o $@ -Ls https://github.com/Mirantis/cri-dockerd/releases/download/v$(CRI_DOCKERD_VERSION)/cri-dockerd-v$(CRI_DOCKERD_VERSION)-linux-$(ARCH_ALIAS).tar.gz
+
 .PHONY: lima
 lima:
 	ALPINE_VERSION=$(ALPINE_VERSION) EDITION=$(EDITION) ARCH=$(ARCH) ./lima.sh

build.sh

@@ -18,6 +18,7 @@ docker run --rm \
     -v "${PWD}/lima-network.awk:/home/build/lima-network.awk:ro" \
     -v "${PWD}/nerdctl-${NERDCTL_VERSION}-${ARCH}:/home/build/nerdctl.tar.gz:ro" \
     -v "${PWD}/qemu-${QEMU_VERSION}-copying:/home/build/qemu-copying:ro" \
+    -v "${PWD}/cri-dockerd-${CRI_DOCKERD_VERSION}-${ARCH}:/home/build/cri-dockerd.tar.gz:ro" \
     -v "${PWD}/sshd.pam:/home/build/sshd.pam:ro" \
     $(env | grep ^LIMA_ | xargs -n 1 printf -- '-e %s ') \
     -e "LIMA_REPO_VERSION=${REPO_VERSION}" \

edition/min

@@ -4,6 +4,7 @@ export LIMA_INSTALL_CLOUD_INIT=false
 export LIMA_INSTALL_CNI_PLUGINS=false
 export LIMA_INSTALL_DOCKER=false
 export LIMA_INSTALL_K3S=false
+export LIMA_INSTALL_CRI_DOCKERD=false
 export LIMA_INSTALL_IPTABLES=false
 export LIMA_INSTALL_LIMA_INIT=false
 export LIMA_INSTALL_LOGROTATE=false

edition/rd

@@ -3,6 +3,7 @@ LIMA_INSTALL_BINFMT_MISC=true
 LIMA_INSTALL_CA_CERTIFICATES=true
 LIMA_INSTALL_CNI_PLUGINS=true
 LIMA_INSTALL_DOCKER=true
+LIMA_INSTALL_CRI_DOCKERD=true
 LIMA_INSTALL_IPTABLES=true
 LIMA_INSTALL_LIMA_INIT=true
 LIMA_INSTALL_LOGROTATE=true

genapkovl-lima.sh

@@ -132,7 +132,7 @@ if [ "${LIMA_INSTALL_CLOUD_INIT}" == "true" ]; then
     echo cloud-init >> "$tmp"/etc/apk/world
     echo e2fsprogs >> "$tmp"/etc/apk/world
     echo sudo >> "$tmp"/etc/apk/world
-   
+
     rc_add cloud-init-local boot
     rc_add cloud-config default
     rc_add cloud-final default
@@ -243,6 +243,17 @@ if [ "${LIMA_INSTALL_SSHFS}" == "true" ]; then
     echo "sshfs" >> "$tmp"/etc/apk/world
 fi
 
+if [ "${LIMA_INSTALL_CRI_DOCKERD}" == "true" ]; then
+    mkdir -p "${tmp}/cri-dockerd"
+    tar xz -C "${tmp}/cri-dockerd" -f /home/build/cri-dockerd.tar.gz
+    mkdir -p "${tmp}/usr/local/bin/"
+    cp "${tmp}/cri-dockerd/cri-dockerd" "${tmp}/usr/local/bin/"
+
+    #Copy the LICENSE file for cri-dockerd
+    mkdir -p "${tmp}/usr/share/doc/cri-dockerd/"
+    cp "${tmp}/cri-dockerd/LICENSE" "${tmp}/usr/share/doc/cri-dockerd/"
+fi
+
 mkdir -p "${tmp}/etc"
 mkdir -p "${tmp}/usr"