Add docker helper for bluetooth (evcc-io#162)

Mungg1818 · May 16, 2020 · 9bf987f · 9bf987f
1 parent 21c85ce
commit 9bf987f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -33,6 +33,7 @@ COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 COPY --from=builder /build/evcc /usr/local/bin/evcc
 
 COPY entrypoint.sh /evcc/
+COPY bin/* /evcc/
 
 EXPOSE 7070
 

diff --git a/bin/docker-btmgmt b/bin/docker-btmgmt
diff --git a/charger/nrgble_linux.go b/charger/nrgble_linux.go
@@ -54,9 +54,8 @@ func NewNRGKickBLE(device, macaddress string, pin int) *NRGKickBLE {
 	// set LE mode
 	btmgmt := hw.NewBtMgmt(device)
 
-	// don't add Docker binary on CI
-	if len(os.Getenv("DOCKER")) > 0 && os.Getenv("CI") == "" {
-		btmgmt.BinPath = "./bin/docker-btmgmt"
+	if len(os.Getenv("DOCKER")) > 0 {
+		btmgmt.BinPath = "./docker-btmgmt"
 	}
 
 	err := btmgmt.SetPowered(false)

diff --git a/tmpl.Dockerfile b/tmpl.Dockerfile
@@ -30,6 +30,7 @@ COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 COPY --from=builder /build/evcc /usr/local/bin/evcc
 
 COPY entrypoint.sh /evcc/
+COPY bin/* /evcc/
 
 EXPOSE 7070