fix: Port forwarding warning (#809)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

.github/workflows/build.yml

@@ -73,7 +73,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build Docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: true

Dockerfile

@@ -54,9 +54,9 @@ COPY --chmod=744 ./web/nginx.conf /etc/nginx/sites-enabled/web.conf
 VOLUME /storage
 EXPOSE 22 139 445 5000
 
-ENV RAM_SIZE "1G"
-ENV DISK_SIZE "16G"
-ENV CPU_CORES "1"
+ENV RAM_SIZE="1G"
+ENV DISK_SIZE="16G"
+ENV CPU_CORES="1"
 
 HEALTHCHECK --interval=60s --start-period=45s --retries=2 CMD /run/check.sh
 

readme.md

@@ -205,7 +205,7 @@ kubectl apply -f kubernetes.yml
 
 ### How can DSM acquire an IP address from my router?
 
-  After configuring the container for macvlan (see above), it is possible for DSM to become part of your home network by requesting an IP from your router, just like your other devices.
+  After configuring the container for [macvlan](#how-do-i-assign-an-individual-ip-address-to-the-container), it is possible for DSM to become part of your home network by requesting an IP from your router, just like your other devices.
 
   To enable this mode, add the following lines to your compose file:
 
@@ -219,7 +219,7 @@ kubectl apply -f kubernetes.yml
   ```
 
 > [!NOTE]
-> Even if you don't need DHCP, it's still recommended to enable this mode, as it prevents NAT issues and increases performance by using a `macvtap` interface. You can just set a static IP from the DSM control panel afterwards.
+> In this mode, the container and DSM will each have their own separate IPs.
 
 ### How do I pass-through the GPU?
 
@@ -281,4 +281,4 @@ kubectl apply -f kubernetes.yml
 [Size]: https://img.shields.io/docker/image-size/vdsm/virtual-dsm/latest?color=066da5&label=size
 [Pulls]: https://img.shields.io/docker/pulls/vdsm/virtual-dsm.svg?style=flat&label=pulls&logo=docker
 [Version]: https://img.shields.io/docker/v/vdsm/virtual-dsm/latest?arch=amd64&sort=semver&color=066da5
-[Package]: https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2Fipitio%2Fghcr-pulls%2Fmaster%2Findex.json&query=%24%5B%3F(%40.owner%3D%3D%22vdsm%22%20%26%26%20%40.repo%3D%3D%22virtual-dsm%22%20%26%26%20%40.image%3D%3D%22virtual-dsm%22)%5D.pulls&logo=github&style=flat&color=066da5&label=pulls
+[Package]: https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fipitio.github.io%2Fbackage%2Fvdsm%2Fvirtual-dsm%2Fvirtual-dsm.json&query=%24.downloads&logo=github&style=flat&color=066da5&label=pulls

src/network.sh

@@ -397,7 +397,7 @@ else
     if ! configureNAT; then
 
       NETWORK="user"
-      warn "falling back to usermode networking (slow)!"
+      warn "falling back to usermode networking! Performance will be bad and port forwarding will not work."
 
       ip link set "$VM_NET_TAP" down promisc off &> null || true
       ip link delete "$VM_NET_TAP" &> null || true

src/progress.sh

@@ -28,7 +28,7 @@ do
       if [ -z "$total" ] || [[ "$total" == "0" ]]; then
         size=$(numfmt --to=iec --suffix=B  "$bytes" | sed -r 's/([A-Z])/ \1/')
       else
-        size=$(printf '%.1f\n' "$((bytes*100*100/total))e-2")
+        size="$(echo "$bytes" "$total" | awk '{printf "%.1f", $1 * 100 / $2}')"
         size="$size%"
       fi
       echo "${body//(\[P\])/($size)}"> "$info"

src/reset.sh

@@ -38,14 +38,26 @@ TEMPLATE="/var/www/index.html"
 FOOTER1="$APP for Docker v$(</run/version)"
 FOOTER2="<a href='$SUPPORT'>$SUPPORT</a>"
 
+CPI=$(lscpu)
 SYS=$(uname -r)
 HOST=$(hostname -s)
 KERNEL=$(echo "$SYS" | cut -b 1)
 MINOR=$(echo "$SYS" | cut -d '.' -f2)
 ARCH=$(dpkg --print-architecture)
 CORES=$(grep -c '^processor' /proc/cpuinfo)
-SOCKETS=$(lscpu | grep -m 1 -i 'socket(s)' | awk '{print $(2)}')
-CPU=$(lscpu | grep -m 1 -i 'model name' | cut -f 2 -d ":" | awk '{$1=$1}1' | sed 's# @.*##g' | sed s/"(R)"//g | sed 's/[^[:alnum:] ]\+/ /g' | sed 's/  */ /g')
+
+if ! grep -qi "socket(s)" <<< "$CPI"; then
+  SOCKETS=1
+else
+  SOCKETS=$(echo "$CPI" | grep -m 1 -i 'socket(s)' | awk '{print $(2)}')
+fi
+
+if ! grep -qi "model name" <<< "$CPI"; then
+  CPU="Unknown"
+else
+  CPU=$(echo "$CPI" | grep -m 1 -i 'model name' | cut -f 2 -d ":" | awk '{$1=$1}1' | sed 's# @.*##g' | sed s/"(R)"//g | sed 's/[^[:alnum:] ]\+/ /g' | sed 's/  */ /g')
+  CPU="${CPU// with Radeon Graphics/}"
+fi
 
 # Check system