Updated Docker Image

Author: fido2020

Documentation/Build/Building-Lemon-OS-with-Docker.md

@@ -1,9 +1,8 @@
-# OUTDATED!
+# Building Lemon OS with Docker
 
 ## Prerequisites
 * A UNIX-like build system
 * Docker
-* qemu-img
 
 Install the following (Arch) packages:\
 `git`, `docker`\
@@ -20,10 +19,20 @@ Make sure you use `--recurse-submodules` to get the submodules
 Run ```Scripts/docker-configure.sh``` this will do the following:
 * Pull the docker image
 * Configure the meson projects
-* Build most of the various ports
+* Build the essential ports
+
+## Build the system
+Run ```Scripts/docker-run.sh ninja -C Build install```
 
 ## Creating/Obtaining disk image
-Install the GRUB package for your distro and run `Scripts/createdisk.sh`. This will create a disk image with limine as BIOS bootloader and GRUB for EFI
+Run `Scripts/createdisk.sh`. \
+This will create `Disks/Lemon.img` with limine as BIOS and EFI bootloader if it does not exist. Then it will copy the built system files to the disk. For now this will have to be run on the host system.
+
+## Running
+[Refer to Building Lemon OS](Building-Lemon-OS.md)
 
-## Finally build and run
-In the main directory run `./docker-make all` to build everything. Finally `./docker-make run` to run Lemon OS with QEMU/KVM, or run Disks/Lemon.img in your favourite VM.
+## Building Ports
+Run
+```sh
+Scripts/docker-run.sh Ports/buildport.sh <port name>  # e.g. ./buildport.sh nyancat
+```

Documentation/Build/Building-Lemon-OS.md

@@ -1,4 +1,6 @@
-*~~It is recommended that you [build with docker](Building-Lemon-OS-with-Docker.md), building the toolchain will takes a long time.~~ Docker build Outdated*
+### *Building the toolchain can take an extremely long time, a Docker image has been built. Consider [Building Lemon OS with Docker](Building-Lemon-OS-with-Docker.md)*
+
+
 
 ## Prerequisites
 _NOTE: Building on WSL2 is doable, however I strongly recommend an actual UNIX system._
@@ -56,15 +58,15 @@ ninja disk
 ```
 
 ### Running with QEMU/KVM
-To run with QEMU run `ninja run`
+To run with QEMU run `Scripts/run.sh`
 ```sh
-ninja run
+Scripts/run.sh
 ```
 
 ### Running with VirtualBox
-To run with VirtualBox create a vm called "LemonOS". You'll need to symlink `Disks/Lemon.img` to `Disks/Lemon.hdd` Then run `ninja run-vbox`
+To run with VirtualBox create a vm called "LemonOS". You'll need to symlink `Disks/Lemon.img` to `Disks/Lemon.hdd` as VirtualBox cannot use `.img` files.
 ```sh
