haruny / adt-pulse-mqtt

ADT Pulse Bridge for Home Assistant
MIT License
10 stars 5 forks source link

Add multiplatform Docker Hub build #20

Closed digitalcraig closed 5 years ago

digitalcraig commented 5 years ago

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.

haruny commented 5 years ago

Could you resolve the conflicts first?

haruny commented 5 years ago

Build.sh looks all html to me. Is that normal?

haruny commented 5 years ago

Sorry Craig. It still has conflicts, it says.

digitalcraig commented 5 years ago

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.

haruny commented 5 years ago

It doesn’t let me auto merge. Still says there are conflicts.

digitalcraig commented 5 years ago

Ok, conflicts resolved and removed build.sh. It was used part of an experiment with cross-build and I used another method.

haruny commented 5 years ago

Done.