From 5bce33568499f23ad221593b5b2120ccd4d32f9b Mon Sep 17 00:00:00 2001
From: Deepika Shanmugam <deepikas@axis.com>
Date: Thu, 22 Feb 2024 14:39:00 +0100
Subject: [PATCH] Remove the script of handling directories /run owned by root

---
 Dockerfile                     | 6 +-----
 app/postinstallscript.sh       | 2 --
 binaries/handle_directories.sh | 7 -------
 3 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100755 binaries/handle_directories.sh

diff --git a/Dockerfile b/Dockerfile
index 0202f51..9a5d6d1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -104,9 +104,6 @@ COPY app /opt/app
 COPY --from=ps /export/ps /opt/app
 COPY --from=nsenter /export/nsenter /opt/app
 
-# Temp fix to remove 'root' directories
-COPY ./binaries/handle_directories.sh /opt/app
-
 WORKDIR /opt/app
 
 # Download and extract slirp4netns
@@ -153,8 +150,7 @@ RUN <<EOF
         -a slirp4netns \
         -a rootlesskit \
         -a rootlesskit-docker-proxy \
-        -a nsenter \
-        -a handle_directories.sh
+        -a nsenter
 EOF
 
 ENTRYPOINT [ "/opt/axis/acapsdk/sysroots/x86_64-pokysdk-linux/usr/bin/eap-install.sh" ]
diff --git a/app/postinstallscript.sh b/app/postinstallscript.sh
index dbbd5a8..28500c5 100644
--- a/app/postinstallscript.sh
+++ b/app/postinstallscript.sh
@@ -32,8 +32,6 @@ After=network-online.target containerd.service var-spool-storage-SD_DISK.mount
 Wants=network-online.target
 After=user@$_uid.service
 Requires=user@$_uid.service
-[Service]
-ExecStartPre=+$_appdirectory/handle_directories.sh $_uid $_uname $_gname
 EOF
 
 # reload daemon for service file changes to take effect
diff --git a/binaries/handle_directories.sh b/binaries/handle_directories.sh
deleted file mode 100755
index 41bc04a..0000000
--- a/binaries/handle_directories.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-# These directories will be owned by root if they exist so remove them
-# so that our rootless setup works as intended
-rm -Rf /run/docker
-rm -Rf /run/containerd
-rm -Rf /run/xtables.lock