@@ -707,8 +707,8 @@ entrypoint config@Config{..} DockerEntrypoint{..} = do
707
707
User. getUserEntryForName stackUserName
708
708
-- Switch UID/GID if needed, and update user's home directory
709
709
case deUidGid of
710
- Nothing -> updateRootUser envOverride homeDir
711
- Just (0 ,_) -> updateRootUser envOverride homeDir
710
+ Nothing -> return ()
711
+ Just (0 ,_) -> return ()
712
712
Just (uid,gid) -> updateOrCreateStackUser envOverride estackUserEntry0 homeDir uid gid
713
713
case estackUserEntry0 of
714
714
Left _ -> return ()
@@ -744,13 +744,6 @@ entrypoint config@Config{..} DockerEntrypoint{..} = do
744
744
copyFile srcIndex destIndex
745
745
return True
746
746
where
747
- updateRootUser envOverride homeDir = do
748
- -- Adjust the 'root' user's home directory to match HOME environment variable,
749
- -- when running as root or no UID/GID provided
750
- readProcessNull Nothing envOverride " usermod"
751
- [" -o"
752
- ," --home" ,toFilePathNoTrailingSep homeDir
753
- ,rootUserName]
754
747
updateOrCreateStackUser envOverride estackUserEntry homeDir uid gid = do
755
748
case estackUserEntry of
756
749
Left _ -> do
@@ -781,7 +774,6 @@ entrypoint config@Config{..} DockerEntrypoint{..} = do
781
774
User. setGroupID gid
782
775
User. setUserID uid
783
776
stackUserName = " stack" :: String
784
- rootUserName = " root" :: String
785
777
786
778
-- | MVar used to ensure the Docker entrypoint is performed exactly once
787
779
entrypointMVar :: MVar Bool
0 commit comments