Merge pull request #65 from lima-vm/mirantis-cri-docker

Switch back to upstream cri-dockerd release

Author: jandubois

Makefile

@@ -23,7 +23,8 @@ ARCH_ALIAS = $(shell echo "$(ARCH_ALIAS_$(ARCH))")
 
 NERDCTL_VERSION=0.20.0
 QEMU_VERSION=v6.1.0
-CRI_DOCKERD_VERSION=0.2.0-rd2
+CRI_DOCKERD_VERSION=0.2.1
+CRI_DOCKERD_ORG=Mirantis
 BINFMT_IMAGE=tonistiigi/binfmt:qemu-$(QEMU_VERSION)
 
 .PHONY: mkimage
@@ -49,7 +50,8 @@ 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/rancher-sandbox/cri-dockerd/releases/download/v$(CRI_DOCKERD_VERSION)/cri-dockerd-v$(CRI_DOCKERD_VERSION)-linux-$(ARCH_ALIAS).tar.gz
+	curl -o $@ -Ls https://github.com/$(CRI_DOCKERD_ORG)/cri-dockerd/releases/download/v$(CRI_DOCKERD_VERSION)/cri-dockerd-$(CRI_DOCKERD_VERSION).$(ARCH_ALIAS).tgz
+	curl -o $@.LICENSE -Ls https://raw.githubusercontent.com/$(CRI_DOCKERD_ORG)/cri-dockerd/v$(CRI_DOCKERD_VERSION)/LICENSE
 
 .PHONY: lima
 lima:

build.sh

@@ -21,6 +21,7 @@ ${DOCKER} run --rm \
     -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}/cri-dockerd-${CRI_DOCKERD_VERSION}-${ARCH}.LICENSE:/home/build/cri-dockerd.license: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}" \

genapkovl-lima.sh

@@ -256,11 +256,11 @@ 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/"
+    cp "${tmp}/cri-dockerd/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/"
+    cp /home/build/cri-dockerd.license "${tmp}/usr/share/doc/cri-dockerd/LICENSE"
 fi
 
 mkdir -p "${tmp}/etc"