2025-04-04 14:56:59 +00:00
9 changed files with 134 additions and 126 deletions
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@ -1,19 +1,8 @@
-# yaml-language-server: $schema=https://json.schemastore.org/dependabot-2.0.json
 version: 2

 updates:
-  - package-ecosystem: "docker"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-    groups:
-      docker-all:
-        patterns: ["*"]

-  - package-ecosystem: "github-actions"
-    directory: "/"
+  - package-ecosystem: 'github-actions'
+    directory: '/'
    schedule:
-      interval: "monthly"
-    groups:
-      github-actions-all:
-        patterns: ["*"]
+      interval: 'weekly'
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@ -1,134 +1,150 @@
-# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json
-name: "Main"
+name: 'Main'

 on:
  push:
-    tags: ["*"]
-    branches: ["*"]
+    tags: ['*']
+    branches: ['*']
  pull_request:
-    branches: ["*"]
+    branches: ['*']
  workflow_dispatch:

 permissions: {}

 jobs:
+
  build-common-stages:
-    name: "Build common stages"
-    runs-on: "ubuntu-latest"
+    name: 'Build common stages'
+    runs-on: 'ubuntu-latest'
    permissions:
-      contents: "read"
+      contents: 'read'
    strategy:
      matrix:
-        stage: ["build"]
+        stage: ['build']
    steps:
-      - name: "Checkout project"
-        uses: "actions/checkout@v4"
-      - name: "Build and save image"
+      - name: 'Checkout project'
+        uses: 'actions/checkout@v3'
+      - name: 'Build and save image'
        run: |
          make \
            IMAGE_REGISTRY="localhost" IMAGE_NAMESPACE="stage" IMAGE_PROJECT="${{ matrix.stage }}" \
            IMAGE_BUILD_OPTS="--pull --target ${{ matrix.stage }} --build-arg BUILDKIT_INLINE_CACHE=1" \
            build-native-image save-native-image
-      - name: "Upload artifacts"
-        uses: "actions/upload-artifact@v4"
+      - name: 'Upload artifacts'
+        uses: 'actions/upload-artifact@v3'
        with:
-          name: "dist-common-stages"
-          path: "./dist/"
+          name: 'dist-common-stages'
+          path: './dist/'
          retention-days: 1

  build:
-    name: "Build ${{ matrix.arch }} image"
-    needs: ["build-common-stages"]
-    runs-on: "ubuntu-latest"
+    name: 'Build ${{ matrix.arch }} image'
+    needs: ['build-common-stages']
+    runs-on: 'ubuntu-latest'
    permissions:
-      contents: "read"
+      contents: 'read'
    strategy:
      matrix:
-        arch: ["native", "amd64", "arm64v8"]
+        arch: ['native', 'amd64', 'arm64v8']
    steps:
-      - name: "Checkout project"
-        uses: "actions/checkout@v4"
-      - name: "Download artifacts"
-        uses: "actions/download-artifact@v4"
+      - name: 'Checkout project'
+        uses: 'actions/checkout@v3'
+      - name: 'Download artifacts'
+        uses: 'actions/download-artifact@v3'
        with:
-          name: "dist-common-stages"
-          path: "./dist/"
-      - name: "Load common stages"
+          name: 'dist-common-stages'
+          path: './dist/'
+      - name: 'Load common stages'
        run: |
          docker system prune --all --force
          make IMAGE_REGISTRY="localhost" IMAGE_NAMESPACE="stage" IMAGE_PROJECT="build" load-native-image clean
-      - name: "Register binfmt entries"
+      - name: 'Register binfmt entries'
        if: "matrix.arch != 'native'"
        run: |
          make binfmt-register
-      - name: "Build and save image"
+      - name: 'Build and save image'
        run: |
          make \
            IMAGE_BUILD_OPTS="--cache-from localhost/stage/build:latest" \
            "build-${{ matrix.arch }}-image" "save-${{ matrix.arch }}-image"
-      - name: "Upload artifacts"
+      - name: 'Upload artifacts'
        if: "startsWith(github.ref, 'refs/tags/v') && matrix.arch != 'native'"
-        uses: "actions/upload-artifact@v4"
+        uses: 'actions/upload-artifact@v3'
        with:
-          name: "dist-${{ matrix.arch }}"
-          path: "./dist/"
+          name: 'dist-${{ matrix.arch }}'
+          path: './dist/'
          retention-days: 1

  push:
-    name: "Push ${{ matrix.arch }} image"
+    name: 'Push ${{ matrix.arch }} image'
    if: "startsWith(github.ref, 'refs/tags/v')"