-ninja run-vbox
+Scripts/run.sh vbox
 ```
 
 ## Building Ports

README.md

@@ -11,17 +11,16 @@ If you have any questions or concerns feel free to open a GitHub issue, join our
 [Discord Server](https://discord.gg/NAYp6AUYWM)
 
 ## Building
-- [Building Lemon OS](Documentation/Build/Building-Lemon-OS.md)
-- [Building Lemon OS with Docker (Outdated)](Documentation/Build/Building-Lemon-OS-with-Docker.md)
+- [Building Lemon OS (Requires building toolchain)](Documentation/Build/Building-Lemon-OS.md)
+- [Building Lemon OS with Docker](Documentation/Build/Building-Lemon-OS-with-Docker.md)
 
 ## Prebuilt Image
 [Nightly Images](https://github.com/LemonOSProject/LemonOS/actions/workflows/ci.yml?query=is%3Asuccess+branch%3Amaster) - Go to latest job, `Lemon.img` located under Artifacts\
-[Latest Release](https://github.com/LemonOSProject/LemonOS/releases/latest)
 
 **Before running**
 See [System Requirements](#system-requirements)
 
-![Lemon OS Screenshot](Screenshots/image8.png)\
+![Lemon OS Screenshot](Screenshots/image9.png)\
 [More screenshots](Screenshots)
 ## Features
 - Modular Kernel

Screenshots/image9.png

@@ -1,15 +1,15 @@
 FROM alpine:3.12
 
-RUN apk add --no-cache nasm python3 ninja make cmake automake autoconf libtool make gcc g++ musl-dev git curl patch
+RUN apk add --no-cache nasm python3 ninja make cmake automake autoconf libtool make gcc g++ musl-dev git curl patch e2fsprogs dosfstools
 
 RUN cd /root && curl https://raw.githubusercontent.com/fido2020/Lemon-OS/master/Toolchain/buildtoolchain.sh -o buildtoolchain.sh && curl https://raw.githubusercontent.com/fido2020/Lemon-OS/master/Toolchain/lemon-binutils-2.32.patch -o lemon-binutils-2.32.patch && chmod 755 /root/buildtoolchain.sh
 
 RUN /root/buildtoolchain.sh prepare
 RUN /root/buildtoolchain.sh binutils
 RUN /root/buildtoolchain.sh llvm CC=gcc CXX=g++
 RUN /root/buildtoolchain.sh limine
-RUN if [ ! -f "/root/.local/share/lemon/bin/clang" ]; then ninja -C /root/llvm-project/build install; fi && ln -sf /root/.local/share/lemon/bin/clang /root/.local/share/lemon/bin/lemon-clang && ln -sf /root/.local/share/lemon/bin/clang++ /root/.local/share/lemon/bin/lemon-clang++ && ln -sf ../../include/c++ /root/.local/share/lemon/sysroot/system/include/c++
-
-RUN apk del g++ && /root/buildtoolchain.sh clean && python3 -m ensurepip --default-pip && python3 -m pip install meson && chmod -R a+rx /root
+RUN if [ ! -f "/root/.local/share/lemon/bin/clang" ]; then ninja -C /root/llvm-project/build install; fi && ln -sf /root/.local/share/lemon/bin/clang /root/.local/share/lemon/bin/lemon-clang && ln -sf /root/.local/share/lemon/bin/clang++ /root/.local/share/lemon/bin/lemon-clang++ && ln -sf ../../include/c++ /root/.local/share/lemon/sysroot/system/include/c++ \
+    && cd /root/.local/share/lemon/bin && rm clang-repl clang-scan-deps clang-check clang-refactor clang-rename clang-extdef-mapping diagtool \
+    && /root/buildtoolchain.sh clean && python3 -m ensurepip --default-pip && python3 -m pip install meson && chmod -R a+rx /root
 
 ENV PATH=$PATH:/root/.local/share/lemon/bin:/root/.local/share/lemon/x86_64-lemon/bin/

Scripts/Dockerfile

@@ -2,30 +2,26 @@
 
 set -e
 
-if [ -z $LEMOND ]; then
-	export LEMOND=$(dirname $(readlink -f "$0"))/..
-fi
-
-if [ -z "$LEMON_SYSROOT" ]; then
-    export LEMON_SYSROOT=$HOME/.local/share/lemon/sysroot
-fi
+SPATH=$(dirname $(readlink -f "$0"))
+source $SPATH/env.sh
 
 INCLUDEDIR="$LEMON_SYSROOT/system/include/Lemon/Services/"
 
-LIC="$LEMOND/InterfaceCompiler/lic"
-LIC_SRC="$LEMOND/InterfaceCompiler/main.cpp"
+LIC="$LEMON_BUILDROOT/InterfaceCompiler/lic"
+LIC_SRC="$LEMON_BUILDROOT/InterfaceCompiler/main.cpp"
 
 WD="$(pwd)"
 
 if ! [ -f "$LIC" ] || [ "$LIC_SRC" -nt "$LIC" ]; then # If the lic executable doesent exist or is older than source, build it
-    cd "$LEMOND/InterfaceCompiler"
+    echo "Rebuilding $LIC_SRC"
+    cd "$LEMON_BUILDROOT/InterfaceCompiler"
     ./build.sh
     cd "$WD"
 fi
 
 
 mkdir -p "$INCLUDEDIR" 
-cd "$LEMOND/Services"
+cd "$LEMON_BUILDROOT/Services"
 
 "$LIC" lemon.lemond.li "$INCLUDEDIR/lemon.lemond.h"
 "$LIC" lemon.networkgovernor.li "$INCLUDEDIR/lemon.networkgovernor.h"

Scripts/buildinterfaces.sh

@@ -48,4 +48,7 @@ cd "$LEMON_BUILDROOT/Ports"
 cd $SPATH/..
 
 meson Build --cross $SPATH/lemon-crossfile.txt
+
 $SPATH/buildinterfaces.sh
+
+>&2 echo "Done configuring system."

Scripts/configure.sh

@@ -1,12 +1,12 @@
 SPATH=$(dirname $(readlink -f "$0"))
 
-cd $SPATH/..
-export LEMONDIR=$(pwd)
+cd $SPATH
+source ./env.sh
 
 mkdir -p $HOME/.local/share/lemon/sysroot/system
 mkdir -p $HOME/.local/share/lemon/sysroot/system/include
 mkdir -p $HOME/.local/share/lemon/sysroot/system/lib
 mkdir -p $HOME/.local/share/lemon/sysroot/system/bin
 
 docker pull computerfido/lemontoolchain:latest
-docker run -v $(pwd):$(pwd) -v "$HOME/.local/share/lemon/sysroot":"/root/.local/share/lemon/sysroot" -w $(pwd) --user $(id -u):$(id -g) -it computerfido/lemontoolchain:latest sh -c "HOME=/root LEMON_SYSROOT=/root/.local/share/lemon/sysroot $LEMONDIR/Scripts/configure.sh"
+./docker-run.sh "$LEMON_BUILDROOT/Scripts/configure.sh"