Closed digitalcraig closed 5 years ago
Could you resolve the conflicts first?
Build.sh looks all html to me. Is that normal?
Sorry Craig. It still has conflicts, it says.
I did resolve the conflicts manually, but it still says my repo is 1 commit behind. I'll try again. I think I know what happened with build.sh.
It doesn’t let me auto merge. Still says there are conflicts.
Ok, conflicts resolved and removed build.sh. It was used part of an experiment with cross-build and I used another method.
Done.
Add additional Dockerfiles to support auto build for multiple architectures on Docker Hub with the default Dockerfile being for the Hassio addon. Also reverts change which likely broke the the Hassio add-on by hardcoding the default build to amd64. The default has now been moved back to the docker-build.sh script for local Docker builds. No other code changes so new version number not required.