feat(ampstart.sh): make machine-id unique static for each instance

Author: Greelan

scripts/apps/redis/ampstart.sh

@@ -8,10 +8,11 @@ ARCH=$(uname -m)
 # Context check
 [[ -z "${AMPUSERID}" ]] && { echo "[Error] This docker image cannot be used directly by itself - it must be started by ampinstmgr"; exit 100; }
 
-# Create /etc/machine-id (addresses Proton/dbus issues)
+# Create static/etc/machine-id based on AMP instance UUID (addresses Proton/dbus issues)
 mkdir -p /var/lib/dbus
 rm -f /etc/machine-id /var/lib/dbus/machine-id
-dbus-uuidgen --ensure=/etc/machine-id
+MachineID=$(grep '^AMP.InstanceID=' /AMP/AMPConfig.conf | sed 's/.*=//' | tr -d '-')
+echo "$MachineID" > /etc/machine-id
 ln -s /etc/machine-id /var/lib/dbus/machine-id
 
 # Create /tmp/.X11-unix (for Xvfb etc)

scripts/apps/uptime-kuma-2/ampstart.sh

@@ -8,10 +8,11 @@ ARCH=$(uname -m)
 # Context check
 [[ -z "${AMPUSERID}" ]] && { echo "[Error] This docker image cannot be used directly by itself - it must be started by ampinstmgr"; exit 100; }
 
-# Create /etc/machine-id (addresses Proton/dbus issues)
+# Create static/etc/machine-id based on AMP instance UUID (addresses Proton/dbus issues)
 mkdir -p /var/lib/dbus
 rm -f /etc/machine-id /var/lib/dbus/machine-id
-dbus-uuidgen --ensure=/etc/machine-id
+MachineID=$(grep '^AMP.InstanceID=' /AMP/AMPConfig.conf | sed 's/.*=//' | tr -d '-')
+echo "$MachineID" > /etc/machine-id
 ln -s /etc/machine-id /var/lib/dbus/machine-id
 
 # Create /tmp/.X11-unix (for Xvfb etc)

scripts/base/ampstart.sh

@@ -8,10 +8,11 @@ ARCH=$(uname -m)
 # Context check
 [[ -z "${AMPUSERID}" ]] && { echo "[Error] This docker image cannot be used directly by itself - it must be started by ampinstmgr"; exit 100; }
 
-# Create /etc/machine-id (addresses Proton/dbus issues)
+# Create static/etc/machine-id based on AMP instance UUID (addresses Proton/dbus issues)
 mkdir -p /var/lib/dbus
 rm -f /etc/machine-id /var/lib/dbus/machine-id
-dbus-uuidgen --ensure=/etc/machine-id
+MachineID=$(grep '^AMP.InstanceID=' /AMP/AMPConfig.conf | sed 's/.*=//' | tr -d '-')
+echo "$MachineID" > /etc/machine-id
 ln -s /etc/machine-id /var/lib/dbus/machine-id
 
 # Create /tmp/.X11-unix (for Xvfb etc)