diff --git a/Dockerfile b/Dockerfile index 981d4e6..f10ee24 100644 --- a/Dockerfile +++ b/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 \ diff --git a/genapkovl-lima.sh b/genapkovl-lima.sh index 9223c4b..de91c59 100755 --- a/genapkovl-lima.sh +++ b/genapkovl-lima.sh @@ -48,6 +48,7 @@ EOF mkdir -p "$tmp"/etc/apk makefile root:root 0644 "$tmp"/etc/apk/world <> "$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 diff --git a/mkimg.lima.sh b/mkimg.lima.sh index 0c34cda..9d67442 100755 --- a/mkimg.lima.sh +++ b/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