Merge pull request #2762 from OSInside/add_alpine_support

Add support for Alpine

Author: Conan-Kudo

build-tests.sh

@@ -20,6 +20,7 @@ ARGUMENT_LIST=(
     "test-dir:"
     "test-name:"
     "box-name:"
+    "vm"
 )
 
 function usage() {
@@ -30,6 +31,8 @@ function usage() {
     echo "    some test name, e.g. test-image-disk"
     echo "  --box-name <name>"
     echo "    name of the box to use for the build, default: universal"
+    echo "  --vm"
+    echo "    build in a virtual machine instead of a container"
 }
 
 if ! opts=$(getopt \
@@ -61,6 +64,11 @@ while [[ $# -gt 0 ]]; do
             shift 2
             ;;
 
+        --vm)
+            argVM=1
+            shift
+            ;;
+
         *)
             break
             ;;
@@ -107,15 +115,18 @@ function create_build_commands() {
         build_command="kiwi-ng --debug"
         has_profiles=false
         repo_options=$(create_repo_list "${build_dir}")
+        box_options="system boxbuild --box ${boxname}"
+        if [ ! "${argVM}" = 1 ];then
+            box_options="${box_options} --container"
+        fi
         for profile in $(
             xmllint --xpath "//image/profiles/profile/@name" \
             "${image}/appliance.kiwi" 2>/dev/null | cut -f2 -d\"
         );do
             has_profiles=true
             target_dir="build_results/${base_image}/${profile}"
             build_command="${build_command} --profile ${profile}"
-            build_command="${build_command} system boxbuild"
-            build_command="${build_command} --box ${boxname} --container --"
+            build_command="${build_command} ${box_options} --"
             build_command="${build_command} --description $image"
             build_command="${build_command} ${repo_options}"
             build_command="${build_command} --target-dir ${target_dir}"
@@ -126,8 +137,7 @@ function create_build_commands() {
         done
         if [ "${has_profiles}" = "false" ];then
             target_dir="build_results/${base_image}"
-            build_command="${build_command} system boxbuild"
-            build_command="${build_command} --box ${boxname} --container --"
+            build_command="${build_command} ${box_options} --"
             build_command="${build_command} --description $image"
             build_command="${build_command} ${repo_options}"
             build_command="${build_command} --target-dir ${target_dir}"

build-tests/x86/alpine/.repos

@@ -0,0 +1,2 @@
+https://dl-cdn.alpinelinux.org/alpine/latest-stable/main/,apk
+https://dl-cdn.alpinelinux.org/alpine/latest-stable/community/,apk

build-tests/x86/alpine/test-image-disk/appliance.kiwi

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<image schemaversion="7.5" name="kiwi-test-image-disk">
+    <description type="system">
+        <author>Marcus Schaefer</author>
+        <contact>[email protected]</contact>
+        <specification>Alpine Appliance</specification>
+    </description>
+    <preferences>
+        <version>3.21.0</version>
+        <packagemanager>apk</packagemanager>
+    </preferences>
+    <preferences>
+        <type image="oem" filesystem="ext4" kernelcmdline="console=ttyS0" firmware="efi" eficsm="false" format="qcow2">
+            <oemconfig>
+                <oem-resize>false</oem-resize>
+            </oemconfig>
+            <bootloader name="grub2" console="serial" timeout="10"/>
+        </type>
+    </preferences>
+    <users>
+        <user password="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root" groups="root"/>
+    </users>
+    <!-- first repository is also used for bootstrap -->
+    <repository type="apk">
+        <source path="https://dl-cdn.alpinelinux.org/alpine/latest-stable/main/"/>
+    </repository>
+    <repository type="apk">
+        <source path="https://dl-cdn.alpinelinux.org/alpine/latest-stable/community/"/>
+    </repository>
+    <packages type="image">
+        <package name="shadow"/>
+        <package name="dracut"/>
+        <package name="fts"/>
+        <package name="linux-edge"/>
+        <package name="linux-firmware"/>
+        <package name="grub"/>
+        <package name="grub-efi"/>
+    </packages>
+    <packages type="bootstrap">
+        <package name="alpine-base"/>
+    </packages>
+</image>

kiwi/defaults.py

@@ -2091,6 +2091,17 @@ def get_bls_loader_entries_dir() -> str:
         """
         return '/boot/loader/entries'
 
+    @staticmethod
+    def get_apk_repo_config() -> str:
+        """
+        Repository file for apk
+
+        :return: file path name
+
+        :rtype: str
+        """
+        return '/etc/apk/repositories'
+
     def get(self, key):
         """
         Implements get method for profile elements

kiwi/package_manager/__init__.py

@@ -59,7 +59,8 @@ def new(
             'dnf4': ['dnf4', 'Dnf4'],
             'microdnf': ['microdnf', 'MicroDnf'],
             'pacman': ['pacman', 'Pacman'],
-            'apt': ['apt', 'Apt']
+            'apt': ['apt', 'Apt'],
+            'apk': ['apk', 'Apk']
         }
         try:
             (module_namespace, module_name) = name_map[package_manager_name]