-    needs: ["build"]
-    runs-on: "ubuntu-latest"
+    needs: ['build']
+    runs-on: 'ubuntu-latest'
    permissions:
-      contents: "read"
+      contents: 'read'
    strategy:
      matrix:
-        arch: ["amd64", "arm64v8"]
+        arch: ['amd64', 'arm64v8']
    steps:
-      - name: "Checkout project"
-        uses: "actions/checkout@v4"
-      - name: "Download artifacts"
-        uses: "actions/download-artifact@v4"
+      - name: 'Checkout project'
+        uses: 'actions/checkout@v3'
+      - name: 'Download artifacts'
+        uses: 'actions/download-artifact@v3'
        with:
-          name: "dist-${{ matrix.arch }}"
-          path: "./dist/"
-      - name: "Login to Docker Hub"
-        uses: "docker/login-action@v3"
+          name: 'dist-${{ matrix.arch }}'
+          path: './dist/'
+      - name: 'Login to Docker Hub'
+        uses: 'docker/login-action@v2'
        with:
-          registry: "docker.io"
-          username: "${{ secrets.DOCKERHUB_USERNAME }}"
-          password: "${{ secrets.DOCKERHUB_TOKEN }}"
-      - name: "Load and push image"
+          registry: 'docker.io'
+          username: '${{ secrets.DOCKERHUB_USERNAME }}'
+          password: '${{ secrets.DOCKERHUB_TOKEN }}'
+      - name: 'Load and push image'
        run: |
          make "load-${{ matrix.arch }}-image" "push-${{ matrix.arch }}-image"

  push-manifest:
-    name: "Push manifest"
+    name: 'Push manifest'
    if: "startsWith(github.ref, 'refs/tags/v')"
-    needs: ["push"]
-    runs-on: "ubuntu-latest"
+    needs: ['push']
+    runs-on: 'ubuntu-latest'
    permissions:
-      contents: "read"
+      contents: 'read'
    steps:
-      - name: "Checkout project"
-        uses: "actions/checkout@v4"
-      - name: "Login to Docker Hub"
-        uses: "docker/login-action@v3"
+      - name: 'Checkout project'
+        uses: 'actions/checkout@v3'
+      - name: 'Login to Docker Hub'
+        uses: 'docker/login-action@v2'
        with:
-          registry: "docker.io"
-          username: "${{ secrets.DOCKERHUB_USERNAME }}"
-          password: "${{ secrets.DOCKERHUB_TOKEN }}"
-      - name: "Push manifest"
+          registry: 'docker.io'
+          username: '${{ secrets.DOCKERHUB_USERNAME }}'
+          password: '${{ secrets.DOCKERHUB_TOKEN }}'
+      - name: 'Push manifest'
        run: |
          make push-cross-manifest

-  publish-github-release:
-    name: "Publish GitHub release"
+  release-github:
+    name: 'Create GitHub release'
    if: "startsWith(github.ref, 'refs/tags/v')"
-    needs: ["push-manifest"]
-    runs-on: "ubuntu-latest"
+    needs: ['push-manifest']
+    runs-on: 'ubuntu-latest'
    permissions:
-      contents: "write"
+      contents: 'write'
    steps:
-      - name: "Publish"
-        uses: "hectorm/ghaction-release@066200d04c3549852afa243d631ea3dc93390f68"
+      - name: 'Create release'
+        env:
+          GITHUB_PAT: '${{ secrets.GITHUB_TOKEN }}'
+        run: |
+          RELEASE_STATUS="$(curl -fs --proto '=https' --tlsv1.3 --globoff \
+            --url "https://api.github.com/repos/${GITHUB_REPOSITORY:?}/releases/tags/${GITHUB_REF_NAME:?}" \
+            --header "Authorization: Bearer ${GITHUB_PAT:?}" \
+            --header 'Accept: application/vnd.github.v3+json' \
+            --header 'Content-Type: application/json' \
+            --write-out '%{http_code}' --output /dev/null ||:)"
+          if [ "${RELEASE_STATUS:?}" = '200' ]; then exit 0; fi
+          RELEASE_ID="$(curl -fsS --proto '=https' --tlsv1.3 --globoff \
+            --url "https://api.github.com/repos/${GITHUB_REPOSITORY:?}/releases" \
+            --header "Authorization: Bearer ${GITHUB_PAT:?}" \
+            --header 'Accept: application/vnd.github.v3+json' \
+            --header 'Content-Type: application/json' \
+            --data "$(jq -rn --arg tag "${GITHUB_REF_NAME:?}" '{"name": $tag, "tag_name": $tag, "generate_release_notes": true}')" | jq -r '.id')"
+          if [ -z "${RELEASE_ID-}" ] || [ "${RELEASE_ID:?}" = 'null' ]; then exit 1; fi
--- a/.github/workflows/rebuild-latest-release.yml
+++ b/.github/workflows/rebuild-latest-release.yml
@ -1,22 +1,37 @@
-# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json
-name: "Rebuild latest release"
+name: 'Rebuild latest release'

 on:
  schedule:
