Merge remote-tracking branch 'origin/main' into main

1337-server · Jun 20, 2022 · 2e69ec7 · 2e69ec7
2 parents 4f78d31 + 133a806
commit 2e69ec7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/scripts/docker/start_arm_container.sh b/scripts/docker/start_arm_container.sh
@@ -3,16 +3,15 @@ docker run -d \
     -p "8080:8080" \
     -e ARM_UID="<id -u arm>" \
     -e ARM_GID="<id -g arm>" \
-    -v "<path_to_arm_user_home_folder>/home/arm" \
-    -v "<path_to_music_folder>/home/arm/Music" \
+    -v "<path_to_arm_user_home_folder>:/home/arm" \
+    -v "<path_to_music_folder>:/home/arm/Music" \
     -v "<path_to_logs_folder>:/home/arm/logs" \
     -v "<path_to_media_folder>:/home/arm/media" \
     -v "<path_to_config_folder>:/etc/arm/config" \
     --device="/dev/sr0:/dev/sr0" \
     --device="/dev/sr1:/dev/sr1" \
     --device="/dev/sr2:/dev/sr2" \
     --device="/dev/sr3:/dev/sr3" \
-    --priveleged \
+    --privileged \
     --restart "always" \
-    --name "arm-rippers"
-    $IMAGE
+    --name "arm-rippers" \
diff --git a/scripts/installers/docker-setup.sh b/scripts/installers/docker-setup.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -euo pipefail
+set -eo pipefail
 
 RED='\033[1;31m'
 NC='\033[0m' # No Color
@@ -84,7 +84,7 @@ function save_start_command() {
 # start here
 install_reqs
 add_arm_user
-install_docker
+launch_setup
 pull_image
 setup_mountpoints
 save_start_command