Merge pull request #156 from nitkon/master

rootfs: Conditionally add libseccomp support in rootfs image

.ci/run.sh

@@ -12,4 +12,4 @@ export GOPATH="${GOPATH:-/tmp/go}"
 
 script_dir="$(dirname $(readlink -f $0))"
 
-sudo -E PATH="$PATH" bash "${script_dir}/../tests/test_images.sh"
+sudo -E PATH="$PATH" bash -x "${script_dir}/../tests/test_images.sh"

rootfs-builder/alpine/config.sh

@@ -22,3 +22,5 @@ INIT_PROCESS=kata-agent
 # List of zero or more architectures to exclude from build,
 # as reported by  `uname -m`
 ARCH_EXCLUDE_LIST=()
+
+[ "$SECCOMP" = "yes" ] && PACKAGES+=" libseccomp" || true

rootfs-builder/centos/config.sh

@@ -34,3 +34,5 @@ INIT_PROCESS=systemd
 # List of zero or more architectures to exclude from build,
 # as reported by  `uname -m`
 ARCH_EXCLUDE_LIST=()
+
+[ "$SECCOMP" = "yes" ] && PACKAGES+=" libseccomp" || true

rootfs-builder/clearlinux/config.sh

@@ -27,3 +27,5 @@ INIT_PROCESS=systemd
 # List of zero or more architectures to exclude from build,
 # as reported by  `uname -m`
 ARCH_EXCLUDE_LIST=(ppc64le)
+
+[ "$SECCOMP" = "yes" ] && PACKAGES+=" libseccomp" || true

rootfs-builder/euleros/config.sh

@@ -25,3 +25,5 @@ ARCH_EXCLUDE_LIST=()
 # Allow the build to fail without generating an error.
 # For more info see: https://github.com/kata-containers/osbuilder/issues/190
 BUILD_CAN_FAIL=1
+
+[ "$SECCOMP" = "yes" ] && PACKAGES+=" libseccomp" || true

rootfs-builder/fedora/config.sh

@@ -19,3 +19,5 @@ PACKAGES="iptables"
 # Init process must be one of {systemd,kata-agent}
 INIT_PROCESS=systemd
 ARCH_EXCLUDE_LIST=()
+
+[ "$SECCOMP" = "yes" ] && PACKAGES+=" libseccomp" || true

rootfs-builder/rootfs.sh

@@ -328,6 +328,7 @@ if [ -n "${USE_DOCKER}" ] ; then
 		--env EXTRA_PKGS="${EXTRA_PKGS}" \
 		--env OSBUILDER_VERSION="${OSBUILDER_VERSION}" \
 		--env INSIDE_CONTAINER=1 \
+		--env SECCOMP="${SECCOMP}" \
 		-v "${script_dir}":"/osbuilder" \
 		-v "${ROOTFS_DIR}":"/rootfs" \
 		-v "${script_dir}/../scripts":"/scripts" \
@@ -354,7 +355,7 @@ pushd "${GOPATH_LOCAL}/src/${GO_AGENT_PKG}"
 [ -n "${AGENT_VERSION}" ] && git checkout "${AGENT_VERSION}" && OK "git checkout successful"
 make clean
 make INIT=${AGENT_INIT}
-make install DESTDIR="${ROOTFS_DIR}" INIT=${AGENT_INIT}
+make install DESTDIR="${ROOTFS_DIR}" INIT=${AGENT_INIT} SECCOMP=${SECCOMP}
 popd
 
 AGENT_DIR="${ROOTFS_DIR}/usr/bin"

rootfs-builder/ubuntu/config.sh

@@ -28,3 +28,5 @@ INIT_PROCESS=systemd
 # List of zero or more architectures to exclude from build,
 # as reported by  `uname -m`
 ARCH_EXCLUDE_LIST=()
+
+[ "$SECCOMP" = "yes" ] && PACKAGES+=" libseccomp2" || true