Merge branch 'nodejs' of https://github.com/empierre/MyDomoAtHome int…

…o nodejs back
empierre · Nov 15, 2023 · 9a48089 · 9a48089
2 parents ec9bb59 + f45bb89
commit 9a48089
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 45 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -4,7 +4,11 @@ FROM node:current-bookworm-slim
 #FROM node:4.4-wheezy
 MAINTAINER  Emmanuel PIERRE [email protected]
 USER root
+<<<<<<< HEAD
 LABEL Description="This image is used to start the MyDomoAtHome executable" Vendor="Domoticz" Version="0.3.5"
+=======
+LABEL Description="This image is used to start the MyDomoAtHome executable" Vendor="Domoticz" Version="0.3.4"
+>>>>>>> f45bb89c98b4d88f8a3b55e70e8425a69dbb4f57
 
 ##################################################
 # Install tools                                  #

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -19,11 +19,11 @@
     "moment": "^2.29.4",
     "morgan": "^1.9.1",
     "multer": "^1.4.4",
-    "nconf": "^0.12.1",
+    "nconf": "^0.12.0",
     "request": "^2.82.0",
     "sync-request": "3.0.1",
     "underscore": "1.13.6",
-    "winston": "^3.11.0"
+    "winston": "^3.9.0"
   },
   "devDependencies": {
     "assert": "^1.3.0",