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.

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

Update OZW to 1.6 and use the same version in all context #675

Merged
merged 11 commits into from
May 18, 2020
13 changes: 12 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
23 changes: 19 additions & 4 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG target

FROM $target/node:12-alpine
FROM $target/node:12-alpine3.11
sescandell marked this conversation as resolved.
Show resolved Hide resolved

LABEL \
org.label-schema.build-date=$BUILD_DATE \
Expand All @@ -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

Expand Down
6 changes: 3 additions & 3 deletions server/services/zwave/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion server/services/zwave/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
],
"scripts": {},
"dependencies": {
"openzwave-shared": "^1.5.8"
"openzwave-shared": "^1.6.2"
}
}