Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace flask branch with beta and fix it's dir structure #24

Merged
merged 6 commits into from
Aug 16, 2021
Merged

Replace flask branch with beta and fix it's dir structure #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0969262
Update config.json
HepoH3 Apr 5, 2021
1474da6
Update repository.json
HepoH3 Apr 5, 2021
2a63c20
Update config.json
HepoH3 Apr 5, 2021
b287d3d
Switch flask branch to beta and fix it's dir structure
HepoH3 Jun 24, 2021
d1e4bed
Revert host_network:true for beta branch
HepoH3 Jun 24, 2021
2e6834c
Fix mac placeholders
HepoH3 Jun 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 diyhue-flask/CHANGELOG.md → diyhue-beta/CHANGELOG.md
View file
Open in desktop
File renamed without changes.
0 diyhue-flask/DOCS.md → diyhue-beta/DOCS.md
View file
Open in desktop
File renamed without changes.
13 changes: 9 additions & 4 deletions diyhue-flask/Dockerfile → diyhue-beta/Dockerfile
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN mkdir diyhue config ${WORKING_DIR}
RUN apk add -q -u python3 openssl nmap psmisc iproute2 alpine-sdk build-base

# Download diyhue and untar it
RUN curl -J -L -o $diyhue.tar.gz "https://github.com/diyhue/diyHue/archive/refs/heads/flask.tar.gz" \
RUN curl -J -L -o $diyhue.tar.gz "https://github.com/diyhue/diyHue/archive/refs/heads/beta.tar.gz" \
&& tar xzvf $diyhue.tar.gz --strip-components=1 -C diyhue \
&& rm -rf $diyhue.tar.gz \
&& pip3 install -r /diyhue/requirements.txt --no-cache-dir
Expand All @@ -31,11 +31,16 @@ RUN curl -J -L -o $diyhue.tar.gz "https://github.com/diyhue/diyHue/archive/refs/
WORKDIR /opt/hue-emulator

# Install diyHue
RUN mv /diyhue/BridgeEmulator/HueObjects/ ./HueObjects/
RUN mv /diyhue/BridgeEmulator/configManager/ ./configManager/
RUN mv /diyhue/BridgeEmulator/flaskUI/ ./flaskUI/
RUN mv /diyhue/BridgeEmulator/functions/ ./functions/
RUN mv /diyhue/BridgeEmulator/protocols/ ./protocols/
RUN mv /diyhue/BridgeEmulator/HueEmulator3.py /diyhue/BridgeEmulator/debug/clip.html ./
RUN mv /diyhue/BridgeEmulator/genCert.sh /diyhue/BridgeEmulator/openssl.conf ./
RUN mv /diyhue/BridgeEmulator/lights/ ./lights/
RUN mv /diyhue/BridgeEmulator/logManager/ ./logManager/
RUN mv /diyhue/BridgeEmulator/sensors/ ./sensors/
RUN mv /diyhue/BridgeEmulator/services/ ./services/
RUN mv /diyhue/BridgeEmulator/HueEmulator3.py ./
RUN mv /diyhue/BridgeEmulator/genCert.sh /diyhue/BridgeEmulator/openssl.conf ./

# Copy additional local build files
COPY rootfs ./
Expand Down
0 diyhue-flask/LICENSE.md → diyhue-beta/LICENSE.md
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 diyhue-flask/README.md → diyhue-beta/README.md
View file
Open in desktop
File renamed without changes.
0 diyhue-flask/build.json → diyhue-beta/build.json
100755 → 100644
View file
Open in desktop
File renamed without changes.
9 changes: 5 additions & 4 deletions diyhue-flask/config.json → diyhue-beta/config.json
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "diyHue FLASK",
"name": "diyHue beta-branch",
"version": "1.4.1",
"slug": "diyhue-beta-flask",
"description": "Philips Hue Bridge Emulator FLASK",
"slug": "diyhue-beta-branch",
"description": "Philips Hue Bridge Emulator BETA",
"webui": "http://[HOST]:[PORT:80]",
"panel_icon": "mdi:home-lightbulb",
"arch": ["armhf", "armv7", "aarch64", "amd64", "i386"],
Expand All @@ -22,11 +22,12 @@
},
"auth_api": true,
"hassio_api": true,
"host_network": true,
"uart": true,
"map": ["config:rw", "share:rw"],
"options": {
"config_path": "/config/diyhue",
"mac": "XX:XX:XX:XX:XX",
"mac": "XX:XX:XX:XX:XX:XX",
"debug": false,
"deconz_ip": "",
"no_serve_https": false
Expand Down
0 diyhue-flask/icon.png → diyhue-beta/icon.png
View file
Open in desktop
File renamed without changes
0 diyhue-flask/logo.png → diyhue-beta/logo.png
View file
Open in desktop
File renamed without changes
0 diyhue-flask/rootfs/run.sh → diyhue-beta/rootfs/run.sh
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 diyhue-flask/rootfs/select.sh → diyhue-beta/rootfs/select.sh
100755 → 100644
View file
Open in desktop
File renamed without changes.
3 changes: 2 additions & 1 deletion diyhue/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,12 @@
},
"auth_api": true,
"hassio_api": true,
"host_network": true,
"uart": true,
"map": ["config:rw", "share:rw"],
"options": {
"config_path": "/config/diyhue",
"mac": "XX:XX:XX:XX:XX",
"mac": "XX:XX:XX:XX:XX:XX",
"debug": false,
"deconz_ip": "",
"no_serve_https": false
Expand Down
2 changes: 1 addition & 1 deletion repository.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "MaxBec Home Assistant Add-on diyHue",
"name": "MaxBec Home Assistant Add-on diyHue fork",
"url": "https://github.com/MaxBec/hassio-diyHue",
"maintainer": "Max Beckenbauer <[email protected]>"
}