Update Open-Zwave to version 1.6 (GladysAssistant#675)

* Force alpine version to force OZW version

* Install OZW 1.6 in CircleCI & use 1.6.2 OZW Node

* Force library update

* Install latest OZW version (but fixed on a given commit)

* Fix already pushed in a previous PR... Error in commit 5242a1a ?

* Reorder Docker commands for local dev'

* Revert change not for this PR

* Fix Dockerfile

* Revert forcing alpine version as now OZW is manually compiled

Co-authored-by: Pierre-Gilles Leymarie <pierregilles.leymarie@gmail.com>

.circleci/config.yml

@@ -42,7 +42,18 @@ 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 # Commit 5d18bbfb21d8cdc61ee6baae6f478c963297dfc5 - March, 5th 2020
+          command: |
+            cd /tmp
+            git clone https://github.com/OpenZWave/open-zwave.git 
+            cd open-zwave
+            git checkout 5d18bbfb21d8cdc61ee6baae6f478c963297dfc5
+            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'

docker/Dockerfile

@@ -9,16 +9,31 @@ 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
 
+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 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
+
+
+# Install Gladys
 RUN mkdir /src
 WORKDIR /src
 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 \
-    && npm install --unsafe-perm --production \
+    && npm ci --unsafe-perm --production \
     && npm cache clean --force \
     && apk del .build-deps
 

server/services/zwave/package.json

@@ -13,6 +13,6 @@
   ],
   "scripts": {},
   "dependencies": {
-    "openzwave-shared": "^1.5.8"
+    "openzwave-shared": "^1.6.2"
   }
 }