tuanchris 1 月之前
父節點
當前提交
a4a625b749
共有 2 個文件被更改,包括 9 次插入16 次删除
  1. 8 8
      dw
  2. 1 8
      setup-pi.sh

+ 8 - 8
dw

@@ -86,7 +86,7 @@ cmd_start() {
     cd "$INSTALL_DIR"
 
     if is_docker_mode; then
-        docker compose up -d
+        sudo docker compose up -d
     else
         sudo systemctl start dune-weaver
     fi
@@ -100,7 +100,7 @@ cmd_stop() {
     cd "$INSTALL_DIR"
 
     if is_docker_mode; then
-        docker compose down
+        sudo docker compose down
     else
         sudo systemctl stop dune-weaver
     fi
@@ -114,7 +114,7 @@ cmd_restart() {
     cd "$INSTALL_DIR"
 
     if is_docker_mode; then
-        docker compose restart
+        sudo docker compose restart
     else
         sudo systemctl restart dune-weaver
     fi
@@ -132,10 +132,10 @@ cmd_update() {
 
     if is_docker_mode; then
         echo "Pulling latest Docker image..."
-        docker compose pull
+        sudo docker compose pull
 
         echo "Restarting with new version..."
-        docker compose up -d
+        sudo docker compose up -d
     else
         echo "Updating Python dependencies..."
         source .venv/bin/activate
@@ -153,7 +153,7 @@ cmd_logs() {
     cd "$INSTALL_DIR"
 
     if is_docker_mode; then
-        docker compose logs -f
+        sudo docker compose logs -f
     else
         sudo journalctl -u dune-weaver -f
     fi
@@ -164,7 +164,7 @@ cmd_status() {
     cd "$INSTALL_DIR"
 
     if is_docker_mode; then
-        docker compose ps
+        sudo docker compose ps
     else
         sudo systemctl status dune-weaver
     fi
@@ -175,7 +175,7 @@ cmd_shell() {
     cd "$INSTALL_DIR"
 
     if is_docker_mode; then
-        docker compose exec dune-weaver /bin/bash
+        sudo docker compose exec dune-weaver /bin/bash
     else
         echo -e "${YELLOW}Shell not available in systemd mode${NC}"
         echo "Use: cd $INSTALL_DIR && source .venv/bin/activate"

+ 1 - 8
setup-pi.sh

@@ -230,14 +230,7 @@ deploy_docker() {
     print_step "Deploying Dune Weaver with Docker Compose..."
 
     cd "$INSTALL_DIR"
-
-    # Use newgrp to apply docker group if just added, otherwise use sudo
-    if [[ "$DOCKER_GROUP_ADDED" == "true" ]]; then
-        echo "Starting Docker containers (using sudo since group not yet active)..."
-        sudo docker compose up -d
-    else
-        docker compose up -d
-    fi
+    sudo docker compose up -d
 
     print_success "Docker deployment complete!"
 }