diff --git a/Dockerfile b/Dockerfile index efbf6bd85..9755c50d6 100644 --- 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 new file mode 100755 index 000000000..e69de29bb diff --git a/charger/nrgble_linux.go b/charger/nrgble_linux.go index 7e4f89812..97dccf41c 100644 --- 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 index 19ccaeff5..d316c27b4 100644 --- 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