diff --git a/Dockerfile.image b/Dockerfile.image index 1f73314..a513678 100644 --- a/Dockerfile.image +++ b/Dockerfile.image @@ -3,7 +3,7 @@ FROM ubuntu:22.04 AS image-builder -# Install required tools +# Install required tools (includes Qt6 and CMake) COPY scripts/docker-image-install-tools.sh /tmp/ RUN /tmp/docker-image-install-tools.sh @@ -16,8 +16,12 @@ COPY scripts/ ./scripts/ COPY config/ ./config/ COPY rootfs/ ./rootfs/ -# Build the init binary +# Build the init binary and Qt6 GUI application RUN make init +RUN make gui + +# Install to rootfs +RUN make install # Download a minimal Linux kernel (using Ubuntu's kernel for now) COPY scripts/docker-image-download-kernel.sh /tmp/ diff --git a/scripts/docker-image-install-tools.sh b/scripts/docker-image-install-tools.sh index d73b93a..c9303f3 100755 --- a/scripts/docker-image-install-tools.sh +++ b/scripts/docker-image-install-tools.sh @@ -6,7 +6,14 @@ set -e apt-get update apt-get install -y \ gcc \ + g++ \ make \ + cmake \ + qt6-base-dev \ + qt6-base-dev-tools \ + libqt6core6 \ + libqt6gui6 \ + libqt6widgets6 \ dosfstools \ mtools \ e2fsprogs \