From 8da0bd023da8adc1c6eb6fe45f08126d03e7e773 Mon Sep 17 00:00:00 2001
From: "Josh.5" <jsunnex@gmail.com>
Date: Mon, 10 Jul 2023 18:03:36 +1200
Subject: [PATCH] Hacky fix for bwrap execution inside the Debian container
 running under the NVIDIA Docker runtime

Ref: https://github.com/flatpak/flatpak/wiki/User-namespace-requirements
---
 Dockerfile                                          |  1 +
 overlay/etc/cont-init.d/10-setup_user.sh            |  2 +-
 .../{80-configure-dind.sh => 80-configure_dind.sh}  |  0
 overlay/etc/cont-init.d/80-configure_flatpak.sh     | 13 +++++++++++++
 4 files changed, 15 insertions(+), 1 deletion(-)
 rename overlay/etc/cont-init.d/{80-configure-dind.sh => 80-configure_dind.sh} (100%)
 create mode 100644 overlay/etc/cont-init.d/80-configure_flatpak.sh

diff --git a/Dockerfile b/Dockerfile
index 5c9bdef..52f0a69 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -310,6 +310,7 @@ RUN \
     echo "**** Configure flatpak ****" \
         && chmod u+s /usr/bin/bwrap \
         && flatpak remote-add flathub https://flathub.org/repo/flathub.flatpakrepo \
+        && dpkg-statoverride --update --add root root 0755 /usr/bin/bwrap \
     && \
     echo "**** Section cleanup ****" \
         && apt-get clean autoclean -y \
diff --git a/overlay/etc/cont-init.d/10-setup_user.sh b/overlay/etc/cont-init.d/10-setup_user.sh
index 3e87474..f2ac554 100644
--- a/overlay/etc/cont-init.d/10-setup_user.sh
+++ b/overlay/etc/cont-init.d/10-setup_user.sh
@@ -5,7 +5,7 @@
 # File Created: Friday, 12th January 2022 8:54:01 am
 # Author: Josh.5 (jsunnex@gmail.com)
 # -----
-# Last Modified: Monday, 10th July 2023 5:30:28 pm
+# Last Modified: Monday, 10th July 2023 5:56:17 pm
 # Modified By: Console and webGui login account (jsunnex@gmail.com)
 ###
 
diff --git a/overlay/etc/cont-init.d/80-configure-dind.sh b/overlay/etc/cont-init.d/80-configure_dind.sh
similarity index 100%
rename from overlay/etc/cont-init.d/80-configure-dind.sh
rename to overlay/etc/cont-init.d/80-configure_dind.sh
diff --git a/overlay/etc/cont-init.d/80-configure_flatpak.sh b/overlay/etc/cont-init.d/80-configure_flatpak.sh
new file mode 100644
index 0000000..3cb0b2f
--- /dev/null
+++ b/overlay/etc/cont-init.d/80-configure_flatpak.sh
@@ -0,0 +1,13 @@
+
+echo "**** Configure Flatpak ****"
+
+if [ "X${NVIDIA_VISIBLE_DEVICES:-}" != "X" ]; then
+    # Fix some flatpak quirks (not sure what is happening here) for NVIDIA containers
+    mount -t proc none /proc
+    flatpak list
+    echo "Flatpak configured for running inside a Docker container"
+else
+    echo "Flatpak already configured for running inside a Docker container"
+fi
+
+echo "DONE"