Enable vnc for emulator
This commit is contained in:
parent
e97f614cac
commit
2179aa3ce0
3
emu
3
emu
@ -3,6 +3,7 @@
|
|||||||
default="qemu-system-x86_64 \
|
default="qemu-system-x86_64 \
|
||||||
-s -S \
|
-s -S \
|
||||||
-drive file=/opt/mittos.iso,media=cdrom,cache=none \
|
-drive file=/opt/mittos.iso,media=cdrom,cache=none \
|
||||||
|
-vnc :0 \
|
||||||
-curses \
|
-curses \
|
||||||
"
|
"
|
||||||
|
|
||||||
@ -21,5 +22,7 @@ fi
|
|||||||
|
|
||||||
docker-compose -f toolchain/docker-compose.yml run \
|
docker-compose -f toolchain/docker-compose.yml run \
|
||||||
--rm \
|
--rm \
|
||||||
|
-e WEBSOCK='1' \
|
||||||
|
-p 6080:6080 \
|
||||||
--name emul \
|
--name emul \
|
||||||
run ${cmd}
|
run ${cmd}
|
@ -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 MITTOS64 "true"
|
||||||
ENV BUILDROOT "/opt"
|
ENV BUILDROOT "/opt"
|
||||||
|
|
||||||
|
COPY run-entrypoint.sh /entrypoint.sh
|
||||||
|
|
||||||
|
ENTRYPOINT [ "/entrypoint.sh" ]
|
||||||
|
|
||||||
WORKDIR "/opt"
|
WORKDIR "/opt"
|
7
toolchain/run-entrypoint.sh
Executable file
7
toolchain/run-entrypoint.sh
Executable file
@ -0,0 +1,7 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
if [[ -n "$WEBSOCK" ]]; then
|
||||||
|
websockify --web /usr/share/novnc 6080 localhost:5900 &
|
||||||
|
fi
|
||||||
|
|
||||||
|
eval "$@"
|
Loading…
x
Reference in New Issue
Block a user