From 45b3d47303f078b6666597a4d70b798f3a28c71a Mon Sep 17 00:00:00 2001
From: Deepika Shanmugam <deepikas@axis.com>
Date: Thu, 22 Feb 2024 14:05:01 +0100
Subject: [PATCH] Remove the script relates to cgroups

---
 Dockerfile                     | 3 ---
 app/preuninstallscript.sh      | 3 ---
 binaries/handle_directories.sh | 8 --------
 3 files changed, 14 deletions(-)
 delete mode 100755 binaries/handle_directories.sh

diff --git a/Dockerfile b/Dockerfile
index 64343f4..7bd2e6c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -102,9 +102,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
diff --git a/app/preuninstallscript.sh b/app/preuninstallscript.sh
index 049975d..be92d9b 100644
--- a/app/preuninstallscript.sh
+++ b/app/preuninstallscript.sh
@@ -11,9 +11,6 @@ _appdirectory=/usr/local/packages/$_appname
 _uname="$(stat -c '%U' "$_appdirectory")"
 _uid="$(id "$_uname" -u)"
 
-# Remove the user folder (this step should only be needed for cgroups v1 system)
-rm -Rf "/run/user/$_uid"
-
 # Remove the subuid/subgid mappings
 sed -i "/$_uid/d" /etc/subuid
 sed -i "/$_uid/d" /etc/subgid
diff --git a/binaries/handle_directories.sh b/binaries/handle_directories.sh
deleted file mode 100755
index 8d1aa8e..0000000
--- a/binaries/handle_directories.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh -e
-
-# Create /usr/run/<uid> on cgroups v1 system since user service will not run there
-# since script is run by root the required inputs are uid, user, group
-if [ -d /sys/fs/cgroup/unified ]; then
-    mkdir -p /run/user/"$1"
-    chown "$2":"$3" /run/user/"$1"
-fi