build: Update QEMU base image to v7.29 (#377)

Add error handling for logo replacement in BIOS

.devcontainer/010 - macOS Sequoia/devcontainer.json

@@ -8,14 +8,12 @@
   "portsAttributes": {
     "8006": {
       "label": "Web",
-      "onAutoForward": "openBrowser"
+      "onAutoForward": "notify"
     }
   },
   "otherPortsAttributes": {
-    "onAutoForward": "silent"
+    "onAutoForward": "ignore"
   }, 
-  "hostRequirements": {
+  "dockerComposeFile": "../codespaces.yml",
-    "storage": "64gb"
+  "initializeCommand": "docker system prune --all --force"
-  },  
-  "dockerComposeFile": "../codespaces.yml"
 }

.devcontainer/030 - macOS Ventura/devcontainer.json

@@ -8,14 +8,12 @@
   "portsAttributes": {
     "8006": {
       "label": "Web",
-      "onAutoForward": "openBrowser"
+      "onAutoForward": "notify"
     }
   },
   "otherPortsAttributes": {
-    "onAutoForward": "silent"
+    "onAutoForward": "ignore"
   }, 
-  "hostRequirements": {
+  "dockerComposeFile": "../codespaces.yml",
-    "storage": "64gb"
+  "initializeCommand": "docker system prune --all --force"
-  },  
-  "dockerComposeFile": "../codespaces.yml"
 }

.devcontainer/040 - macOS Monterey/devcontainer.json

@@ -8,14 +8,12 @@
   "portsAttributes": {
     "8006": {
       "label": "Web",
-      "onAutoForward": "openBrowser"
+      "onAutoForward": "notify"
     }
   },
   "otherPortsAttributes": {
-    "onAutoForward": "silent"
+    "onAutoForward": "ignore"
   }, 
-  "hostRequirements": {
+  "dockerComposeFile": "../codespaces.yml",
-    "storage": "64gb"
+  "initializeCommand": "docker system prune --all --force"
-  },  
-  "dockerComposeFile": "../codespaces.yml"
 }

.devcontainer/050 - macOS Big Sur/devcontainer.json

@@ -8,14 +8,12 @@
   "portsAttributes": {
     "8006": {
       "label": "Web",
-      "onAutoForward": "openBrowser"
+      "onAutoForward": "notify"
     }
   },
   "otherPortsAttributes": {
-    "onAutoForward": "silent"
+    "onAutoForward": "ignore"
   }, 
-  "hostRequirements": {
+  "dockerComposeFile": "../codespaces.yml",
-    "storage": "64gb"
+  "initializeCommand": "docker system prune --all --force"
-  },  
-  "dockerComposeFile": "../codespaces.yml"
 }

.devcontainer/060 - macOS Catalina/devcontainer.json

@@ -8,14 +8,12 @@
   "portsAttributes": {
     "8006": {
       "label": "Web",
-      "onAutoForward": "openBrowser"
+      "onAutoForward": "notify"
     }
   },
   "otherPortsAttributes": {
-    "onAutoForward": "silent"
+    "onAutoForward": "ignore"
   }, 
-  "hostRequirements": {
+  "dockerComposeFile": "../codespaces.yml",
-    "storage": "64gb"
+  "initializeCommand": "docker system prune --all --force"
-  },  
-  "dockerComposeFile": "../codespaces.yml"
 }

.devcontainer/codespaces.yml

@@ -1,10 +1,8 @@
 services:
   macos:
-    image: dockurr/macos
     container_name: macos
+    image: ghcr.io/dockur/macos
     environment:
-      VERSION: "14"
-      ALLOCATE: "Y"
       RAM_SIZE: "half"
       DISK_SIZE: "max"
       CPU_CORES: "max"

.devcontainer/devcontainer.json

@@ -8,14 +8,12 @@
   "portsAttributes": {
     "8006": {
       "label": "Web",
-      "onAutoForward": "openBrowser"
+      "onAutoForward": "notify"
     }
   },
   "otherPortsAttributes": {
-    "onAutoForward": "silent"
+    "onAutoForward": "ignore"
   }, 
-  "hostRequirements": {
+  "dockerComposeFile": "codespaces.yml",
-    "storage": "64gb"
+  "initializeCommand": "docker system prune --all --force"
-  },  
-  "dockerComposeFile": "codespaces.yml"
 }

