Skip to content

Commit 580f6cc

Browse files
committed
feat: update to 6.1.0
Signed-off-by: wilmardo <info@wilmardenouden.nl>
1 parent d28d286 commit 580f6cc

2 files changed

Lines changed: 9 additions & 4 deletions

File tree

Dockerfile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#######################################################################################################################
44
FROM lansible/nexe:4.0.0-beta.19 as builder
55

6-
ENV VERSION=v5.7.3
6+
ENV VERSION=v6.1.0
77

88
# Add unprivileged user
99
RUN echo "zwavejs2mqtt:x:1000:1000:zwavejs2mqtt:/:" > /etc_passwd
@@ -27,7 +27,7 @@ RUN git apply stateless.patch
2727
# Run build to make all html files
2828
RUN CORES=$(grep -c '^processor' /proc/cpuinfo); \
2929
export MAKEFLAGS="-j$((CORES+1)) -l${CORES}"; \
30-
npm install && \
30+
npm install --legacy-peer-deps && \
3131
npm run build && \
3232
npm prune --production
3333

@@ -97,6 +97,11 @@ COPY --from=builder \
9797
/zwavejs2mqtt/node_modules/@zwave-js/config/config/ \
9898
/zwavejs2mqtt/node_modules/@zwave-js/config/config/
9999

100+
# After troubleshooting this somehow can't be packed
101+
COPY --from=builder \
102+
/zwavejs2mqtt/node_modules/engine.io-parser/ \
103+
/zwavejs2mqtt/node_modules/engine.io-parser/
104+
100105
# Create default data directory
101106
# Will fail at runtime due missing the mkdir binary
102107
COPY --from=builder --chown=zwavejs2mqtt:0 /config /config

stateless.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ index a288733..246d8e1 100644
4040

4141
export default store
4242
diff --git a/lib/jsonStore.ts b/lib/jsonStore.ts
43-
index 5c182ca..a406609 100644
43+
index f1e84cd..bc32b63 100644
4444
--- a/lib/jsonStore.ts
4545
+++ b/lib/jsonStore.ts
4646
@@ -39,7 +39,7 @@ export class StorageHelper {
47-
let err: { code: string }
47+
let err: { code: string } | undefined
4848
let data: any
4949
try {
5050
- data = await readFile(utils.joinPath(storeDir, config.file))

0 commit comments

Comments
 (0)