Merge pull request #105 from afbjorklund/nerdctl-full

Refactor: rename nerdctl to nerdctl-full
lima-vm · Jun 29, 2023 · 88bd124 · 88bd124
2 parents ef2eb42 + 7444e69
commit 88bd124
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/Makefile b/Makefile
@@ -39,11 +39,11 @@ mkimage:
 		.
 
 .PHONY: iso
-iso: nerdctl-$(NERDCTL_VERSION)-$(ARCH) qemu-$(QEMU_VERSION)-copying cri-dockerd-$(CRI_DOCKERD_VERSION)-$(ARCH)
+iso: nerdctl-full-$(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):
+nerdctl-full-$(NERDCTL_VERSION)-$(ARCH):
 	curl -o $@ -Ls https://github.com/containerd/nerdctl/releases/download/v$(NERDCTL_VERSION)/nerdctl-full-$(NERDCTL_VERSION)-linux-$(ARCH_ALIAS).tar.gz
 
 qemu-$(QEMU_VERSION)-copying:

diff --git a/build.sh b/build.sh
@@ -18,7 +18,7 @@ ${DOCKER} run --rm \
     -v "${PWD}/lima-init.openrc:/home/build/lima-init.openrc:ro" \
     -v "${PWD}/lima-init-local.openrc:/home/build/lima-init-local.openrc:ro" \
     -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}/nerdctl-full-${NERDCTL_VERSION}-${ARCH}:/home/build/nerdctl-full.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" \

diff --git a/edition/min b/edition/min
@@ -13,7 +13,7 @@ export LIMA_INSTALL_CRI_DOCKERD=false
 export LIMA_INSTALL_IPTABLES=false
 export LIMA_INSTALL_LIMA_INIT=false
 export LIMA_INSTALL_LOGROTATE=false
-export LIMA_INSTALL_NERDCTL=false
+export LIMA_INSTALL_NERDCTL_FULL=false
 export LIMA_INSTALL_OPENSSH_SFTP_SERVER=false
 export LIMA_INSTALL_SSHFS=false
 export LIMA_INSTALL_ZSTD=false
diff --git a/edition/rd b/edition/rd
@@ -12,7 +12,7 @@ LIMA_INSTALL_GIT=true
 LIMA_INSTALL_IPTABLES=true
 LIMA_INSTALL_LIMA_INIT=true
 LIMA_INSTALL_LOGROTATE=true
-LIMA_INSTALL_NERDCTL=true
+LIMA_INSTALL_NERDCTL_FULL=true
 LIMA_INSTALL_OPENSSH_SFTP_SERVER=true
 LIMA_INSTALL_SSHFS=true
 LIMA_INSTALL_ZSTD=true
diff --git a/genapkovl-lima.sh b/genapkovl-lima.sh
@@ -217,7 +217,7 @@ if [ "${LIMA_INSTALL_CA_CERTIFICATES}" == "true" ]; then
     echo "ca-certificates" >> "$tmp"/etc/apk/world
 fi
 
-if [ "${LIMA_INSTALL_CNI_PLUGINS}" == "true" ] || [ "${LIMA_INSTALL_NERDCTL}" == "true" ]; then
+if [ "${LIMA_INSTALL_CNI_PLUGINS}" == "true" ] || [ "${LIMA_INSTALL_NERDCTL_FULL}" == "true" ]; then
     echo "cni-plugins" >> "$tmp"/etc/apk/world
 fi
 
@@ -250,13 +250,13 @@ if [ "${LIMA_INSTALL_LOGROTATE}" == "true" ]; then
     echo "logrotate" >> "$tmp"/etc/apk/world
 fi
 
-if [ "${LIMA_INSTALL_IPTABLES}" == "true" ] || [ "${LIMA_INSTALL_NERDCTL}" == "true" ]; then
+if [ "${LIMA_INSTALL_IPTABLES}" == "true" ] || [ "${LIMA_INSTALL_NERDCTL_FULL}" == "true" ]; then
     echo "iptables ip6tables" >> "$tmp"/etc/apk/world
 fi
 
-if [ "${LIMA_INSTALL_NERDCTL}" == "true" ]; then
+if [ "${LIMA_INSTALL_NERDCTL_FULL}" == "true" ]; then
     mkdir -p "${tmp}/nerdctl"
-    tar xz -C "${tmp}/nerdctl" -f /home/build/nerdctl.tar.gz
+    tar xz -C "${tmp}/nerdctl" -f /home/build/nerdctl-full.tar.gz
 
     mkdir -p "${tmp}/usr/local/bin/"
     for bin in buildctl buildkitd nerdctl; do

diff --git a/mkimg.lima.sh b/mkimg.lima.sh
@@ -23,7 +23,7 @@ profile_lima() {
         if [ "${LIMA_INSTALL_CLOUD_UTILS_GROWPART}" == "true" ]; then
             apks="$apks cloud-utils-growpart partx"
         fi
-        if [ "${LIMA_INSTALL_CNI_PLUGINS}" == "true" ] || [ "${LIMA_INSTALL_NERDCTL}" == "true" ]; then
+        if [ "${LIMA_INSTALL_CNI_PLUGINS}" == "true" ] || [ "${LIMA_INSTALL_NERDCTL_FULL}" == "true" ]; then
             apks="$apks cni-plugins"
         fi
         if [ "${LIMA_INSTALL_CNI_PLUGIN_FLANNEL}" == "true" ]; then
@@ -58,7 +58,7 @@ profile_lima() {
         if [ "${LIMA_INSTALL_SSHFS}" == "true" ]; then
             apks="$apks sshfs"
         fi
-        if [ "${LIMA_INSTALL_IPTABLES}" == "true" ] || [ "${LIMA_INSTALL_NERDCTL}" == "true" ]; then
+        if [ "${LIMA_INSTALL_IPTABLES}" == "true" ] || [ "${LIMA_INSTALL_NERDCTL_FULL}" == "true" ]; then
             apks="$apks iptables ip6tables"
         fi
         if [ "${LIMA_INSTALL_ZSTD}" == "true" ]; then