updated shared-volume location to be more stable

functionland · Dec 22, 2023 · 6705eb3 · 6705eb3
1 parent b658864
commit 6705eb3
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/docker/env_test.sh b/docker/env_test.sh
@@ -2,9 +2,9 @@
 export ARCH_SUPPORT="linux/arm64"
 
 export DOCKER_REPO="functionland"
-export DEFAULT_FX_TAG="test137"
-export DEFAULT_FULA_TAG="test137"
-export DEFAULT_NODE_TAG="test137"
+export DEFAULT_FX_TAG="test138"
+export DEFAULT_FULA_TAG="test138"
+export DEFAULT_NODE_TAG="test138"
 
 #build fxsupport
 export FX_SUPPORT_IMAGE="$DOCKER_REPO/fxsupport"

diff --git a/docker/fxsupport/linux/docker-compose.yml b/docker/fxsupport/linux/docker-compose.yml
@@ -31,7 +31,7 @@ services:
       - /media/pi/:/storage:rw,rshared
       - /var/run/dbus:/var/run/dbus
       - $WPA_SUPLICANT_PATH/wpa_supplicant.conf:$WPA_SUPLICANT_PATH/wpa_supplicant.conf
-      - shared-volume:/internal
+      - /home/pi/internal/:/internal:rw,rshared
       - shared-volume-external:/uniondrive:rw
       - /var/run/docker.sock:/var/run/docker.sock
       - /etc/NetworkManager/system-connections:/etc/NetworkManager/system-connections
@@ -64,7 +64,7 @@ services:
     labels:
       - "com.centurylinklabs.watchtower.enable=true"
     volumes:
-      - shared-volume:/internal
+      - /home/pi/internal/:/internal:rw,rshared
       - shared-volume-external:/uniondrive:rw
       - /home/pi/:/home:rw,rshared
       - /media/pi/:/storage:rw,rshared
@@ -89,7 +89,7 @@ services:
       - 8.8.4.4
     volumes:
       - /media/pi/:/storage:rw,rshared
-      - shared-volume:/internal 
+      - /home/pi/internal/:/internal:rw,rshared
       - /home/pi/:/home:rw,rshared
     labels:
       - "com.centurylinklabs.watchtower.enable=true"

diff --git a/docker/fxsupport/linux/fula.sh b/docker/fxsupport/linux/fula.sh
@@ -153,6 +153,7 @@ function create_cron() {
 # Functions
 function install() {
   all_success=true
+  mkdir -p $HOME_DIR/internal
 
   if [ -d "$HOME_DIR/fula-ota" ]; then
     echo "Updating fula-ota repository..." | sudo tee -a $FULA_LOG_PATH
@@ -462,7 +463,7 @@ function dockerPrune() {
 }
 
 function restart() {
-
+  mkdir -p $HOME_DIR/internal
   # Move to the fula-ota directory and perform git pull
   if [ -d "$HOME_DIR/fula-ota" ]; then
     echo "Updating fula-ota repository..." | sudo tee -a $FULA_LOG_PATH

diff --git a/fula/docker-compose.yml b/fula/docker-compose.yml
@@ -31,7 +31,7 @@ services:
       - /media/pi/:/storage:rw,rshared
       - /var/run/dbus:/var/run/dbus
       - $WPA_SUPLICANT_PATH/wpa_supplicant.conf:$WPA_SUPLICANT_PATH/wpa_supplicant.conf
-      - shared-volume:/internal
+      - /home/pi/internal/:/internal:rw,rshared
       - shared-volume-external:/uniondrive:rw
       - /var/run/docker.sock:/var/run/docker.sock
       - /etc/NetworkManager/system-connections:/etc/NetworkManager/system-connections
@@ -64,7 +64,7 @@ services:
     labels:
       - "com.centurylinklabs.watchtower.enable=true"
     volumes:
-      - shared-volume:/internal
+      - /home/pi/internal/:/internal:rw,rshared
       - shared-volume-external:/uniondrive:rw
       - /home/pi/:/home:rw,rshared
       - /media/pi/:/storage:rw,rshared
@@ -89,7 +89,7 @@ services:
       - 8.8.4.4
     volumes:
       - /media/pi/:/storage:rw,rshared
-      - shared-volume:/internal 
+      - /home/pi/internal/:/internal:rw,rshared
       - /home/pi/:/home:rw,rshared
     labels:
       - "com.centurylinklabs.watchtower.enable=true"

diff --git a/fula/fula.sh b/fula/fula.sh
@@ -153,6 +153,7 @@ function create_cron() {
 # Functions
 function install() {
   all_success=true
+  mkdir -p $HOME_DIR/internal
 
   if [ -d "$HOME_DIR/fula-ota" ]; then
     echo "Updating fula-ota repository..." | sudo tee -a $FULA_LOG_PATH
@@ -462,7 +463,7 @@ function dockerPrune() {
 }
 
 function restart() {
-
+  mkdir -p $HOME_DIR/internal
   # Move to the fula-ota directory and perform git pull
   if [ -d "$HOME_DIR/fula-ota" ]; then
     echo "Updating fula-ota repository..." | sudo tee -a $FULA_LOG_PATH