.github/workflows/build.yml

@@ -22,7 +22,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
       -

.github/workflows/check.yml

@@ -7,7 +7,7 @@ jobs:
     name: shellcheck
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Run ShellCheck
         uses: ludeeus/action-shellcheck@master
         env:

.github/workflows/hub.yml

@@ -12,7 +12,9 @@ jobs:
   dockerHubDescription:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+      -
+        name: Checkout repo
+        uses: actions/checkout@v6
       - 
         name: Docker Hub Description
         uses: peter-evans/dockerhub-description@v5

.github/workflows/review.yml

@@ -0,0 +1,66 @@
+on:
+  pull_request:
+
+name: "Review"
+
+permissions:
+  contents: read
+  pull-requests: write
+  checks: write
+
+jobs:
+  review:
+    name: review
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v6
+      -
+        name: Spelling
+        uses: reviewdog/action-misspell@v1
+        with:
+          locale: "US"
+          level: warning
+          pattern: |
+            *.md
+            *.sh
+          reporter: github-pr-review
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+      -
+        name: Hadolint
+        uses: reviewdog/action-hadolint@v1
+        with:
+          level: warning
+          reporter: github-pr-review
+          hadolint_ignore: DL3008 DL3018 DL3020 DL3029 DL3059
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+      -
+        name: YamlLint
+        uses: reviewdog/action-yamllint@v1
+        with:
+          level: warning
+          reporter: github-pr-review
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+      -
+        name: ActionLint
+        uses: reviewdog/action-actionlint@v1
+        with:
+          level: warning
+          reporter: github-pr-review
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+      -
+        name: Shellformat
+        uses: reviewdog/action-shfmt@v1
+        with:
+          level: warning
+          shfmt_flags: "-i 2 -ci -bn"
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+      -
+        name: Shellcheck
+        uses: reviewdog/action-shellcheck@v1
+        with:
+          level: warning
+          reporter: github-pr-review
+          shellcheck_flags: -x -e SC1091 -e SC2001 -e SC2002 -e SC2034 -e SC2064 -e SC2153 -e SC2317 -e SC2028
+          github_token: ${{ secrets.GITHUB_TOKEN }}

Dockerfile

