From 4d32d732131c1fdaf9f763ecf3752733b64a9b65 Mon Sep 17 00:00:00 2001 From: wolfy Date: Thu, 9 May 2024 21:54:38 -0500 Subject: [PATCH 1/8] Fix permissions issue caused by a8a8b8f --- scripts/docker/runit/arm_user_files_setup.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/docker/runit/arm_user_files_setup.sh b/scripts/docker/runit/arm_user_files_setup.sh index 7d6620b52..1aa1a2f87 100755 --- a/scripts/docker/runit/arm_user_files_setup.sh +++ b/scripts/docker/runit/arm_user_files_setup.sh @@ -66,9 +66,10 @@ for dir in $SUBDIRS ; do echo "Creating dir: $thisDir" mkdir -p "$thisDir" fi + chown -R arm:arm "$thisDir" done -echo "Removing any link between music and Music" +echo "Removing any link between music and Music" if [ -h /home/arm/Music ]; then echo "Music symbolic link found, removing link" unlink /home/arm/Music From 6d6e06b8aa38e279a3c7bbf3e274a9485592a063 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 10 May 2024 02:54:53 +0000 Subject: [PATCH 2/8] [Automated] Increment Version --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index fc841dc2f..da689aa42 100755 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.6.72 +2.6.73 From 505d3a0fa547942e4bd1ffd0e550da69c3b8d904 Mon Sep 17 00:00:00 2001 From: wolfy Date: Thu, 9 May 2024 21:58:02 -0500 Subject: [PATCH 3/8] Permissions now always set on container start --- scripts/docker/runit/arm_user_files_setup.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/docker/runit/arm_user_files_setup.sh b/scripts/docker/runit/arm_user_files_setup.sh index 1aa1a2f87..72aea061f 100755 --- a/scripts/docker/runit/arm_user_files_setup.sh +++ b/scripts/docker/runit/arm_user_files_setup.sh @@ -66,8 +66,9 @@ for dir in $SUBDIRS ; do echo "Creating dir: $thisDir" mkdir -p "$thisDir" fi - chown -R arm:arm "$thisDir" done +# THIS LINE IS CRITICAL TO ENSURING PROPER PERMISSIONS +chown -R arm:arm "$ARM_HOME" echo "Removing any link between music and Music" if [ -h /home/arm/Music ]; then From 47501aafd01f3684a796b28fbf1ef970d460e16a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 10 May 2024 02:58:14 +0000 Subject: [PATCH 4/8] [Automated] Increment Version --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index da689aa42..1a2babdf7 100755 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.6.73 +2.6.74 From 245a3859bff73cbff33fb6e68bdb9d2d0712707f Mon Sep 17 00:00:00 2001 From: wolfy Date: Wed, 15 May 2024 07:14:58 -0500 Subject: [PATCH 5/8] Update docker.md --- arm_wiki/docker.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/arm_wiki/docker.md b/arm_wiki/docker.md index 93ec52f92..f1dd6e471 100644 --- a/arm_wiki/docker.md +++ b/arm_wiki/docker.md @@ -29,11 +29,12 @@ To install default: `sudo ./docker-setup.sh` To install from a different repo, tag: `sudo ./docker-setup.sh -f automaticrippingmachine -t dev_build` The script will now: -1. Create an `arm` user and group if they don't exist -2. Install docker if it is not already found on the system -3. Pull the appropriate image from Dockerhub -4. Create host mountpoints for any DVD drives found on the system -5. Save a copy of the template run command for the user to fill in to `~arm/start_arm_container.sh` +1. Create an `arm` user and group if they don't exist on the host +2. Create the necessary folders and ensure they are owned by the `arm` user +3. Install docker if it is not already found on the system +4. Pull the appropriate image from Dockerhub +5. Create host mountpoints for any DVD drives found on the system +6. Save a copy of the template run command for the user to fill in to `~arm/start_arm_container.sh` ## Post Install 1. **ARM User ID**: In a terminal session, type `id -u arm` and make a note of the returned value From c48b05282bccd443c933b14edcd4d6067bd004cf Mon Sep 17 00:00:00 2001 From: wolfy Date: Wed, 15 May 2024 07:20:39 -0500 Subject: [PATCH 6/8] Only set permissions on folder creation Without this change, every time a user runs the container it will reset the permissions of the folders. Otherwise this could break ownership of arm folders mounted from SMB/NFS shares every time the container is run. --- scripts/docker/runit/arm_user_files_setup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/docker/runit/arm_user_files_setup.sh b/scripts/docker/runit/arm_user_files_setup.sh index 72aea061f..cf11cecf5 100755 --- a/scripts/docker/runit/arm_user_files_setup.sh +++ b/scripts/docker/runit/arm_user_files_setup.sh @@ -65,10 +65,10 @@ for dir in $SUBDIRS ; do if [[ ! -d "$thisDir" ]] ; then echo "Creating dir: $thisDir" mkdir -p "$thisDir" + # Set the default ownership to arm instead of root + chown -R arm:arm "$thisDir" fi done -# THIS LINE IS CRITICAL TO ENSURING PROPER PERMISSIONS -chown -R arm:arm "$ARM_HOME" echo "Removing any link between music and Music" if [ -h /home/arm/Music ]; then From c81575d546e37bce849f0139b4382a12c5246c1f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 15 May 2024 12:20:51 +0000 Subject: [PATCH 7/8] [Automated] Increment Version --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 1a2babdf7..be5a8ed69 100755 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.6.74 +2.6.75 From d5360553b4ec5e6fdb98a9d2bedad77f709d1b94 Mon Sep 17 00:00:00 2001 From: wolfy Date: Wed, 15 May 2024 07:29:03 -0500 Subject: [PATCH 8/8] Update docker.md --- arm_wiki/docker.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/arm_wiki/docker.md b/arm_wiki/docker.md index f1dd6e471..3d3a37489 100644 --- a/arm_wiki/docker.md +++ b/arm_wiki/docker.md @@ -30,11 +30,10 @@ To install from a different repo, tag: `sudo ./docker-setup.sh -f automaticrippi The script will now: 1. Create an `arm` user and group if they don't exist on the host -2. Create the necessary folders and ensure they are owned by the `arm` user -3. Install docker if it is not already found on the system -4. Pull the appropriate image from Dockerhub -5. Create host mountpoints for any DVD drives found on the system -6. Save a copy of the template run command for the user to fill in to `~arm/start_arm_container.sh` +2. Install docker if it is not already found on the system +3. Pull the appropriate image from Dockerhub +4. Create host mountpoints for any DVD drives found on the system +5. Save a copy of the template run command for the user to fill in to `~arm/start_arm_container.sh` ## Post Install 1. **ARM User ID**: In a terminal session, type `id -u arm` and make a note of the returned value @@ -101,6 +100,8 @@ The script will now: sudo chown 1001:1001 -R /home/arm/config ``` + Additionally, any folders the container creates during startup will be owned by the user specified in `start_arm_container.sh`. If the folder paths passed to the container are on a remote share (SMB, NFS, etc.) and do not already exist, this may result in the folders on the share not being owned by the same user. + 5. **Start ARM**: Run the container with `sudo ./start_arm_container.sh` You will then need to visit http://WEBSERVER_IP:PORT