back logs in same place

empierre · Nov 14, 2023 · 3976a68 · 3976a68
1 parent ef1c035
commit 3976a68
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 11 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,10 +1,10 @@
 # DOCKER-VERSION 0.3.4
-FROM node:current-bullseye-slim
+FROM node:current-bookworm-slim
 #FROM google/nodejs
 #FROM node:4.4-wheezy
 MAINTAINER  Emmanuel PIERRE [email protected]
 USER root
-LABEL Description="This image is used to start the MyDomoAtHome executable" Vendor="Domoticz" Version="0.2.45"
+LABEL Description="This image is used to start the MyDomoAtHome executable" Vendor="Domoticz" Version="0.3.1"
 
 ##################################################
 # Install tools                                  #
@@ -46,12 +46,17 @@ RUN echo "Europe/Paris" > /etc/timezone && dpkg-reconfigure -f noninteractive tz
 
 #RUN cachebuster=b953b35 git clone -b nodejs https://github.com/empierre/MyDomoAtHome.git dist
 #RUN cd MyDomoAtHome && bash run-once.sh
-RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
+#RUN curl -sL https://deb.nodesource.com/setup_18.x | bash -
+RUN apt-get install -y ca-certificates curl gnupg
+RUN mkdir -p /etc/apt/keyrings
+RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
+RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | sudo tee /etc/apt/sources.list.d/nodesource.list
+RUN apt-get update
 RUN apt-get install -y nodejs
-RUN apt-get install -y npm
+#RUN apt-get install -y npm
 RUN npm install -g [email protected]
-RUN wget http://www.e-nef.com/domoticz/mdah/node-mydomoathome-0.3.1.deb
-RUN dpkg --force-all -i node-mydomoathome-0.2.45.deb
+RUN wget http://www.e-nef.com/domoticz/mdah/node-mydomoathome-0.3.2.deb
+RUN dpkg --force-all -i node-mydomoathome-0.3.1.deb
 RUN mv /etc/mydomoathome/config.json /etc/mydomoathome/config.json.old
 VOLUME /etc/mydomoathome/
 

diff --git a/correct.sh b/correct.sh
@@ -21,4 +21,4 @@ gpg --clearsign -o InRelease Release
 gpg -abs -o Release.gpg Release
 ./make.buster.sh
 ./make.oldstable.sh
-sitecopy -u mdah
+sitecopy -ukk mdah
diff --git a/mdah.js b/mdah.js
@@ -69,7 +69,7 @@ if (process.env.MDAH_HOME) {
 } else {
     app.use(express.static(path.join(__dirname + '/public')));
     app.set('views', path.resolve(__dirname + '/views'));
-    logger.add(new winston.transports.File({filename: '/var/log/mydomoathome-usage.log'}));
+    logger.add(new winston.transports.File({filename: '/var/log/mydomoathome/usage.log'}));
 
 }
 

diff --git a/packaging/synology/build/INFO b/packaging/synology/build/INFO
@@ -13,7 +13,7 @@ displayname="MyDomoAtHome"
 dsmuidir="app"
 adminport="3002"
 changelog="First version"
-checksum="7377363ff34e5eac9bd7beae2d1d32d0"
+checksum="83b172bba50135f52d4a0d8705ebedb8"
 checkport="yes"
 startable="yes"
 helpurl="https://github.com/empierre/MyDomoAtHome/"

diff --git a/publish.sh b/publish.sh
@@ -37,10 +37,10 @@ cd ..
 ./make.buster.sh
 ./make.oldstable.sh
 cp InRelease Release /home/in/prod/e-nef/domoticz/mdah
-sitecopy -u mdah
+sitecopy -ukk mdah
 #cd ..
 #NPM repository
 node --max-old-space-size=8000 $(which npm) publish
 
-curl -X POST --data-urlencode 'payload={"channel": "#general", "username": "webhookbot", "text": "New package version '"$1"' available at <http://www.e-nef.com/domoticz/mdah/node-mydomoathome-latest.deb|node-mydomoathome-'"$1"'.deb>", "icon_emoji": ":ghost:"}' https://hooks.slack.com/services/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
+curl -X POST --data-urlencode 'payload={"channel": "#general", "username": "webhookbot", "text": "New package version '"$1"' available at <http://www.e-nef.com/domoticz/mdah/node-mydomoathome-latest.deb|node-mydomoathome-'"$1"'.deb>", "icon_emoji": ":ghost:"}' 'https://hooks.slack.com/services/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'
 #./make.docker.sh