-    - cron: "20 04 * * 1"
+    - cron: '20 04 * * 1'
  workflow_dispatch:

 permissions: {}

 jobs:
+
  trigger-rebuild:
-    name: "Trigger rebuild"
-    runs-on: "ubuntu-latest"
+    name: 'Trigger rebuild'
+    runs-on: 'ubuntu-latest'
    permissions:
-      actions: "write"
-      contents: "read"
+      contents: 'read'
    steps:
-      - name: "Trigger rebuild"
-        uses: "hectorm/ghaction-trigger-workflow@04c79e7a4e0c0b94bbcff3829f38359e34f1ea9e"
-        with:
-          workflow-id: "main.yml"
+      - name: 'REST API call'
+        env:
+          GITHUB_PAT: '${{ secrets.PERSONAL_GITHUB_TOKEN }}'
+        run: |
+          RELEASE_TAG="$(curl -fsS --proto '=https' --tlsv1.3 --globoff \
+              --url "https://api.github.com/repos/${GITHUB_REPOSITORY:?}/releases/latest" \
+              --header "Authorization: Bearer ${GITHUB_PAT:?}" \
+              --header 'Accept: application/vnd.github.v3+json' \
+              --header 'Content-Type: application/json' \
+                | jq -rc '.tag_name')"
+          if [ -n "${RELEASE_TAG-}" ] && [ "${RELEASE_TAG:?}" != 'null' ]; then
+            curl -fsS --proto '=https' --tlsv1.3 --globoff \
+              --url "https://api.github.com/repos/${GITHUB_REPOSITORY:?}/actions/workflows/main.yml/dispatches" \
+              --header "Authorization: Bearer ${GITHUB_PAT:?}" \
+              --header 'Accept: application/vnd.github.v3+json' \
+              --header 'Content-Type: application/json' \
+              --data "$(jq -rn --arg tag "${RELEASE_TAG:?}" '{"ref": $tag}')"
+          else
+            exit 1
+          fi
--- a/Dockerfile.m4
+++ b/Dockerfile.m4
@ -4,7 +4,7 @@ m4_changequote([[, ]])
 ## "build" stage
 ##################################################

-FROM --platform=${BUILDPLATFORM} docker.io/ubuntu:24.04 AS build
+FROM docker.io/ubuntu:22.04 AS build

 # Install system packages
 RUN export DEBIAN_FRONTEND=noninteractive \
