Skip to content

Conversation

@nipar4
Copy link

@nipar4 nipar4 commented Nov 2, 2025

Not sure if this did what I wanted, jus wanted to update Dockerfile & Dockerfile.standalone

nipar4 added 25 commits October 24, 2025 13:13
r rebase instead of merge (cleaner history)
git rebase upstream/main

git push origin main

---

🧩 2. If you’re updating a submodule or external script repo inside your
project

You mentioned before that your Docker images depend on a script from
another Git repo — if you’ve added that as a submodule or use it as a
reference, use:

git submodule update --remote --merge

cd path/to/submodule
git fetch origin
git checkout main
git pull origin main
cd ..
git add path/to/submodule
git commit -m "Update submodule to latest upstream"

---

🔄 3. If you want to pull all branches/tags from upstream into your fork

git fetch upstream --prune
git checkout main
git merge upstream/main
git push origin main

git fetch upstream --tags
git push origin --tags

---

⚙️ 4. If you want to automate this in CI (like GitHub Actions)

Example snippet for your workflow YAML:

- name: Update from upstream
  run: |
      git remote add upstream https://github.com/ORIGINAL_OWNER/REPO.git
          git fetch upstream
	      git checkout main
	          git merge upstream/main
		      git push origin main

		      ---

		      Would you like me to tailor these commands to your
		      specific setup — e.g., the repo that builds Docker
		      images from another script repo — so that the
		      update triggers automatically when the upstream
		      changes?q
@gcoan
Copy link
Contributor

gcoan commented Nov 2, 2025

this should fix springfall2008/batpred#2842 #70
#59

@springfall2008
Copy link
Owner

Just reviewing this, I wonder if you can help updated?

  1. ha.py shouldn't be added here, I assume it was just a mistake
  2. Hass.py has been moved to the Predbat repro, can you change to assume it comes from there please?

@nipar4
Copy link
Author

nipar4 commented Dec 22, 2025

I think this was done before you made those changes

Can we just reject this? I am not sure its required now we know that Home assistant is no longer going to support armv7 and unless I am missing them I am not seeing many issues with this any more. Also I don't want to add loads of commits to the main addon git.

In the New year I am planning on making the Docker images more aligned with the home assistant addons and use s6 overlay so I may add some changes then

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants