From 66d925fa59aa3d7d049c8fa7962ecb6c65039895 Mon Sep 17 00:00:00 2001 From: Nicolas Arenas Date: Fri, 25 Oct 2024 11:29:09 +0200 Subject: [PATCH] #905 fix missing function --- Dockerfile | 3 +++ builder.sh | 10 +++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..84aafce --- /dev/null +++ b/Dockerfile @@ -0,0 +1,3 @@ +FROM ubuntu:24.04 + +RUN apt -y update && apt -y install debootstrap xorriso squashfs-tools grub-pc-bin grub-efi-amd64-bin mtools dosfstools diff --git a/builder.sh b/builder.sh index 3f098b2..a824f80 100755 --- a/builder.sh +++ b/builder.sh @@ -13,7 +13,6 @@ CLEAN_CHROOT=${CLEAN_CHROOT:-1} OUTPUT_DIR=/root IMAGE_DIR=$DIR/image DEBOOT_STRAP_URL=http://mirror.raiolanetworks.com/ubuntu/ -SUDO_PASSWD=${SUDO_PASSWD:-$(cat $PASSWD_FILE)} mkdir -p $IMAGE_DIR mkdir -p $CHROOT_DIR @@ -34,7 +33,10 @@ cp calamares/settings.conf $CHROOT_DIR/etc/calamares/ cp calamares/modules/*.conf $CHROOT_DIR/etc/calamares/modules/ mkdir -p $CHROOT_DIR/usr/share/opengnsys/images cp art/* $CHROOT_DIR/usr/share/opengnsys/images/ -deploy_script_in_chroot $CHROOT_DIR openGnsys-installer.sh /usr/local/bin/ +mkdir -p $CHROOT_DIR/usr/local/bin +cp openGnsys-installer.sh $CHROOT_DIR/usr/local/bin/ +chmod +x $CHROOT_DIR/usr/local/bin/openGnsys-installer.sh + # # Create mount points mount --bind /dev/ $CHROOT_DIR/dev @@ -68,7 +70,9 @@ debootstrap --arch=amd64 --variant=minbase noble $UBUNTU_CHROOT_DIR $DEBOOT_STRA cp setup_chroot_ubuntu.sh $UBUNTU_CHROOT_DIR in_chroot $UBUNTU_CHROOT_DIR chmod +x /setup_chroot_ubuntu.sh cp buildlib.sh $UBUNTU_CHROOT_DIR -deploy_script_in_chroot $UBUNTU_CHROOT_DIR component-installer.sh /opengnsys-installer/ +mkdir -p $UBUNTU_CHROOT_DIR/opengnsys-installer +cp component-installer.sh $UBUNTU_CHROOT_DIR/opengnsys-installer/ +chmod +x $UBUNTU_CHROOT_DIR/opengnsys-installer/component-installer.sh cp pat.txt $UBUNTU_CHROOT_DIR/opengnsys-installer/