-
Notifications
You must be signed in to change notification settings - Fork 66
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
V2.10.0 - Docker Compose and Container Upgrades #374
Conversation
Hi Jason, I have added commits with the proposed changes for
Also:
Please review, and happy for you to modify as you see fit, or let me know if you see any issues with the changes. |
sed -i "s@GRAFANAUSER@PWD_USER@g" "${COMPOSE_ENV_FILE}" | ||
if grep -q "^PWD_USER=\"1000:1000\"" "${COMPOSE_ENV_FILE}"; then | ||
sed -i "s@^PWD_USER=\"1000:1000\"@#PWD_USER=\"1000:1000\"@g" "${COMPOSE_ENV_FILE}" | ||
fi |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice! Here is what this does:
- It replaces all occurrences of "GRAFANAUSER" with "PWD_USER" in the
compose.env
file. - It checks if a line starting with "PWD_USER=" followed by "1000:1000" exists in the file. If it does, it comments out that line by adding a "#" at the beginning. This is because the
powerwall.env
will default to that.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yep - all defaults are set in the powerwall.yml
docker compose file now when a variable is undefined.
compose-dash.sh
Outdated
if docker-compose version > /dev/null 2>&1; then | ||
# Build Docker (v1) | ||
docker-compose -f powerwall.yml $pwextend $1 $2 | ||
docker-compose -f powerwall.yml $pwextend $1 $2 $3 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @mcbirse - This makes sense. In fact, had me wonder if we should just include all arguments. Should we just use $@
which would be all arguments?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi Jason, I agree, it would probably make sense to simply use $@
so there is no limit on the number of additional arguments that could be passed. Please feel free to update it.
GREAT additions @mcbirse! Thank you! 🙏 I'm going to start testing this before we merge... First pass of |
I was finally able to get a clean run (no JavaScript errors) with Grafana v9.2.20. The border artifacts go away and the animation looks good with From my testing (one version at a time) I discovered that something changed with v9.3+ that causes problems with our iFrame animation code and auto-resizing, specifically the border artifacts and JS errors. At v9.5 a different panel title formatting is introduced that seems to break the look as well. I think it will require a lot more investigation. I'm reverting the upgrade of Grafana and keeping it at v9.1.2 as it seems the most stable in my testing. It also works well with both |
@jasonacox Getting this error while trying to upgrade: |
Hey @jgleigh - I have pushed a quick fix to the upgrade script which should hopefully fix this problem. 🤞 I looked into this error, and it appears to be a compatibility issue between GNU sed (Linux based) and BSD sed (used in Mac OS). Are you using Mac? It seems
Let us know if the upgrade works for you now. |
@mcbirse That fixed it! Yes this was on a Mac. Thanks again. |
v2.10.0 - Updates
Docker Compose Config Improvements
powerwall.yml
to use variables for "user" and "ports" in containers, per Connecting to Inverter from Public Internet #357 and It is possible to only (network) bind influxdb/weather to localhost? #360 noted by @hulkstercompose.env.sample
with explanation of latest supported optionspowerwall.yml
to use "unless-stopped" as the default restart policy for containers going forwardUpgrade Containers
powerwall.yml
: Telegraf (v1.28.2), pyPowerwall (v0.6.2t28)setup.sh
- Adds PW_STYLE to pypowerwall.env settings to support newer Grafana versions.upgrade.sh
- Some cleanup and handling for new PW_STYLE for existing installations.Related: