Merge pull request #138 from jandubois/iproute2

Add iproute2 package for JSON output from `ip -j a`

Author: jandubois

Dockerfile

@@ -1,7 +1,7 @@
 ARG ALPINE_VERSION=latest
 ARG BINFMT_IMAGE=tonistiigi/binfmt:latest
 
-FROM ${BINFMT_IMAGE} as binfmt
+FROM ${BINFMT_IMAGE} AS binfmt
 
 FROM alpine:${ALPINE_VERSION}
 RUN apk add alpine-sdk build-base apk-tools alpine-conf busybox \

genapkovl-lima.sh

@@ -48,6 +48,7 @@ EOF
 mkdir -p "$tmp"/etc/apk
 makefile root:root 0644 "$tmp"/etc/apk/world <<EOF
 alpine-base
+iproute2
 openssh-server-pam
 EOF
 
@@ -208,6 +209,10 @@ if [ "${LIMA_INSTALL_GIT}" == "true" ]; then
     echo "git" >> "$tmp"/etc/apk/world
 fi
 
+if [ "${LIMA_INSTALL_IPTABLES}" == "true" ]; then
+    echo "iptables ip6tables" >> "$tmp"/etc/apk/world
+fi
+
 if [ "${LIMA_INSTALL_K3S}" == "true" ]; then
     echo "k3s" >> "$tmp"/etc/apk/world
     rc_add k3s default
@@ -217,10 +222,6 @@ if [ "${LIMA_INSTALL_LOGROTATE}" == "true" ]; then
     echo "logrotate" >> "$tmp"/etc/apk/world
 fi
 
-if [ "${LIMA_INSTALL_IPTABLES}" == "true" ]; then
-    echo "iptables ip6tables" >> "$tmp"/etc/apk/world
-fi
-
 if [ "${LIMA_INSTALL_OPENSSH_SFTP_SERVER}" == "true" ]; then
     echo "openssh-sftp-server" >> "$tmp"/etc/apk/world
 fi

mkimg.lima.sh

@@ -13,7 +13,7 @@ profile_lima() {
 	kernel_cmdline="console=hvc0 console=tty0 console=ttyS0,115200"
 	syslinux_serial="0 115200"
 	apkovl="genapkovl-lima.sh"
-	apks="$apks openssh-server-pam tiny-cloud-nocloud"
+	apks="$apks iproute2 openssh-server-pam tiny-cloud-nocloud"
         if [ "${LIMA_INSTALL_CA_CERTIFICATES}" == "true" ]; then
             apks="$apks ca-certificates"
         fi