@@ -12,7 +12,7 @@ RUN apk --update --no-cache add unzip && \
     rm -rf /tmp/* /var/tmp/* /var/cache/apk/*
 
 FROM scratch AS runner
-COPY --from=qemux/qemu:7.25 / /
+COPY --from=qemux/qemu:7.29 / /
 
 ARG VERSION_ARG="0.0"
 ARG VERSION_KVM_OPENCORE="v21"

readme.md

@@ -49,7 +49,7 @@ services:
 ##### Via Docker CLI:
 
 ```bash
-docker run -it --rm --name macos -e "VERSION=14" -p 8006:8006 --device=/dev/kvm --device=/dev/net/tun --cap-add NET_ADMIN -v "${PWD:-.}/macos:/storage" --stop-timeout 120 dockurr/macos
+docker run -it --rm --name macos -e "VERSION=14" -p 8006:8006 --device=/dev/kvm --device=/dev/net/tun --cap-add NET_ADMIN -v "${PWD:-.}/macos:/storage" --stop-timeout 120 docker.io/dockurr/macos
 ```
 
 ##### Via Kubernetes:
@@ -146,7 +146,7 @@ kubectl apply -f https://raw.githubusercontent.com/dockur/macos/refs/heads/maste
   ```
 
 > [!IMPORTANT]  
-> If your system has an AMD processor it is generally not advisable to enable multiple cores (at least not until macOS is installed and running correctly). It might introduce stability and performance problems, so proceed with caution.
+> If your system has an AMD processor (instead of Intel), it is not advisable to enable multiple cores before the  installation is completed and you have verified that everything runs stable for a while. Because in many cases it will introduce issues, which are difficult to pinpoint if you do not have experience with its behavior on a single core first.
 
 ### How do I assign an individual IP address to the container?
 

src/boot.sh

@@ -45,15 +45,23 @@ DEST="$STORAGE/$DEST"
 
 if [ ! -s "$DEST.rom" ] || [ ! -f "$DEST.rom" ]; then
   [ ! -s "$OVMF/$ROM" ] || [ ! -f "$OVMF/$ROM" ] && error "UEFI boot file ($OVMF/$ROM) not found!" && exit 44
-  cp "$OVMF/$ROM" "$DEST.rom"
+  if [[ "${LOGO:-}" == [Nn]* ]]; then
-  if [[ "${LOGO:-}" != [Nn]* ]]; then
+    cp "$OVMF/$ROM" "$DEST.tmp"
-    /run/utk.bin "$DEST.rom" replace_ffs LogoDXE "/var/www/img/macos.ffs" save "$DEST.rom"
+  else
+    if ! /run/utk.bin "$OVMF/$ROM" replace_ffs LogoDXE "/var/www/img/${PROCESS,,}.ffs" save "$DEST.tmp"; then
+      warn "failed to add custom logo to BIOS!"
+      cp "$OVMF/$ROM" "$DEST.tmp"
     fi
+  fi
+  mv "$DEST.tmp" "$DEST.rom"
+  ! setOwner "$DEST.rom" && error "Failed to set the owner for \"$DEST.rom\" !"
 fi
 
 if [ ! -s "$DEST.vars" ] || [ ! -f "$DEST.vars" ]; then
   [ ! -s "$OVMF/$VARS" ] || [ ! -f "$OVMF/$VARS" ]&& error "UEFI vars file ($OVMF/$VARS) not found!" && exit 45
-  cp "$OVMF/$VARS" "$DEST.vars"
+  cp "$OVMF/$VARS" "$DEST.tmp"
+  mv "$DEST.tmp" "$DEST.vars"
+  ! setOwner "$DEST.vars" && error "Failed to set the owner for \"$DEST.vars\" !"
 fi
 
 BOOT_OPTS+=" -drive if=pflash,format=raw,readonly=on,file=$DEST.rom"
@@ -155,6 +163,8 @@ if [ ! -f "$IMG" ]; then
 
 fi
 
+! setOwner "$IMG" && error "Failed to set the owner for \"$IMG\" !"
+
 BOOT_DRIVE_ID="OpenCore"
 
 DISK_OPTS+=" -device virtio-blk-pci,drive=${BOOT_DRIVE_ID},bus=pcie.0,addr=0x5,bootindex=$BOOT_INDEX"

src/install.sh

@@ -155,7 +155,10 @@ install() {
   esac
 
   rm -f "$dest"
-  mkdir -p "$STORAGE"
+
+  if ! makeDir "$STORAGE"; then
+    error "Failed to create directory \"$STORAGE\" !" && return 1
+  fi
 
   find "$STORAGE" -maxdepth 1 -type f \( -iname '*.rom' -or -iname '*.vars' \) -delete
   find "$STORAGE" -maxdepth 1 -type f \( -iname 'data.*' -or -iname 'macos.*' \) -delete
@@ -191,7 +194,9 @@ generateID() {
   UUID=$(cat /proc/sys/kernel/random/uuid 2> /dev/null || uuidgen --random)
   UUID="${UUID^^}"
   UUID="${UUID//[![:print:]]/}"
+
   echo "$UUID" > "$file"
+  ! setOwner "$file" && error "Failed to set the owner for \"$file\" !"
 
   return 0
 }
@@ -208,7 +213,9 @@ generateAddress() {
   # Generate Apple MAC address based on Docker container ID in hostname
   MAC=$(echo "$HOST" | md5sum | sed 's/^\(..\)\(..\)\(..\)\(..\)\(..\).*$/00:16:cb:\3:\4:\5/')
   MAC="${MAC^^}" 
+
   echo "$MAC" > "$file"
+  ! setOwner "$file" && error "Failed to set the owner for \"$file\" !"
 
   return 0
 }
@@ -239,6 +246,9 @@ generateSerial() {
   echo "$SN" > "$file"
   echo "$MLB" > "$file2"
 
+  ! setOwner "$file" && error "Failed to set the owner for \"$file\" !"
+  ! setOwner "$file2" && error "Failed to set the owner for \"$file2\" !"
+
   return 0
 }
 
@@ -262,6 +272,7 @@ if [ ! -f "$BASE_IMG" ] || [ ! -s "$BASE_IMG" ]; then
 
   if [ ! -f "$BASE_IMG" ] || [ ! -s "$BASE_IMG" ]; then
     ! install "$VERSION" "$BASE_IMG" && exit 34
+    ! setOwner "$BASE_IMG" && error "Failed to set the owner for \"$BASE_IMG\" !"
   fi
 
 fi