From abe75ec75bdc4b25f41c52818d189ed549a7c661 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Escandell?= Date: Wed, 4 Mar 2020 20:30:53 +0100 Subject: [PATCH 01/10] Force alpine version to force OZW version --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 6f6a1ce4d1..931d984b35 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,6 +1,6 @@ ARG target -FROM $target/node:12-alpine +FROM $target/node:12-alpine3.11 LABEL \ org.label-schema.build-date=$BUILD_DATE \ From f22fb1129a5af296c10a5f6677d019b6f4dc7b9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Escandell?= Date: Wed, 4 Mar 2020 22:40:31 +0100 Subject: [PATCH 02/10] Install OZW 1.6 in CircleCI & use 1.6.2 OZW Node --- .circleci/config.yml | 11 ++++++++++- server/services/zwave/package.json | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9f1a7a0973..7ddc4befb8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -42,7 +42,16 @@ jobs: - run: name: Install system dependencies command: | - sudo apt-get install -y libudev-dev sqlite3 openssl openzwave libopenzwave1.5-dev + sudo apt-get install -y libudev-dev sqlite3 openssl + - run: + name: Install Openzwave 1.6 Revision 974 # Install the same version as in alpine-3.11 + command: | + cd /tmp + git clone https://github.com/OpenZWave/open-zwave.git + cd open-zwave + git checkout e89d2a1677f5afe74e836d8c75d7f33d784ea790 + sudo make + sudo make install - run: name: Install global dependencies command: 'sudo npm install typescript node-gyp npm@latest -g' diff --git a/server/services/zwave/package.json b/server/services/zwave/package.json index 5b8fcef4b4..5e9b907a77 100644 --- a/server/services/zwave/package.json +++ b/server/services/zwave/package.json @@ -13,6 +13,6 @@ ], "scripts": {}, "dependencies": { - "openzwave-shared": "^1.5.8" + "openzwave-shared": "^1.6.2" } } From 36008f0238cf2f5ad5af05e8134c06ec61df4e51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Escandell?= Date: Wed, 4 Mar 2020 23:27:29 +0100 Subject: [PATCH 03/10] Force library update --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7ddc4befb8..5117719650 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -52,6 +52,8 @@ jobs: git checkout e89d2a1677f5afe74e836d8c75d7f33d784ea790 sudo make sudo make install + sudo sh -c "echo '/usr/local/lib64' > /etc/ld.so.conf.d/openzwave.conf" + sudo ldconfig - run: name: Install global dependencies command: 'sudo npm install typescript node-gyp npm@latest -g' From b6776b44930c97ba197289f728acd4192a744b43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Escandell?= Date: Sun, 8 Mar 2020 22:04:26 +0100 Subject: [PATCH 04/10] Install latest OZW version (but fixed on a given commit) --- .circleci/config.yml | 4 ++-- docker/Dockerfile | 14 ++++++++++++-- server/services/zwave/package-lock.json | 6 +++--- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5117719650..7650dcc9ae 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -44,12 +44,12 @@ jobs: command: | sudo apt-get install -y libudev-dev sqlite3 openssl - run: - name: Install Openzwave 1.6 Revision 974 # Install the same version as in alpine-3.11 + name: Install Openzwave 1.6 # Commit 5d18bbfb21d8cdc61ee6baae6f478c963297dfc5 - March, 5th 2020 command: | cd /tmp git clone https://github.com/OpenZWave/open-zwave.git cd open-zwave - git checkout e89d2a1677f5afe74e836d8c75d7f33d784ea790 + git checkout 5d18bbfb21d8cdc61ee6baae6f478c963297dfc5 sudo make sudo make install sudo sh -c "echo '/usr/local/lib64' > /etc/ld.so.conf.d/openzwave.conf" diff --git a/docker/Dockerfile b/docker/Dockerfile index 931d984b35..468f2857af 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -9,7 +9,7 @@ LABEL \ COPY qemu-* /usr/bin/ # System dependencies -RUN apk add --no-cache tzdata nmap openzwave-dev openzwave-libs openzwave ffmpeg sqlite openssl gzip +RUN apk add --no-cache tzdata nmap ffmpeg sqlite openssl gzip RUN mkdir /src WORKDIR /src @@ -17,7 +17,17 @@ ADD . /src COPY ./static /src/server/static WORKDIR /src/server -RUN apk add --no-cache --virtual .build-deps make gcc g++ python git libffi-dev linux-headers udev \ +RUN apk add --no-cache --virtual .build-deps make gcc g++ python libffi-dev linux-headers git udev coreutils \ + # Install OZW 1.6 - Commit 5d18bbfb21d8cdc61ee6baae6f478c963297dfc5 - March, 5th 2020 + && cd /tmp \ + && git clone https://github.com/OpenZWave/open-zwave.git \ + && cd open-zwave \ + && git checkout 5d18bbfb21d8cdc61ee6baae6f478c963297dfc5 \ + && make \ + && make install \ + && cd /src/server \ + && rm -rf /tmp/open-zwave \ + # Install Gladys && npm install --unsafe-perm --production \ && npm cache clean --force \ && apk del .build-deps diff --git a/server/services/zwave/package-lock.json b/server/services/zwave/package-lock.json index e84a59f4fc..e298083ceb 100644 --- a/server/services/zwave/package-lock.json +++ b/server/services/zwave/package-lock.json @@ -9,9 +9,9 @@ "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==" }, "openzwave-shared": { - "version": "1.5.8", - "resolved": "https://registry.npmjs.org/openzwave-shared/-/openzwave-shared-1.5.8.tgz", - "integrity": "sha512-B4YcxdEBi/Llz6AGeRn3wpLyuhTcFkFB7A3RNOSp2lhPhm65LxHe8Pvn8iDL8FrhEWmDOSE8YyS6IGkG2AgEXQ==", + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/openzwave-shared/-/openzwave-shared-1.6.2.tgz", + "integrity": "sha512-hZSvdMf6ifV/lFJ2sc5Sru7c4BjpfNMqKoLfH/TTyCMJiWDCTLywqFktrIEt23SqLS15KdQdGX4urJqBWQXVKw==", "requires": { "nan": ">=2.14.0" } From f8a75f57d021e4699fc60c31be573f076dd0ae81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Escandell?= Date: Mon, 6 Apr 2020 23:39:31 +0200 Subject: [PATCH 05/10] Fix already pushed in a previous PR... Error in commit 5242a1a6477ea89ff7e5383f214b142797758603 ? --- .../boxs/device-in-room/device-features/BinaryDeviceFeature.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/src/components/boxs/device-in-room/device-features/BinaryDeviceFeature.jsx b/front/src/components/boxs/device-in-room/device-features/BinaryDeviceFeature.jsx index 1b3ccf06ab..3a0cc416dc 100644 --- a/front/src/components/boxs/device-in-room/device-features/BinaryDeviceFeature.jsx +++ b/front/src/components/boxs/device-in-room/device-features/BinaryDeviceFeature.jsx @@ -7,7 +7,7 @@ const BinaryDeviceType = ({ children, ...props }) => { props.deviceFeature, props.deviceIndex, props.deviceFeatureIndex, - props.deviceFeature.last_value === 0 ? 1 : 0 + !props.deviceFeature.last_value ); } From 87fc2e368fdbe12335eb0efebe5d298bce92a730 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Escandell?= Date: Tue, 7 Apr 2020 08:06:32 +0200 Subject: [PATCH 06/10] Reorder Docker commands for local dev' --- docker/Dockerfile | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 468f2857af..787f49aa27 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -11,24 +11,27 @@ COPY qemu-* /usr/bin/ # System dependencies RUN apk add --no-cache tzdata nmap ffmpeg sqlite openssl gzip -RUN mkdir /src -WORKDIR /src -ADD . /src -COPY ./static /src/server/static -WORKDIR /src/server +WORKDIR /tmp +# Install OZW in a dedicated RUN to benefit from Docker cache on local dev' RUN apk add --no-cache --virtual .build-deps make gcc g++ python libffi-dev linux-headers git udev coreutils \ # Install OZW 1.6 - Commit 5d18bbfb21d8cdc61ee6baae6f478c963297dfc5 - March, 5th 2020 - && cd /tmp \ && git clone https://github.com/OpenZWave/open-zwave.git \ && cd open-zwave \ && git checkout 5d18bbfb21d8cdc61ee6baae6f478c963297dfc5 \ && make \ && make install \ - && cd /src/server \ - && rm -rf /tmp/open-zwave \ - # Install Gladys - && npm install --unsafe-perm --production \ + && cd /tmp \ + && rm -rf /tmp/open-zwave + + +# Install Gladys +RUN mkdir /src +WORKDIR /src +ADD . /src +COPY ./static /src/server/static +WORKDIR /src/server +RUN npm ci --unsafe-perm --production \ && npm cache clean --force \ && apk del .build-deps From e118b3c2e347ed478c1d53dd3e451eaffa2a7059 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Escandell?= Date: Mon, 27 Apr 2020 15:21:09 +0200 Subject: [PATCH 07/10] Revert change not for this PR --- .../boxs/device-in-room/device-features/BinaryDeviceFeature.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/src/components/boxs/device-in-room/device-features/BinaryDeviceFeature.jsx b/front/src/components/boxs/device-in-room/device-features/BinaryDeviceFeature.jsx index 3a0cc416dc..1b3ccf06ab 100644 --- a/front/src/components/boxs/device-in-room/device-features/BinaryDeviceFeature.jsx +++ b/front/src/components/boxs/device-in-room/device-features/BinaryDeviceFeature.jsx @@ -7,7 +7,7 @@ const BinaryDeviceType = ({ children, ...props }) => { props.deviceFeature, props.deviceIndex, props.deviceFeatureIndex, - !props.deviceFeature.last_value + props.deviceFeature.last_value === 0 ? 1 : 0 ); } From d15365a4d8e142806f9c2a65c371774fbb79ce84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Escandell?= Date: Mon, 27 Apr 2020 15:22:41 +0200 Subject: [PATCH 08/10] Fix Dockerfile --- docker/Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 787f49aa27..a4e179383d 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -14,13 +14,14 @@ RUN apk add --no-cache tzdata nmap ffmpeg sqlite openssl gzip WORKDIR /tmp # Install OZW in a dedicated RUN to benefit from Docker cache on local dev' -RUN apk add --no-cache --virtual .build-deps make gcc g++ python libffi-dev linux-headers git udev coreutils \ +RUN apk add --no-cache --virtual .build-deps make g++ git udev coreutils \ # Install OZW 1.6 - Commit 5d18bbfb21d8cdc61ee6baae6f478c963297dfc5 - March, 5th 2020 && git clone https://github.com/OpenZWave/open-zwave.git \ && cd open-zwave \ && git checkout 5d18bbfb21d8cdc61ee6baae6f478c963297dfc5 \ && make \ && make install \ + && apk del .build-deps \ && cd /tmp \ && rm -rf /tmp/open-zwave @@ -31,7 +32,8 @@ WORKDIR /src ADD . /src COPY ./static /src/server/static WORKDIR /src/server -RUN npm ci --unsafe-perm --production \ +RUN apk add --no-cache --virtual .build-deps make gcc g++ python libffi-dev linux-headers git udev \ + && npm ci --unsafe-perm --production \ && npm cache clean --force \ && apk del .build-deps From 992fd116763a8b1c40172c5d2849210ff2ec64e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Escandell?= Date: Mon, 27 Apr 2020 18:03:49 +0200 Subject: [PATCH 09/10] Useless change --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index a4e179383d..04ac96ef0c 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -32,7 +32,7 @@ WORKDIR /src ADD . /src COPY ./static /src/server/static WORKDIR /src/server -RUN apk add --no-cache --virtual .build-deps make gcc g++ python libffi-dev linux-headers git udev \ +RUN apk add --no-cache --virtual .build-deps make gcc g++ python git libffi-dev linux-headers udev \ && npm ci --unsafe-perm --production \ && npm cache clean --force \ && apk del .build-deps From 379209b4d306d10efa1822489a005e341e5f17f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Escandell?= Date: Wed, 6 May 2020 23:11:28 +0200 Subject: [PATCH 10/10] Revert forcing alpine version as now OZW is manually compiled --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 04ac96ef0c..915b973ae0 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,6 +1,6 @@ ARG target -FROM $target/node:12-alpine3.11 +FROM $target/node:12-alpine LABEL \ org.label-schema.build-date=$BUILD_DATE \