Merge pull request #186 from BJReplay/main

Support powerwall.extend.yml & backup.sh.sample

backups/README.md

@@ -11,6 +11,8 @@ Backup the Powerwall-Dashboard folder. In that folder are two important folders:
 
 The following shows an example of how to migrate the data (influxdb) from one system to another (see backup.sh):
 
+Copy backup.sh.sample to backup.sh (cp backup.sh.sample backup.sh), and edit the line that says DASHBOARD="/home/user/Powerwall-Dashboard" to have your dashboard location.
+
 ## Backup Example
 
 ```bash

compose-dash.sh

@@ -44,14 +44,22 @@ set -a
 . compose.env
 set +a
 
+# Docker Compose Extension Check
+if [ -f "powerwall.extend.yml" ]; then
+    echo "Including powerwall.extend.yml"
+    pwextend="-f powerwall.extend.yml"
+else
+    pwextend=""
+fi
+
 echo "Running Docker Compose..."  
 if docker-compose version > /dev/null 2>&1; then
     # Build Docker (v1)
-    docker-compose -f powerwall.yml $1 $2
+    docker-compose -f powerwall.yml $pwextend $1 $2
 else
     if docker compose version > /dev/null 2>&1; then
         # Build Docker (v2)
-        docker compose -f powerwall.yml $1 $2
+        docker compose -f powerwall.yml $pwextend $1 $2
     else
         echo "ERROR: docker-compose/docker compose is not available or not runnning."
         echo "This script requires docker-compose or docker compose."

weather/contrib/ecowitt/README.md

@@ -82,9 +82,12 @@ Docker: docker pull [jasonacox/ecowitt](https://hub.docker.com/r/jasonacox/ecowi
 
 4. Incorporate into Powerwall-Dashboard
 
-    Add into powerwall.yml in your Powerwall-Dashboard folder
+    Save the following into a file called powerwall.extend.yml in your Powerwall-Dashboard folder
 
     ```yaml
+    version: "3.5"
+
+    services:
         ecowitt:
             # Uncomment next line to build locally
             # build: ./weather/contrib/ecowitt
@@ -108,7 +111,7 @@ Docker: docker pull [jasonacox/ecowitt](https://hub.docker.com/r/jasonacox/ecowi
                 - influxdb
     ```
 
-    Optionally remove the weather411 section if you're not going to be running both Weather 411 and Local Weather
+    Then restart the services using compose-dash.sh and the new component will be picked up:
 
     ```bash
     ./compose-dash.sh stop
@@ -173,6 +176,10 @@ docker start ecowitt
 
 ## Release Notes
 
+### 0.0.4.1 
+
+* Change to docker compose instructions to work with modified comppose-dash
+
 ### 0.0.4 - Third Release 
 
 * Fix to Rainfall Data