Unverified Commit 6fc80cb8 authored by Kroese's avatar Kroese Committed by GitHub
Browse files

fix: Revert accidental commit (#422)

parent 666b5be9

.github/workflows/build.yml

+7 −0
Original line number Diff line number Diff line
@@ -96,3 +96,10 @@ jobs: 
        uses: action-pack/bump@v2

        with:

          token: ${{ secrets.REPO_ACCESS_TOKEN }}

      -

        name: Push to Gitlab mirror

        uses: action-pack/gitlab-sync@v3

        with:

          url: ${{ secrets.GITLAB_URL }}

          token: ${{ secrets.GITLAB_TOKEN }}

          username: ${{ secrets.GITLAB_USERNAME }}

Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ RUN apt-get update \ 
        qemu-utils \

        ca-certificates \

        netcat-openbsd \

        qemu-system-arm \

        qemu-system-x86 \

    && apt-get clean \

    && novnc="1.4.0" \

    && mkdir -p /usr/share/novnc \

docker-compose.yml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ services: 
      RAM_SIZE: "1G"

      CPU_CORES: "1"

      DISK_SIZE: "16G"

      BOOT: "https://dl-cdn.alpinelinux.org/alpine/v3.19/releases/aarch64/alpine-virt-3.19.1-aarch64.iso"

      BOOT: "https://dl-cdn.alpinelinux.org/alpine/v3.19/releases/x86_64/alpine-virt-3.19.1-x86_64.iso"

    devices:

      - /dev/kvm

    device_cgroup_rules:

readme.md

+11 −11
Original line number Diff line number Diff line 
<h1 align="center">QEMU<br />

<div align="center">

<img src="https://github.com/qemus/qemu-arm/raw/master/.github/logo.png" title="Logo" style="max-width:100%;" width="128" />

<img src="https://github.com/qemus/qemu-docker/raw/master/.github/logo.png" title="Logo" style="max-width:100%;" width="128" />

</div>

<div align="center">
@@ -11,7 +11,7 @@ 


</div></h1>



QEMU in a docker container for running ARM-based virtual machines.

QEMU in a docker container for running x86 and x64 virtual machines.



It uses high-performance QEMU options (like KVM acceleration, kernel-mode networking, IO threading, etc.) to achieve near-native speed.
@@ -30,9 +30,9 @@ version: "3" 
services:

  qemu:

    container_name: qemu

    image: qemux/qemu-arm

    image: qemux/qemu-docker

    environment:

      BOOT: "https://dl-cdn.alpinelinux.org/alpine/v3.19/releases/aarch64/alpine-virt-3.19.1-aarch64.iso"

      BOOT: "https://dl-cdn.alpinelinux.org/alpine/v3.19/releases/x86_64/alpine-minirootfs-3.19.1-x86_64.tar.gz"

    devices:

      - /dev/kvm

    cap_add:
@@ -218,11 +218,11 @@ docker run -it --rm -e "BOOT=http://example.com/image.iso" -p 8006:8006 --device 
    ARGUMENTS: "-device usb-tablet"

  ```



[build_url]: https://github.com/qemus/qemu-arm/

[hub_url]: https://hub.docker.com/r/qemux/qemu-arm/

[tag_url]: https://hub.docker.com/r/qemux/qemu-arm/tags

[build_url]: https://github.com/qemus/qemu-docker/

[hub_url]: https://hub.docker.com/r/qemux/qemu-docker/

[tag_url]: https://hub.docker.com/r/qemux/qemu-docker/tags



[Build]: https://github.com/qemus/qemu-arm/actions/workflows/build.yml/badge.svg

[Size]: https://img.shields.io/docker/image-size/qemux/qemu-arm/latest?color=066da5&label=size

[Pulls]: https://img.shields.io/docker/pulls/qemux/qemu-arm.svg?style=flat&label=pulls&logo=docker

[Version]: https://img.shields.io/docker/v/qemux/qemu-arm/latest?arch=arm64&sort=semver&color=066da5
 
[Build]: https://github.com/qemus/qemu-docker/actions/workflows/build.yml/badge.svg

[Size]: https://img.shields.io/docker/image-size/qemux/qemu-docker/latest?color=066da5&label=size

[Pulls]: https://img.shields.io/docker/pulls/qemux/qemu-docker.svg?style=flat&label=pulls&logo=docker

[Version]: https://img.shields.io/docker/v/qemux/qemu-docker/latest?arch=amd64&sort=semver&color=066da5

src/display.sh

+28 −0
Original line number Diff line number Diff line
@@ -22,4 +22,32 @@ case "${DISPLAY,,}" in 
    ;;

esac



if [[ "$GPU" != [Yy1]* ]] || [[ "$ARCH" != "amd64" ]]; then

  return 0

fi



[[ "${VGA,,}" == "virtio" ]] && VGA="virtio-gl"

DISPLAY_OPTS="-display egl-headless,rendernode=/dev/dri/renderD128"

DISPLAY_OPTS="$DISPLAY_OPTS -vga $VGA"



[[ "${DISPLAY,,}" == "vnc" ]] && DISPLAY_OPTS="$DISPLAY_OPTS -vnc :0"

[[ "${DISPLAY,,}" == "web" ]] && DISPLAY_OPTS="$DISPLAY_OPTS -vnc :0,websocket=5700"



[ ! -d /dev/dri ] && mkdir -m 755 /dev/dri



if [ ! -c /dev/dri/card0 ]; then

  if mknod /dev/dri/card0 c 226 0; then

    chmod 666 /dev/dri/card0

  fi

fi



if [ ! -c /dev/dri/renderD128 ]; then

  if mknod /dev/dri/renderD128 c 226 128; then

    chmod 666 /dev/dri/renderD128

  fi

fi



addPackage "xserver-xorg-video-intel" "Intel GPU drivers"

addPackage "qemu-system-modules-opengl" "OpenGL module"



return 0