@ -22,17 +22,17 @@ RUN export DEBIAN_FRONTEND=noninteractive \
 	&& rm -rf /var/lib/apt/lists/*

 # Download noVNC
-ARG NOVNC_VERSION=v1.5.0
+ARG NOVNC_VERSION=v1.3.0
 ARG NOVNC_TARBALL_URL=https://github.com/novnc/noVNC/archive/${NOVNC_VERSION}.tar.gz
-ARG NOVNC_TARBALL_CHECKSUM=6a73e41f98388a5348b7902f54b02d177cb73b7e5eb0a7a0dcf688cc2c79b42a
+ARG NOVNC_TARBALL_CHECKSUM=ee8f91514c9ce9f4054d132f5f97167ee87d9faa6630379267e569d789290336
 RUN curl -Lo /tmp/novnc.tgz "${NOVNC_TARBALL_URL:?}"
 RUN printf '%s' "${NOVNC_TARBALL_CHECKSUM:?}  /tmp/novnc.tgz" | sha256sum -c
 RUN mkdir /tmp/novnc/ && tar -xzf /tmp/novnc.tgz --strip-components=1 -C /tmp/novnc/

 # Download Websockify
-ARG WEBSOCKIFY_VERSION=v0.12.0
+ARG WEBSOCKIFY_VERSION=v0.10.0
 ARG WEBSOCKIFY_TARBALL_URL=https://github.com/novnc/websockify/archive/${WEBSOCKIFY_VERSION}.tar.gz
-ARG WEBSOCKIFY_TARBALL_CHECKSUM=37448ec992ef626f29558404cf6535592d02894ec1d5f0990a8c62621b39a967
+ARG WEBSOCKIFY_TARBALL_CHECKSUM=7bd99b727e0be230f6f47f65fbe4bd2ae8b2aa3568350148bdf5cf440c4c6b4a
 RUN curl -Lo /tmp/websockify.tgz "${WEBSOCKIFY_TARBALL_URL:?}"
 RUN printf '%s' "${WEBSOCKIFY_TARBALL_CHECKSUM:?}  /tmp/websockify.tgz" | sha256sum -c
 RUN mkdir /tmp/websockify/ && tar -xzf /tmp/websockify.tgz --strip-components=1 -C /tmp/websockify/
@ -59,14 +59,14 @@ RUN curl -Lo /tmp/samba.exe "${SAMBA_EXE_URL:?}"
 RUN printf '%s' "${SAMBA_EXE_CHECKSUM:?}  /tmp/samba.exe" | sha256sum -c

 # Download BusyBox
-ARG BUSYBOX_EXE_URL=https://frippery.org/files/busybox/busybox-w32-FRP-5398-g89ae34445.exe
-ARG BUSYBOX_EXE_CHECKSUM=e311f576b6222a6a30fc892c4be13bd42387bcca65563e7ffff7004b9460b86c
+ARG BUSYBOX_EXE_URL=https://frippery.org/files/busybox/busybox-w32-FRP-4716-g31467ddfc.exe
+ARG BUSYBOX_EXE_CHECKSUM=b4fd02bb938f97e59a0242da6a7763104d9cd344f96427af178940271b22ed5c
 RUN curl -Lo /tmp/busybox.exe "${BUSYBOX_EXE_URL:?}"
 RUN printf '%s' "${BUSYBOX_EXE_CHECKSUM:?}  /tmp/busybox.exe" | sha256sum -c

 # Download and install ReactOS
-ARG REACTOS_ISO_URL=https://downloads.sourceforge.net/reactos/ReactOS-0.4.14-release-119-gce0b4ff-iso.zip
-ARG REACTOS_ISO_CHECKSUM=2937a619c9988d9c697930160e378d21048069c74e224b5c5ff6be470784b7d8
+ARG REACTOS_ISO_URL=https://downloads.sourceforge.net/reactos/ReactOS-0.4.14-release-23-gc1b15db-iso.zip
+ARG REACTOS_ISO_CHECKSUM=a95950b23efc44f197f47d09b4fc1b89b6f6a2ad08b6964e15dd834184a915de
 RUN curl -Lo /tmp/reactos.zip "${REACTOS_ISO_URL:?}"
 RUN printf '%s' "${REACTOS_ISO_CHECKSUM:?}  /tmp/reactos.zip" | sha256sum -c
 RUN 7z e /tmp/reactos.zip -so '*.iso' > /tmp/reactos.iso \
@ -92,7 +92,8 @@ RUN mkisofs -no-emul-boot -iso-level 4 -eltorito-boot loader/isoboot.bin -o /tmp
 ## "base" stage
 ##################################################

-m4_ifdef([[CROSS_ARCH]], [[FROM docker.io/CROSS_ARCH/ubuntu:24.04]], [[FROM docker.io/ubuntu:24.04]]) AS base
+m4_ifdef([[CROSS_ARCH]], [[FROM docker.io/CROSS_ARCH/ubuntu:22.04]], [[FROM docker.io/ubuntu:22.04]]) AS base
+m4_ifdef([[CROSS_QEMU]], [[COPY --from=docker.io/hectorm/qemu-user-static:latest CROSS_QEMU CROSS_QEMU]])

 # Install system packages
 RUN export DEBIAN_FRONTEND=noninteractive \
--- a/LICENSE.md
+++ b/LICENSE.md
@ -1,7 +1,7 @@
 The MIT License (MIT)
 =====================

-Copyright © Héctor Molinero Fernández
+Copyright © 2022 Héctor Molinero Fernández

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/17
+++ b/17
@ -14,14 +14,9 @@ IMAGE_REGISTRY := docker.io
 IMAGE_NAMESPACE := hectorm
 IMAGE_PROJECT := qemu-reactos
 IMAGE_NAME := $(IMAGE_REGISTRY)/$(IMAGE_NAMESPACE)/$(IMAGE_PROJECT)
-ifeq ($(shell '$(GIT)' status --porcelain 2>/dev/null),)
-	IMAGE_GIT_TAG := $(shell '$(GIT)' tag --list --contains HEAD 2>/dev/null)
-	IMAGE_GIT_SHA := $(shell '$(GIT)' rev-parse --verify --short HEAD 2>/dev/null)
-	IMAGE_VERSION := $(if $(IMAGE_GIT_TAG),$(IMAGE_GIT_TAG),$(if $(IMAGE_GIT_SHA),$(IMAGE_GIT_SHA),nil))
-else
-	IMAGE_GIT_BRANCH := $(shell '$(GIT)' symbolic-ref --short HEAD 2>/dev/null)
-	IMAGE_VERSION := $(if $(IMAGE_GIT_BRANCH),$(IMAGE_GIT_BRANCH)-dirty,nil)
-endif
+IMAGE_GIT_TAG := $(shell '$(GIT)' tag -l --contains HEAD 2>/dev/null)
+IMAGE_GIT_SHA := $(shell '$(GIT)' rev-parse HEAD 2>/dev/null)
+IMAGE_VERSION := $(if $(IMAGE_GIT_TAG),$(IMAGE_GIT_TAG),$(if $(IMAGE_GIT_SHA),$(IMAGE_GIT_SHA),nil))

 IMAGE_BUILD_OPTS :=

@ -70,11 +65,11 @@ $(IMAGE_AMD64_DOCKERFILE): $(DOCKERFILE_TEMPLATE)
 	'$(M4)' \
 		--prefix-builtins \
 		--define=CROSS_ARCH=amd64 \
+		--define=CROSS_QEMU=/usr/bin/qemu-x86_64-static \
 		'$(DOCKERFILE_TEMPLATE)' > '$@'
 	'$(DOCKER)' build $(IMAGE_BUILD_OPTS) \
 		--tag '$(IMAGE_NAME):$(IMAGE_VERSION)-amd64' \
 		--tag '$(IMAGE_NAME):latest-amd64' \
-		--platform linux/amd64 \
 		--file '$@' ./

 .PHONY: build-arm64v8-image
@ -85,11 +80,11 @@ $(IMAGE_ARM64V8_DOCKERFILE): $(DOCKERFILE_TEMPLATE)
 	'$(M4)' \
 		--prefix-builtins \
 		--define=CROSS_ARCH=arm64v8 \
+		--define=CROSS_QEMU=/usr/bin/qemu-aarch64-static \
 		'$(DOCKERFILE_TEMPLATE)' > '$@'
 	'$(DOCKER)' build $(IMAGE_BUILD_OPTS) \
 		--tag '$(IMAGE_NAME):$(IMAGE_VERSION)-arm64v8' \
 		--tag '$(IMAGE_NAME):latest-arm64v8' \
-		--platform linux/arm64/v8 \
 		--file '$@' ./

 ##################################################
@ -193,7 +188,7 @@ push-cross-manifest:

 .PHONY: binfmt-register
 binfmt-register:
-	'$(DOCKER)' run --rm --privileged docker.io/hectorm/qemu-user-static:latest --reset --persistent yes --credential yes
+	'$(DOCKER)' run --rm --privileged docker.io/hectorm/qemu-user-static:latest --reset

 ##################################################
 ## "version" target
--- a/README.md
+++ b/README.md
@ -9,13 +9,9 @@ docker run --detach \
  --device /dev/kvm \
  --publish 127.0.0.1:5900:5900/tcp \
  --publish 127.0.0.1:6080:6080/tcp \
-  --mount type=volume,src=qemu-reactos-disk,dst=/var/lib/qemu/disk/ \
  docker.io/hectorm/qemu-reactos:latest
 ```

-> [!NOTE]
-> The `--device /dev/kvm` option can only be used on Linux hosts, it can be removed on Windows and macOS hosts at a significant performance penalty.
-
 The instance can be accessed from:
 * **VNC** (`5900/TCP`), without password.
 * **noVNC** (`6080/TCP`), http://127.0.0.1:6080/vnc.html
--- a/scripts/service/qemu/control/t
+++ b/scripts/service/qemu/control/t
@ -2,4 +2,4 @@

 set -eu

-printf '%s\n' 'system_powerdown' | nc -w 1 -U /run/qemu-monitor
+printf '%s\n' 'system_powerdown' | nc -U /run/qemu-monitor
--- a/scripts/service/smbd/run
+++ b/scripts/service/smbd/run
@ -2,10 +2,6 @@

 set -eu

-if [ ! -d /run/samba/ ]; then
-	install -m 755 -o root -g root -d /run/samba/
-fi
-
 cd /run/samba/
 exec 2>&1
 exec /usr/sbin/smbd --foreground --debug-stdout --debuglevel=3