From dd687223e3d083d3bc407759e2d2a99845b05ebb Mon Sep 17 00:00:00 2001 From: Marco Vedovati Date: Tue, 11 Sep 2018 13:28:27 +0200 Subject: [PATCH] osbuilder: Add support for debian rootfs Fixes: #160 Signed-off-by: Marco Vedovati --- rootfs-builder/debian/Dockerfile.in | 13 +++++++++++++ rootfs-builder/debian/config.sh | 12 ++++++++++++ rootfs-builder/debian/rootfs_lib.sh | 7 +++++++ tests/test_images.sh | 7 +++++++ 4 files changed, 39 insertions(+) create mode 100644 rootfs-builder/debian/Dockerfile.in create mode 100644 rootfs-builder/debian/config.sh create mode 100644 rootfs-builder/debian/rootfs_lib.sh diff --git a/rootfs-builder/debian/Dockerfile.in b/rootfs-builder/debian/Dockerfile.in new file mode 100644 index 0000000000..f4eb4ca216 --- /dev/null +++ b/rootfs-builder/debian/Dockerfile.in @@ -0,0 +1,13 @@ +# +# Copyright (c) 2018 SUSE +# +# SPDX-License-Identifier: Apache-2.0 + +# NOTE: OS_VERSION is set according to config.sh +from debian:@OS_VERSION@ + +# RUN commands +RUN apt-get update && apt-get install -y curl wget systemd debootstrap git build-essential +# This will install the proper golang to build Kata components +@INSTALL_GO@ + diff --git a/rootfs-builder/debian/config.sh b/rootfs-builder/debian/config.sh new file mode 100644 index 0000000000..3fd64bbefc --- /dev/null +++ b/rootfs-builder/debian/config.sh @@ -0,0 +1,12 @@ +# +# Copyright (c) 2018 SUSE +# +# SPDX-License-Identifier: Apache-2.0 + +OS_VERSION=${OS_VERSION:-9.5} + +# Set OS_NAME to the desired debian "codename" +OS_NAME=${OS_NAME:-"stretch"} + +# NOTE: Re-using ubuntu rootfs configuration, see 'ubuntu' folder for full content. +source $script_dir/ubuntu/$CONFIG_SH diff --git a/rootfs-builder/debian/rootfs_lib.sh b/rootfs-builder/debian/rootfs_lib.sh new file mode 100644 index 0000000000..f6aae26364 --- /dev/null +++ b/rootfs-builder/debian/rootfs_lib.sh @@ -0,0 +1,7 @@ +# +# Copyright (c) 2018 SUSE +# +# SPDX-License-Identifier: Apache-2.0 + +# NOTE: Re-using ubuntu rootfs lib, see 'ubuntu' folder for details. +source ${script_dir}/ubuntu/$LIB_SH diff --git a/tests/test_images.sh b/tests/test_images.sh index 3b6f417c2f..194970edab 100755 --- a/tests/test_images.sh +++ b/tests/test_images.sh @@ -440,6 +440,12 @@ test_distro_ubuntu() run_test "${name}" "" "ubuntu" "service" "no" } +test_distro_debian() +{ + local -r name="Can create and run debian image" + run_test "${name}" "" "debian" "service" "no" +} + test_distro_fedora() { @@ -526,6 +532,7 @@ test_all_distros() test_distro_centos test_distro_alpine test_distro_ubuntu + test_distro_debian if [ $MACHINE_TYPE != "ppc64le" ]; then test_distro_clearlinux