diff --git a/emu b/emu index d8a04f6..61f901b 100755 --- a/emu +++ b/emu @@ -3,6 +3,7 @@ default="qemu-system-x86_64 \ -s -S \ -drive file=/opt/mittos.iso,media=cdrom,cache=none \ + -vnc :0 \ -curses \ " @@ -21,5 +22,7 @@ fi docker-compose -f toolchain/docker-compose.yml run \ --rm \ + -e WEBSOCK='1' \ + -p 6080:6080 \ --name emul \ run ${cmd} \ No newline at end of file diff --git a/toolchain/Dockerfile.run b/toolchain/Dockerfile.run index e44b89f..5bf0113 100644 --- a/toolchain/Dockerfile.run +++ b/toolchain/Dockerfile.run @@ -1,8 +1,16 @@ -FROM alpine +FROM debian -RUN apk --update --no-cache add qemu-system-x86_64 qemu-ui-curses gdb && rm -rf /var/cache/apk/* +RUN apt-get update && \ + apt-get install -y \ + qemu-system-x86 \ + gdb \ + novnc ENV MITTOS64 "true" ENV BUILDROOT "/opt" +COPY run-entrypoint.sh /entrypoint.sh + +ENTRYPOINT [ "/entrypoint.sh" ] + WORKDIR "/opt" \ No newline at end of file diff --git a/toolchain/run-entrypoint.sh b/toolchain/run-entrypoint.sh new file mode 100755 index 0000000..78f37a7 --- /dev/null +++ b/toolchain/run-entrypoint.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +if [[ -n "$WEBSOCK" ]]; then + websockify --web /usr/share/novnc 6080 localhost:5900 & +fi + +eval "$@" \ No newline at end of file