Skip to content

Commit

Permalink
feat: update to 3.4.0, update patch
Browse files Browse the repository at this point in the history
Signed-off-by: wilmardo <[email protected]>
  • Loading branch information
wilmardo committed Jul 1, 2020
1 parent 22eea71 commit 0cd2e4a
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 15 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ ARG ARCHITECTURE
#######################################################################################################################
FROM multiarch/alpine:${ARCHITECTURE}-v3.12 as openzwave-builder

# See old.openzwave.com/downloads/ for latest
ENV VERSION=1.6.1133
# See http://old.openzwave.com/downloads/ for latest
ENV VERSION=1.6.1173

# coreutils: needed for openzwave compile
RUN apk --no-cache add \
Expand All @@ -31,7 +31,7 @@ RUN CORES=$(grep -c '^processor' /proc/cpuinfo); \
#######################################################################################################################
FROM lansible/nexe:4.0.0-beta.6-${ARCHITECTURE} as builder

ENV VERSION=3.2.2
ENV VERSION=3.4.0

# Add unprivileged user
RUN echo "zwave2mqtt:x:1000:1000:zwave2mqtt:/:" > /etc_passwd
Expand Down
26 changes: 14 additions & 12 deletions stateless.patch
Original file line number Diff line number Diff line change
@@ -1,26 +1,28 @@
diff --git a/config/app.js b/config/app.js
index 3d7ce88..d146fd2 100644
index 9a0e84a..1a83c8c 100644
--- a/config/app.js
+++ b/config/app.js
@@ -1,5 +1,5 @@
@@ -1,7 +1,7 @@
// config/app.js
module.exports = {
- 'storeDir': 'store',
+ 'storeDir': process.env.ZWAVE2MQTT_DATA || 'store',
'port': 8091
};
title: 'ZWave To MQTT',
- storeDir: 'store',
+ storeDir: process.env.ZWAVE2MQTT_DATA || 'store',
base: '/',
port: 8091
}
diff --git a/config/store.js b/config/store.js
index 1b07fd4..d5fd090 100644
index aa05103..cec1ecd 100644
--- a/config/store.js
+++ b/config/store.js
@@ -1,6 +1,6 @@
// config/store.js
module.exports = {
- 'settings' : {file: 'settings.json', default: {}} ,
+ 'settings' : {file: process.env.ZWAVE2MQTT_CONFIG || 'settings.json', default: {}} ,
'scenes' : {file: 'scenes.json', default: []} ,
'nodes' : {file: 'nodes.json', default: []}
};
- settings: { file: 'settings.json', default: {} },
+ settings: { file: process.env.ZWAVE2MQTT_CONFIG || 'settings.json', default: {} },
scenes: { file: 'scenes.json', default: [] },
nodes: { file: 'nodes.json', default: [] }
}
diff --git a/lib/utils.js b/lib/utils.js
index 272c7b7..746a248 100644
--- a/lib/utils.js
Expand Down

0 comments on commit 0cd2e4a

Please sign in to comment.