From 7469d069173833600ce89018d3620aa857de8e7b Mon Sep 17 00:00:00 2001 From: Emmanuel Date: Wed, 15 Nov 2023 09:53:37 +0100 Subject: [PATCH 1/2] Update Dockerfile minor updates --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 11116a4..d17c81a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ FROM node:current-bookworm-slim #FROM node:4.4-wheezy MAINTAINER Emmanuel PIERRE epierre@e-nef.com USER root -LABEL Description="This image is used to start the MyDomoAtHome executable" Vendor="Domoticz" Version="0.3.2" +LABEL Description="This image is used to start the MyDomoAtHome executable" Vendor="Domoticz" Version="0.3.4" ################################################## # Install tools # @@ -56,7 +56,7 @@ RUN apt-get install -y nodejs #RUN apt-get install -y npm RUN npm install -g npm@6.x RUN wget http://www.e-nef.com/domoticz/mdah/node-mydomoathome-0.3.4.deb -RUN dpkg --force-all -i node-mydomoathome-0.3.2.deb +RUN dpkg --force-all -i node-mydomoathome-0.3.4.deb RUN mv /etc/mydomoathome/config.json /etc/mydomoathome/config.json.old VOLUME /etc/mydomoathome/ From e03f4c88d7b763b459ce20220431be018d49f384 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Wed, 15 Nov 2023 19:27:43 +0000 Subject: [PATCH 2/2] fix: upgrade winston from 3.9.0 to 3.11.0 Snyk has created this PR to upgrade winston from 3.9.0 to 3.11.0. See this package in npm: https://www.npmjs.com/package/winston See this project in Snyk: https://app.snyk.io/org/empierre/project/fea29c16-fcf8-4d96-b745-ab135b60dafa?utm_source=github&utm_medium=referral&page=upgrade-pr --- package-lock.json | 101 ++++++++++++++++++++++++++-------------------- package.json | 2 +- 2 files changed, 59 insertions(+), 44 deletions(-) diff --git a/package-lock.json b/package-lock.json index cac6a55..59cde6b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -29,10 +29,7 @@ "request": "^2.82.0", "sync-request": "3.0.1", "underscore": "1.13.6", - "winston": "^3.9.0" - }, - "bin": { - "mydomoathome": "bin/mydomoathome" + "winston": "^3.11.0" }, "devDependencies": { "assert": "^1.3.0", @@ -1019,11 +1016,6 @@ "node": ">= 0.6.4" } }, - "node_modules/broadway/node_modules/async": { - "version": "0.2.10", - "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz", - "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=" - }, "node_modules/broadway/node_modules/cliff": { "version": "0.1.9", "resolved": "https://registry.npmjs.org/cliff/-/cliff-0.1.9.tgz", @@ -1442,10 +1434,23 @@ "node": ">=0.2.5" } }, + "node_modules/cliff": { + "version": "0.1.10", + "resolved": "https://registry.npmjs.org/cliff/-/cliff-0.1.10.tgz", + "integrity": "sha512-roZWcC2Cxo/kKjRXw7YUpVNtxJccbvcl7VzTjUYgLQk6Ot0R8bm2netbhSZYWWNrKlOO/7HD6GXHl8dtzE6SiQ==", + "dependencies": { + "colors": "~1.0.3", + "eyes": "~0.1.8", + "winston": "0.8.x" + }, + "engines": { + "node": ">= 0.4.0" + } + }, "node_modules/cliff/node_modules/async": { "version": "0.2.10", "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz", - "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=" + "integrity": "sha512-eAkdoKxU6/LkKDBzLpT+t6Ff5EtfSF4wx1WfJiPEEV7WNLnDaRXk0oVysiEPm262roaachGexwUv94WhSgN5TQ==" }, "node_modules/cliff/node_modules/colors": { "version": "1.0.3", @@ -1455,6 +1460,23 @@ "node": ">=0.1.90" } }, + "node_modules/cliff/node_modules/winston": { + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/winston/-/winston-0.8.3.tgz", + "integrity": "sha512-fPoamsHq8leJ62D1M9V/f15mjQ1UHe4+7j1wpAT3fqgA5JqhJkk4aIfPEjfMTI9x6ZTjaLOpMAjluLtmgO5b6g==", + "dependencies": { + "async": "0.2.x", + "colors": "0.6.x", + "cycle": "1.0.x", + "eyes": "0.1.x", + "isstream": "0.1.x", + "pkginfo": "0.3.x", + "stack-trace": "0.0.x" + }, + "engines": { + "node": ">= 0.6.0" + } + }, "node_modules/cliff/node_modules/winston/node_modules/colors": { "version": "0.6.2", "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz", @@ -10533,11 +10555,11 @@ } }, "node_modules/winston": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/winston/-/winston-3.9.0.tgz", - "integrity": "sha512-jW51iW/X95BCW6MMtZWr2jKQBP4hV5bIDq9QrIjfDk6Q9QuxvTKEAlpUNAzP+HYHFFCeENhph16s0zEunu4uuQ==", + "version": "3.11.0", + "resolved": "https://registry.npmjs.org/winston/-/winston-3.11.0.tgz", + "integrity": "sha512-L3yR6/MzZAOl0DsysUXHVjOwv8mKZ71TrA/41EIduGpOOV5LQVodqN+QdQ6BS6PJ/RdIshZhq84P/fStEZkk7g==", "dependencies": { - "@colors/colors": "1.5.0", + "@colors/colors": "^1.6.0", "@dabh/diagnostics": "^2.0.2", "async": "^3.2.3", "is-stream": "^2.0.0", @@ -10579,6 +10601,14 @@ "node": ">= 6" } }, + "node_modules/winston/node_modules/@colors/colors": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.6.0.tgz", + "integrity": "sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==", + "engines": { + "node": ">=0.1.90" + } + }, "node_modules/winston/node_modules/async": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz", @@ -11721,23 +11751,16 @@ "cliff": "0.1.9", "eventemitter2": "0.4.14", "nconf": "0.6.9", - "utile": "0.2.1", - "winston": "0.8.0" + "utile": "0.2.1" }, "dependencies": { - "async": { - "version": "0.2.10", - "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz", - "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=" - }, "cliff": { "version": "0.1.9", "resolved": "https://registry.npmjs.org/cliff/-/cliff-0.1.9.tgz", "integrity": "sha1-ohHgnGo947oa8n0EnTASUNGIErw=", "requires": { "colors": "0.x.x", - "eyes": "0.1.x", - "winston": "0.8.x" + "eyes": "0.1.x" } }, "nconf": { @@ -11756,19 +11779,6 @@ "integrity": "sha1-32MGD789Myhqdqr21Vophtn/hhk=" } } - }, - "winston": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/winston/-/winston-0.8.0.tgz", - "integrity": "sha1-YdCDD6aZcGISIGsKK1ymmpMENmg=", - "requires": { - "async": "0.2.x", - "colors": "0.6.x", - "cycle": "1.0.x", - "eyes": "0.1.x", - "pkginfo": "0.3.x", - "stack-trace": "0.0.x" - } } } }, @@ -12087,7 +12097,7 @@ "cliff": { "version": "0.1.10", "resolved": "https://registry.npmjs.org/cliff/-/cliff-0.1.10.tgz", - "integrity": "sha1-U74z6p9ZvshWCe4wCsQgdgPlIBM=", + "integrity": "sha512-roZWcC2Cxo/kKjRXw7YUpVNtxJccbvcl7VzTjUYgLQk6Ot0R8bm2netbhSZYWWNrKlOO/7HD6GXHl8dtzE6SiQ==", "requires": { "colors": "~1.0.3", "eyes": "~0.1.8", @@ -12097,7 +12107,7 @@ "async": { "version": "0.2.10", "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz", - "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=" + "integrity": "sha512-eAkdoKxU6/LkKDBzLpT+t6Ff5EtfSF4wx1WfJiPEEV7WNLnDaRXk0oVysiEPm262roaachGexwUv94WhSgN5TQ==" }, "colors": { "version": "1.0.3", @@ -12107,7 +12117,7 @@ "winston": { "version": "0.8.3", "resolved": "https://registry.npmjs.org/winston/-/winston-0.8.3.tgz", - "integrity": "sha1-ZLar9M0Brcrv1QCTk7HY6L7BnbA=", + "integrity": "sha512-fPoamsHq8leJ62D1M9V/f15mjQ1UHe4+7j1wpAT3fqgA5JqhJkk4aIfPEjfMTI9x6ZTjaLOpMAjluLtmgO5b6g==", "requires": { "async": "0.2.x", "colors": "0.6.x", @@ -19277,11 +19287,11 @@ } }, "winston": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/winston/-/winston-3.9.0.tgz", - "integrity": "sha512-jW51iW/X95BCW6MMtZWr2jKQBP4hV5bIDq9QrIjfDk6Q9QuxvTKEAlpUNAzP+HYHFFCeENhph16s0zEunu4uuQ==", + "version": "3.11.0", + "resolved": "https://registry.npmjs.org/winston/-/winston-3.11.0.tgz", + "integrity": "sha512-L3yR6/MzZAOl0DsysUXHVjOwv8mKZ71TrA/41EIduGpOOV5LQVodqN+QdQ6BS6PJ/RdIshZhq84P/fStEZkk7g==", "requires": { - "@colors/colors": "1.5.0", + "@colors/colors": "^1.6.0", "@dabh/diagnostics": "^2.0.2", "async": "^3.2.3", "is-stream": "^2.0.0", @@ -19294,6 +19304,11 @@ "winston-transport": "^4.5.0" }, "dependencies": { + "@colors/colors": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.6.0.tgz", + "integrity": "sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==" + }, "async": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz", diff --git a/package.json b/package.json index 491fe4b..282894d 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "request": "^2.82.0", "sync-request": "3.0.1", "underscore": "1.13.6", - "winston": "^3.9.0" + "winston": "^3.11.0" }, "devDependencies": { "assert": "^1.3.0",