bootstrap: skip secrets mount on container

install/bootstrap_fedora.sh

@@ -27,6 +27,7 @@ source "${BOOSTRAP_DIR}/common/shell/rust.sh"
 source "${BOOSTRAP_DIR}/common/shell/tmux.sh"
 source "${BOOSTRAP_DIR}/common/shell/sudo.sh"
 source "${BOOSTRAP_DIR}/common/shell/user_password.sh"
+source "${BOOSTRAP_DIR}/common/shell/container.sh"
 source "${BOOSTRAP_DIR}/fedora/shell/sudoers.sh"
 source "${BOOSTRAP_DIR}/fedora/shell/vnc.sh"
 source "${BOOSTRAP_DIR}/fedora/shell/ssh.sh"

install/bootstrap_macos.sh

@@ -26,6 +26,7 @@ source "${BOOSTRAP_DIR}/common/shell/rust.sh"
 source "${BOOSTRAP_DIR}/common/shell/tmux.sh"
 source "${BOOSTRAP_DIR}/common/shell/sudo.sh"
 source "${BOOSTRAP_DIR}/common/shell/user_password.sh"
+source "${BOOSTRAP_DIR}/common/shell/container.sh"
 source "${BOOSTRAP_DIR}/macosx/shell/sudoers.sh"
 source "${BOOSTRAP_DIR}/macosx/shell/xcode.sh"
 source "${BOOSTRAP_DIR}/macosx/shell/dmg.sh"

install/common/shell/container.sh

@@ -0,0 +1,15 @@
+container_is_running() {
+    if test -f /.dockerenv; then
+        # ubuntu 20.04+
+        return 0
+    elif test -e /bin/running-in_container; then
+        # Ubuntu 20.04+ support
+        if /bin/running-in_container; then
+            return 0
+        else
+            return 1
+        fi
+    else
+        return 1
+    fi
+}

install/fedora/shell/ramdisk.sh

@@ -9,23 +9,17 @@ export CURRENT_MOUNT_DIR="none"
 # storage mounted at /Volume/ramdiskname
 ramdisk_create_and_mount_storage() {
     local name="$1"
+    local mount_path="$HOME/$name"
 
     uid=$(sudo id -u)
     gid=$(sudo id -g)
 
-    if test $uid -eq 0; then
-        # Github CI test case only
-        local mount_path="/tmp/$name"
-    else
-        local mount_path="$HOME/$name"
-    fi
-
     mkdir -p "$mount_path"
-    if sudo mount -t tmpfs -o size=128M,uid=$uid,gid=$gid,mode=700 "$name" "$mount_path"; then
+    if container_is_running; then
+        # CI case: No mount support in containers
         :
     else
-        dmesg
-        exit 1
+        sudo mount -t tmpfs -o size=128M,uid=$uid,gid=$gid,mode=700 "$name" "$mount_path"
     fi
 
     export CURRENT_MOUNT_DIR="$mount_path"