This repository has been archived by the owner on Jun 23, 2022. It is now read-only.
Fix Mi Flora #40
Merged
Fix Mi Flora #40
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Extract missing gatttool which is needed by the Mi Flora component from the edge package.. This is a temporary fix until Alpine 3.7 is released.
|
Hi @sharukins, It seems you haven't yet signed a CLA. Please do so here. Once you do that we will be able to review and accept this pull request. Thanks! |
pvizeli
suggested changes
Oct 20, 2017
homeassistant/base/Dockerfile
Outdated
| ## Install gatttool from edge (can be removed with release of Alpine 3.7) | ||
| RUN mkdir -p bluez-deprecated \ | ||
| && cd bluez-deprecated \ | ||
| && curl -o bluez-deprecated-5.47-r3.apk http://dl-3.alpinelinux.org/alpine/edge/main/armhf/bluez-deprecated-5.47-r3.apk \ |
There was a problem hiding this comment.
You need write that for all arch. You can use $BUILD_ARCH they include (amd64, aarch64, armhf, i386)
|
I didn't test it with home assistant, but bluez-deprecated does definitely contain gatttool and I did unpack it using tar from the apk. Therefore I'm pretty sure this works. |
Not quite elegant, but should do the job.
pvizeli
suggested changes
Oct 20, 2017
homeassistant/base/Dockerfile
Outdated
| rm -fr bluez-deprecated; \ | ||
| else cd ../; \ | ||
| rm- fr bluez-deprecated; \ | ||
| exit 0; \ |
There was a problem hiding this comment.
I think we can handle that cleaner like:
&& if ...; then APK_ARCH=...; \
&& curl -so ... http://.../$APK_ARCH/....
This sould be more clean than the version before. I check $APK_ARCH again just in case. not sure if this is really necessary.
pvizeli
suggested changes
Oct 21, 2017
homeassistant/base/Dockerfile
Outdated
| elif [ "$BUILD_ARCH" = "armhf" ]; then APK_ARCH = "armhf"; \ | ||
| elif [ "$BUILD_ARCH" = "aarch64" ]; then APK_ARCH = "aarch64"; \ | ||
| else exit 0; \ | ||
| && if [ -z "$APK_ARCH"]; then cd ../; \ |
There was a problem hiding this comment.
That will be set, this is not needed
|
If you finish it soon we can add it into 0.56 |
pvizeli
approved these changes
Oct 21, 2017
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Extract missing gatttool which is needed by the Mi Flora component from the edge package.. This is a temporary fix until Alpine 3.7 is released.