mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-05-04 06:27:25 +00:00
osbuilder: add iptables package
Since we are introducing an agent API for interacting with guest iptables, let's ensure that our example rootfs' have iptables-save/restore installed. Fixes: #4356 Signed-off-by: Eric Ernst <eric_ernst@apple.com>
This commit is contained in:
parent
96c8df40b5
commit
7c4049aabb
@ -13,7 +13,7 @@ BASE_PACKAGES="alpine-base"
|
|||||||
# See a list of mirrors at http://nl.alpinelinux.org/alpine/MIRRORS.txt
|
# See a list of mirrors at http://nl.alpinelinux.org/alpine/MIRRORS.txt
|
||||||
MIRROR=https://dl-5.alpinelinux.org/alpine
|
MIRROR=https://dl-5.alpinelinux.org/alpine
|
||||||
|
|
||||||
PACKAGES=""
|
PACKAGES="iptables ip6tables"
|
||||||
|
|
||||||
# Init process must be one of {systemd,kata-agent}
|
# Init process must be one of {systemd,kata-agent}
|
||||||
INIT_PROCESS=kata-agent
|
INIT_PROCESS=kata-agent
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
OS_NAME=centos
|
OS_NAME=centos
|
||||||
OS_VERSION=${OS_VERSION:-stream9}
|
OS_VERSION=${OS_VERSION:-stream9}
|
||||||
PACKAGES=chrony
|
PACKAGES="chrony iptables"
|
||||||
[ "$AGENT_INIT" = no ] && PACKAGES+=" systemd"
|
[ "$AGENT_INIT" = no ] && PACKAGES+=" systemd"
|
||||||
[ "$SECCOMP" = yes ] && PACKAGES+=" libseccomp"
|
[ "$SECCOMP" = yes ] && PACKAGES+=" libseccomp"
|
||||||
|
|
||||||
|
@ -15,12 +15,12 @@ clr_url="https://download.clearlinux.org"
|
|||||||
|
|
||||||
BASE_URL="${clr_url}/releases/${OS_VERSION}/${REPO_NAME}/${ARCH}/os/"
|
BASE_URL="${clr_url}/releases/${OS_VERSION}/${REPO_NAME}/${ARCH}/os/"
|
||||||
|
|
||||||
PACKAGES="libudev0-shim kmod-bin"
|
PACKAGES="libudev0-shim kmod-bin iptables-bin"
|
||||||
|
|
||||||
#Optional packages:
|
#Optional packages:
|
||||||
# systemd: An init system that will start kata-agent if kata-agent
|
# systemd: An init system that will start kata-agent if kata-agent
|
||||||
# itself is not configured as init process.
|
# itself is not configured as init process.
|
||||||
[ "$AGENT_INIT" = "no" ] && PACKAGES+=" systemd chrony iptables-bin util-linux-bin" || true
|
[ "$AGENT_INIT" = "no" ] && PACKAGES+=" systemd chrony util-linux-bin" || true
|
||||||
|
|
||||||
# Init process must be one of {systemd,kata-agent}
|
# Init process must be one of {systemd,kata-agent}
|
||||||
INIT_PROCESS=systemd
|
INIT_PROCESS=systemd
|
||||||
|
@ -8,7 +8,7 @@ OS_VERSION=${OS_VERSION:-10.11}
|
|||||||
# Set OS_NAME to the desired debian "codename"
|
# Set OS_NAME to the desired debian "codename"
|
||||||
OS_NAME=${OS_NAME:-"stretch"}
|
OS_NAME=${OS_NAME:-"stretch"}
|
||||||
|
|
||||||
PACKAGES="systemd coreutils init chrony kmod"
|
PACKAGES="systemd coreutils init iptables chrony kmod"
|
||||||
|
|
||||||
# NOTE: Re-using ubuntu rootfs configuration, see 'ubuntu' folder for full content.
|
# NOTE: Re-using ubuntu rootfs configuration, see 'ubuntu' folder for full content.
|
||||||
source $script_dir/ubuntu/$CONFIG_SH
|
source $script_dir/ubuntu/$CONFIG_SH
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
OS_NAME=ubuntu
|
OS_NAME=ubuntu
|
||||||
# This should be Ubuntu's code name, e.g. "focal" (Focal Fossa) for 20.04
|
# This should be Ubuntu's code name, e.g. "focal" (Focal Fossa) for 20.04
|
||||||
OS_VERSION=${OS_VERSION:-focal}
|
OS_VERSION=${OS_VERSION:-focal}
|
||||||
PACKAGES=chrony
|
PACKAGES="chrony iptables"
|
||||||
[ "$AGENT_INIT" = no ] && PACKAGES+=" init"
|
[ "$AGENT_INIT" = no ] && PACKAGES+=" init"
|
||||||
[ "$SECCOMP" = yes ] && PACKAGES+=" libseccomp2"
|
[ "$SECCOMP" = yes ] && PACKAGES+=" libseccomp2"
|
||||||
REPO_URL=http://ports.ubuntu.com
|
REPO_URL=http://ports.ubuntu.com
|
||||||
|
Loading…
Reference in New Issue
Block a user