feat: Run LXC system in docker

Author: simonwalz

image-factory/create_image.sh

@@ -59,11 +59,6 @@ export DOCKER_CONTEXT=default
 
 IMAGE="/output/image.img"
 #IMAGE_QCOW="/output/image.qcow2"
-#SIZE_MB=2048
-SIZE_MB=4096
-SIZE_MB=1636
-
-PARTITION="B"
 
 if [[ ! -d "/output" ]]; then
 	echo "Output dir not mounted"
@@ -83,6 +78,7 @@ OS_DIGEST="$(jq -r --arg arch "${OS_ARCH}" '.[$arch+"_image_digest"] // .os_imag
 
 if [[ "${OS_ARCH}" == "lxc" ]]; then
   IMAGE="${IMAGE/img/tar.gz}"
+  PARTITION="A"
 
   docker image pull "${OS_IMAGE}" || raise "Faild to fetch image"
   IMAGE_DIGEST="$(docker inspect --format='{{index .RepoDigests 0}}' "${OS_IMAGE}" 2>/dev/null | cut -d '@' -f 2)"
@@ -112,6 +108,12 @@ if [[ "${OS_ARCH}" == "lxc" ]]; then
   exit 0
 fi
 
+PARTITION="B"
+
+#SIZE_MB=2048
+SIZE_MB=4096
+SIZE_MB=1636
+
 SIZE_MB="$(jq --arg size_mb "${SIZE_MB}" -r '.image_size_mb // $size_mb' "${CONFIG_PATH}")"
 
 # Create empty image

system/cuos/dialog-failed.sh

@@ -6,7 +6,7 @@ SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)
 
 export DIALOGRC="${SCRIPT_DIR}/dialog.rc"
 VIRT_TYPE="$(systemd-detect-virt)"
-if [[ "${VIRT_TYPE}" = "lxc" ]]; then
+if [[ "${VIRT_TYPE}" == "lxc" || "${VIRT_TYPE}" == "docker" ]]; then
   # Dont show dialogs for lxc
   exit 0
 fi

system/cuos/do-rollback.sh

@@ -10,7 +10,7 @@ if [[ ! -f "/system_next.json" ]]; then
 fi
 
 VIRT_TYPE="$(systemd-detect-virt)"
-if [[ "${VIRT_TYPE}" = "lxc" ]]; then
+if [[ "${VIRT_TYPE}" == "lxc" || "${VIRT_TYPE}" == "docker" ]]; then
   "${SCRIPT_DIR}/do-rollback-lxc.sh" "$@"
   exit "$?"
 fi

system/cuos/do-update.sh

@@ -5,7 +5,7 @@ set -x
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
 VIRT_TYPE="$(systemd-detect-virt)"
-if [[ "${VIRT_TYPE}" = "lxc" ]]; then
+if [[ "${VIRT_TYPE}" == "lxc" || "${VIRT_TYPE}" == "docker" ]]; then
   "${SCRIPT_DIR}/do-update-lxc.sh" "$@"
   exit "$?"
 fi

system/cuos/init.sh

@@ -20,11 +20,16 @@ ensure_docker_config_json() {
 }
 
 ensure_system_config() {
+  # Exec first-run if not yet started. E.g. for testing in docker containers.
+  if [[ ! -f "/etc/partition_mode" ]]; then
+    "${SCRIPT_DIR}/first-run.sh" "A" "unknown" "unknown"
+  fi
+
   if [[ -f "${CONFIG_PATH}" ]]; then
     return
   fi
-  if [[ "${VIRT_TYPE}" == "lxc" ]]; then
-    cat "/system-init.json" >"${CONFIG_PATH}"
+  if [[ "${VIRT_TYPE}" == "lxc" || "${VIRT_TYPE}" == "docker" ]]; then
+    cat "/system_init.json" >"${CONFIG_PATH}"
   else
     mkdir -p "/mnt/boot"
     mount -o ro -t vfat LABEL=boot "/mnt/boot"
@@ -177,7 +182,7 @@ mask_to_prefix() {
 configure_network() {
   local interfaces_file="/etc/network/interfaces"
 
-  if [[ "${VIRT_TYPE}" == "lxc" ]]; then
+  if [[ "${VIRT_TYPE}" == "lxc" || "${VIRT_TYPE}" == "docker" ]]; then
     # For lxc the network is configured from outside
     return
   fi
@@ -376,7 +381,7 @@ import_custom_ca_certs() {
 }
 
 create_swap_and_resize_fs() {
-  if [[ "${VIRT_TYPE}" == "lxc" ]]; then
+  if [[ "${VIRT_TYPE}" == "lxc" || "${VIRT_TYPE}" == "docker" ]]; then
     # For lxc we do not manage disks or swap
     return
   fi

system/cuos/lib-dialog.sh

@@ -3,7 +3,7 @@
 export DIALOGRC="${SCRIPT_DIR}/dialog.rc"
 
 VIRT_TYPE="$(systemd-detect-virt)"
-if [[ "${VIRT_TYPE}" == "lxc" ]]; then
+if [[ "${VIRT_TYPE}" == "lxc" || "${VIRT_TYPE}" == "docker" ]]; then
   exit 0
 fi
 

system/cuos/resources.sh

@@ -11,7 +11,7 @@ mem_available="$(free -b | awk '/Mem:/ {print $7}')"
 
 load_average="$(awk '{print $1}' /proc/loadavg)"
 cpu_cores="$(nproc)"
-if [[ "${virt_type}" = "lxc" ]]; then
+if [[ "${virt_type}" == "lxc" || "${virt_type}" == "docker" ]]; then
   cpu_usage="$(awk '/^some/ {for(i=1;i<=NF;i++){split($i,a,"="); if(a[1]=="avg60"){print a[2]; exit}}}' /sys/fs/cgroup/cpu.pressure)"
 else
   cpu_usage="$(awk -v load="$load_average" -v cores="$cpu_cores" 'BEGIN {printf "%.2f", (load * 100) / cores}')"