From 7dbc7658e794267b9b5372d452bb0d203c09c11d Mon Sep 17 00:00:00 2001 From: RN Date: Tue, 19 Mar 2019 11:02:06 +0100 Subject: [PATCH 1/7] Dockerize (move conf/commands to subdir) --- Dockerfile | 12 ++++++++++++ {commands => data/commands}/tv/samsung/channeldown | 0 {commands => data/commands}/tv/samsung/channelup | 0 {commands => data/commands}/tv/samsung/down | 0 {commands => data/commands}/tv/samsung/enter | 0 {commands => data/commands}/tv/samsung/exit | 0 {commands => data/commands}/tv/samsung/hdmi1 | 0 {commands => data/commands}/tv/samsung/hdmi2 | 0 {commands => data/commands}/tv/samsung/hdmi3 | 0 {commands => data/commands}/tv/samsung/hdmi4 | 0 {commands => data/commands}/tv/samsung/left | 0 {commands => data/commands}/tv/samsung/menu | 0 {commands => data/commands}/tv/samsung/mute | 0 {commands => data/commands}/tv/samsung/ok | 0 {commands => data/commands}/tv/samsung/power | 0 {commands => data/commands}/tv/samsung/return | 0 {commands => data/commands}/tv/samsung/right | 0 {commands => data/commands}/tv/samsung/source | 0 {commands => data/commands}/tv/samsung/tv | 0 {commands => data/commands}/tv/samsung/up | 0 {commands => data/commands}/tv/samsung/volumedown | 0 {commands => data/commands}/tv/samsung/volumeup | 0 custom.conf => data/custom.conf | 0 logging.conf => data/logging.conf | 0 {macros => data/macros}/samsung_on | 0 mqtt.conf => data/mqtt.conf | 0 mqtt.py | 2 +- requirements.txt | 2 ++ 28 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 Dockerfile rename {commands => data/commands}/tv/samsung/channeldown (100%) rename {commands => data/commands}/tv/samsung/channelup (100%) rename {commands => data/commands}/tv/samsung/down (100%) rename {commands => data/commands}/tv/samsung/enter (100%) rename {commands => data/commands}/tv/samsung/exit (100%) rename {commands => data/commands}/tv/samsung/hdmi1 (100%) rename {commands => data/commands}/tv/samsung/hdmi2 (100%) rename {commands => data/commands}/tv/samsung/hdmi3 (100%) rename {commands => data/commands}/tv/samsung/hdmi4 (100%) rename {commands => data/commands}/tv/samsung/left (100%) rename {commands => data/commands}/tv/samsung/menu (100%) rename {commands => data/commands}/tv/samsung/mute (100%) rename {commands => data/commands}/tv/samsung/ok (100%) rename {commands => data/commands}/tv/samsung/power (100%) rename {commands => data/commands}/tv/samsung/return (100%) rename {commands => data/commands}/tv/samsung/right (100%) rename {commands => data/commands}/tv/samsung/source (100%) rename {commands => data/commands}/tv/samsung/tv (100%) rename {commands => data/commands}/tv/samsung/up (100%) rename {commands => data/commands}/tv/samsung/volumedown (100%) rename {commands => data/commands}/tv/samsung/volumeup (100%) rename custom.conf => data/custom.conf (100%) rename logging.conf => data/logging.conf (100%) rename {macros => data/macros}/samsung_on (100%) rename mqtt.conf => data/mqtt.conf (100%) create mode 100644 requirements.txt diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..551d434 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,12 @@ +FROM debian:stretch + +RUN apt-get update && apt-get install -y\ + build-essential python-pip + +RUN git clone https://github.com/TechForze/broadlink-mqtt + +WORKDIR /broadlink-mqtt + +RUN pip install -r /broadlink-mqtt/requirements.txt + +CMD ["python", "/broadlink-mqtt/mqtt.py"] \ No newline at end of file diff --git a/commands/tv/samsung/channeldown b/data/commands/tv/samsung/channeldown similarity index 100% rename from commands/tv/samsung/channeldown rename to data/commands/tv/samsung/channeldown diff --git a/commands/tv/samsung/channelup b/data/commands/tv/samsung/channelup similarity index 100% rename from commands/tv/samsung/channelup rename to data/commands/tv/samsung/channelup diff --git a/commands/tv/samsung/down b/data/commands/tv/samsung/down similarity index 100% rename from commands/tv/samsung/down rename to data/commands/tv/samsung/down diff --git a/commands/tv/samsung/enter b/data/commands/tv/samsung/enter similarity index 100% rename from commands/tv/samsung/enter rename to data/commands/tv/samsung/enter diff --git a/commands/tv/samsung/exit b/data/commands/tv/samsung/exit similarity index 100% rename from commands/tv/samsung/exit rename to data/commands/tv/samsung/exit diff --git a/commands/tv/samsung/hdmi1 b/data/commands/tv/samsung/hdmi1 similarity index 100% rename from commands/tv/samsung/hdmi1 rename to data/commands/tv/samsung/hdmi1 diff --git a/commands/tv/samsung/hdmi2 b/data/commands/tv/samsung/hdmi2 similarity index 100% rename from commands/tv/samsung/hdmi2 rename to data/commands/tv/samsung/hdmi2 diff --git a/commands/tv/samsung/hdmi3 b/data/commands/tv/samsung/hdmi3 similarity index 100% rename from commands/tv/samsung/hdmi3 rename to data/commands/tv/samsung/hdmi3 diff --git a/commands/tv/samsung/hdmi4 b/data/commands/tv/samsung/hdmi4 similarity index 100% rename from commands/tv/samsung/hdmi4 rename to data/commands/tv/samsung/hdmi4 diff --git a/commands/tv/samsung/left b/data/commands/tv/samsung/left similarity index 100% rename from commands/tv/samsung/left rename to data/commands/tv/samsung/left diff --git a/commands/tv/samsung/menu b/data/commands/tv/samsung/menu similarity index 100% rename from commands/tv/samsung/menu rename to data/commands/tv/samsung/menu diff --git a/commands/tv/samsung/mute b/data/commands/tv/samsung/mute similarity index 100% rename from commands/tv/samsung/mute rename to data/commands/tv/samsung/mute diff --git a/commands/tv/samsung/ok b/data/commands/tv/samsung/ok similarity index 100% rename from commands/tv/samsung/ok rename to data/commands/tv/samsung/ok diff --git a/commands/tv/samsung/power b/data/commands/tv/samsung/power similarity index 100% rename from commands/tv/samsung/power rename to data/commands/tv/samsung/power diff --git a/commands/tv/samsung/return b/data/commands/tv/samsung/return similarity index 100% rename from commands/tv/samsung/return rename to data/commands/tv/samsung/return diff --git a/commands/tv/samsung/right b/data/commands/tv/samsung/right similarity index 100% rename from commands/tv/samsung/right rename to data/commands/tv/samsung/right diff --git a/commands/tv/samsung/source b/data/commands/tv/samsung/source similarity index 100% rename from commands/tv/samsung/source rename to data/commands/tv/samsung/source diff --git a/commands/tv/samsung/tv b/data/commands/tv/samsung/tv similarity index 100% rename from commands/tv/samsung/tv rename to data/commands/tv/samsung/tv diff --git a/commands/tv/samsung/up b/data/commands/tv/samsung/up similarity index 100% rename from commands/tv/samsung/up rename to data/commands/tv/samsung/up diff --git a/commands/tv/samsung/volumedown b/data/commands/tv/samsung/volumedown similarity index 100% rename from commands/tv/samsung/volumedown rename to data/commands/tv/samsung/volumedown diff --git a/commands/tv/samsung/volumeup b/data/commands/tv/samsung/volumeup similarity index 100% rename from commands/tv/samsung/volumeup rename to data/commands/tv/samsung/volumeup diff --git a/custom.conf b/data/custom.conf similarity index 100% rename from custom.conf rename to data/custom.conf diff --git a/logging.conf b/data/logging.conf similarity index 100% rename from logging.conf rename to data/logging.conf diff --git a/macros/samsung_on b/data/macros/samsung_on similarity index 100% rename from macros/samsung_on rename to data/macros/samsung_on diff --git a/mqtt.conf b/data/mqtt.conf similarity index 100% rename from mqtt.conf rename to data/mqtt.conf diff --git a/mqtt.py b/mqtt.py index ff7c488..f8b7c36 100755 --- a/mqtt.py +++ b/mqtt.py @@ -20,7 +20,7 @@ HAVE_TLS = False # read initial config files -dirname = os.path.dirname(os.path.abspath(__file__)) + '/' +dirname = os.path.dirname(os.path.abspath(__file__)) + '/data/' logging.config.fileConfig(dirname + 'logging.conf') CONFIG = os.getenv('BROADLINKMQTTCONFIG', dirname + 'mqtt.conf') CONFIG_CUSTOM = os.getenv('BROADLINKMQTTCONFIGCUSTOM', dirname + 'custom.conf') diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..2c02cd4 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,2 @@ +paho-mqtt +broadlink From c758f73dacb5b189223643ebce6c6a33f8e6f343 Mon Sep 17 00:00:00 2001 From: TechForze Date: Tue, 19 Mar 2019 14:25:46 +0100 Subject: [PATCH 2/7] Update README.md --- README.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/README.md b/README.md index d931770..ebb5b9f 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,13 @@ +# Dockerized + +## Build + +docker build . -t broadlink2mqtt + +## run + +docker run -it --name broadlink2mqtt -v ./data:/broadlink-mqtt/data broadlink2mqtt + # MQTT client to control BroadLink devices ## Installation From f139cf06b594cce34a81fd3d2a0de15fa1f76c67 Mon Sep 17 00:00:00 2001 From: RN Date: Tue, 19 Mar 2019 15:21:34 +0100 Subject: [PATCH 3/7] added missing git in apt-get --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 551d434..35b9c5f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM debian:stretch RUN apt-get update && apt-get install -y\ - build-essential python-pip + git build-essential python-pip RUN git clone https://github.com/TechForze/broadlink-mqtt From beec00662cae439fb6e0189d43cbaa5fcadcf3c4 Mon Sep 17 00:00:00 2001 From: TechForze Date: Tue, 19 Mar 2019 19:47:37 +0100 Subject: [PATCH 4/7] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ebb5b9f..4e7d7ca 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ docker build . -t broadlink2mqtt -## run +## Run docker run -it --name broadlink2mqtt -v ./data:/broadlink-mqtt/data broadlink2mqtt From 170637b298b098d0aebed09ac5c444eafb99146e Mon Sep 17 00:00:00 2001 From: RN Date: Sun, 7 Jul 2019 15:28:48 +0200 Subject: [PATCH 5/7] downgrade broadlink --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 2c02cd4..b14050d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ paho-mqtt -broadlink +broadlink==0.9 From 58e546540c92d378a9764bc850a8bae008c00f0d Mon Sep 17 00:00:00 2001 From: kp47 Date: Sun, 7 Jul 2019 15:01:02 +0100 Subject: [PATCH 6/7] updated Dockerfile --- Dockerfile | 6 ++++-- requirements.txt | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 35b9c5f..a7698f9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,14 @@ FROM debian:stretch RUN apt-get update && apt-get install -y\ - git build-essential python-pip + build-essential libssl-dev libffi-dev python-dev git python-pip RUN git clone https://github.com/TechForze/broadlink-mqtt +#COPY . /broadlink-mqtt + WORKDIR /broadlink-mqtt RUN pip install -r /broadlink-mqtt/requirements.txt -CMD ["python", "/broadlink-mqtt/mqtt.py"] \ No newline at end of file +CMD ["python", "/broadlink-mqtt/mqtt.py"] diff --git a/requirements.txt b/requirements.txt index b14050d..2c02cd4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ paho-mqtt -broadlink==0.9 +broadlink From 9c1d4684f5a09b1c7c424169e8a99cae09e65a70 Mon Sep 17 00:00:00 2001 From: kp47 Date: Mon, 16 Mar 2020 18:55:17 +0100 Subject: [PATCH 7/7] older version? --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 2c02cd4..b14050d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ paho-mqtt -broadlink +broadlink==0.9