Merge pull request #58 from lima-vm/bump-nerdctl

Update nerdctl 0.17.1 → 0.19.0

Author: jandubois

Dockerfile

@@ -19,5 +19,14 @@ RUN abuild-keygen -i -a -n
 RUN apk update
 
 ADD src/aports /home/build/aports
+
+RUN if [ "${TARGETARCH}" = "arm64" ]; then pkg_arch=aarch64; else pkg_arch=x86_64; fi && \
+   mkdir -p /home/build/packages/lima/${pkg_arch} && \
+   cd /home/build/packages/lima/${pkg_arch} && \
+   apk fetch cni-plugins --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community && \
+   apk fetch cni-plugin-flannel --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community && \
+   apk index -o APKINDEX.tar.gz *.apk && \
+   abuild-sign APKINDEX.tar.gz
+
 WORKDIR /home/build/aports/scripts
 ENTRYPOINT ["sh", "./mkimage.sh"]

Makefile

@@ -21,7 +21,7 @@ ARCH_ALIAS_x86_64 = amd64
 ARCH_ALIAS_aarch64 = arm64
 ARCH_ALIAS = $(shell echo "$(ARCH_ALIAS_$(ARCH))")
 
-NERDCTL_VERSION=0.17.1
+NERDCTL_VERSION=0.19.0
 QEMU_VERSION=v6.1.0
 CRI_DOCKERD_VERSION=0.2.0-1
 BINFMT_IMAGE=tonistiigi/binfmt:qemu-$(QEMU_VERSION)
@@ -30,6 +30,7 @@ BINFMT_IMAGE=tonistiigi/binfmt:qemu-$(QEMU_VERSION)
 mkimage:
 	cd src/aports && git fetch && git checkout $(GIT_TAG)
 	$(DOCKER) build \
+		--progress plain --no-cache \
 		--tag mkimage:$(ALPINE_VERSION)-$(ARCH) \
 		--build-arg ALPINE_VERSION=$(ALPINE_VERSION) \
 		--build-arg BINFMT_IMAGE=$(BINFMT_IMAGE) \

build.sh

@@ -30,6 +30,7 @@ ${DOCKER} run --rm \
     --tag "${TAG}" \
     --outdir /iso \
     --arch "${ARCH}" \
+    --repository "/home/build/packages/lima" \
     --repository "http://dl-cdn.alpinelinux.org/alpine/${REPO_VERSION}/main" \
     --repository "http://dl-cdn.alpinelinux.org/alpine/${REPO_VERSION}/community" \
     --profile lima

edition/min

@@ -2,6 +2,7 @@ export LIMA_INSTALL_BINFMT_MISC=false
 export LIMA_INSTALL_CA_CERTIFICATES=false
 export LIMA_INSTALL_CLOUD_INIT=false
 export LIMA_INSTALL_CNI_PLUGINS=false
+export LIMA_INSTALL_CNI_PLUGIN_FLANNEL=false
 export LIMA_INSTALL_DOCKER=false
 export LIMA_INSTALL_K3S=false
 export LIMA_INSTALL_CRI_DOCKERD=false

edition/rd

@@ -2,6 +2,7 @@ source edition/min
 LIMA_INSTALL_BINFMT_MISC=true
 LIMA_INSTALL_CA_CERTIFICATES=true
 LIMA_INSTALL_CNI_PLUGINS=true
+LIMA_INSTALL_CNI_PLUGIN_FLANNEL=true
 LIMA_INSTALL_DOCKER=true
 LIMA_INSTALL_CRI_DOCKERD=true
 LIMA_INSTALL_IPTABLES=true

genapkovl-lima.sh

@@ -202,10 +202,20 @@ if [ "${LIMA_INSTALL_CA_CERTIFICATES}" == "true" ]; then
     echo "ca-certificates" >> "$tmp"/etc/apk/world
 fi
 
-if [ "${LIMA_INSTALL_CNI_PLUGINS}" == "true" ]; then
+if [ "${LIMA_INSTALL_CNI_PLUGINS}" == "true" ] || [ "${LIMA_INSTALL_NERDCTL}" == "true" ]; then
     echo "cni-plugins" >> "$tmp"/etc/apk/world
 fi
 
+if [ "${LIMA_INSTALL_CNI_PLUGIN_FLANNEL}" == "true" ]; then
+    echo "cni-plugin-flannel" >> "$tmp"/etc/apk/world
+    ARCH=amd64
+    if [ "$(uname -m)" == "aarch64" ]; then
+        ARCH=arm64
+    fi
+    mkdir -p "${tmp}/usr/libexec/cni"
+    ln -s "flannel-${ARCH}" "${tmp}/usr/libexec/cni/flannel"
+fi
+
 if [ "${LIMA_INSTALL_K3S}" == "true" ]; then
     echo "k3s" >> "$tmp"/etc/apk/world
     rc_add k3s default
@@ -228,15 +238,6 @@ if [ "${LIMA_INSTALL_NERDCTL}" == "true" ]; then
         cp "${tmp}/nerdctl/bin/${bin}" "${tmp}/usr/local/bin/${bin}"
         chmod u+s "${tmp}/usr/local/bin/${bin}"
     done
-    if [ "${LIMA_INSTALL_CNI_PLUGINS}" == "true" ]; then
-        mkdir -p "${tmp}/usr/libexec/cni"
-        cp "${tmp}/nerdctl/libexec/cni/isolation" "${tmp}/usr/libexec/cni/isolation"
-    else
-        mkdir -p "${tmp}/usr/local/libexec/cni"
-        for plugin in bridge portmap firewall tuning isolation host-local; do
-            cp "${tmp}/nerdctl/libexec/cni/${plugin}" "${tmp}/usr/local/libexec/cni/${plugin}"
-        done
-    fi
 fi
 
 if [ "${LIMA_INSTALL_SSHFS}" == "true" ]; then

mkimg.lima.sh

@@ -20,9 +20,12 @@ profile_lima() {
         if [ "${LIMA_INSTALL_CLOUD_INIT}" == "true" ]; then
             apks="$apks cloud-init"
         fi
-        if [ "${LIMA_INSTALL_CNI_PLUGINS}" == "true" ]; then
+        if [ "${LIMA_INSTALL_CNI_PLUGINS}" == "true" ] || [ "${LIMA_INSTALL_NERDCTL}" == "true" ]; then
             apks="$apks cni-plugins"
         fi
+        if [ "${LIMA_INSTALL_CNI_PLUGIN_FLANNEL}" == "true" ]; then
+            apks="$apks cni-plugin-flannel"
+        fi
         if [ "${LIMA_INSTALL_DOCKER}" == "true" ]; then
             apks="$apks libseccomp runc containerd tini-static device-mapper-libs"
             apks="$apks docker-engine docker-openrc docker-cli docker"