Funktioniert - im Docker
This commit is contained in:
16
Dockerfile_laufschrift
Normal file
16
Dockerfile_laufschrift
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
FROM node:9-alpine
|
||||||
|
|
||||||
|
WORKDIR /opt/app
|
||||||
|
ADD . /opt/app
|
||||||
|
|
||||||
|
RUN apk add --no-cache tzdata
|
||||||
|
ENV TZ Europe/Berlin
|
||||||
|
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
|
||||||
|
|
||||||
|
RUN touch cmds.sh \
|
||||||
|
&& echo 'npm start' >>cmds.sh
|
||||||
|
|
||||||
|
EXPOSE 3011
|
||||||
|
|
||||||
|
CMD sh ./cmds.sh
|
||||||
|
|
||||||
31
build_and_copy.sh
Executable file
31
build_and_copy.sh
Executable file
@@ -0,0 +1,31 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# Build Docker-Container
|
||||||
|
#
|
||||||
|
# Call: buildit.sh name [target]
|
||||||
|
#
|
||||||
|
# The Dockerfile must be named like Dockerfile_name
|
||||||
|
#
|
||||||
|
# 2018-09-20 rxf
|
||||||
|
# - before sending docker image to remote, tag actual remote image
|
||||||
|
#
|
||||||
|
# 2018-09-14 rxf
|
||||||
|
# - first Version
|
||||||
|
#
|
||||||
|
|
||||||
|
# set -x
|
||||||
|
if [ $# -lt 1 ]
|
||||||
|
then
|
||||||
|
echo "Usage buildit_and_copy.sh name [target]"
|
||||||
|
echo " name: Name of container"
|
||||||
|
echo " target: Where to copy the container to (optional)"
|
||||||
|
exit
|
||||||
|
fi
|
||||||
|
|
||||||
|
docker build -f Dockerfile_$1 -t $1 .
|
||||||
|
|
||||||
|
if [ $2 != "" ]
|
||||||
|
then
|
||||||
|
dat=`date +%Y%m%d%H%M`
|
||||||
|
ssh $2 "docker tag $1 $1:V_$dat"
|
||||||
|
docker save $1 | bzip2 | pv | ssh $2 'bunzip2 | docker load'
|
||||||
|
fi
|
||||||
@@ -3,7 +3,7 @@
|
|||||||
"version": "0.0.0",
|
"version": "0.0.0",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"start": "node ./bin/www"
|
"start": "node ./bin/www >>/var/log/laufschrift.log 2>&1"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"cookie-parser": "~1.4.3",
|
"cookie-parser": "~1.4.3",
|
||||||
|
|||||||
@@ -8,9 +8,28 @@ let tio;
|
|||||||
const brenndauer = 300; // 20sec Relais ON
|
const brenndauer = 300; // 20sec Relais ON
|
||||||
|
|
||||||
// MQTT:
|
// MQTT:
|
||||||
|
let MQTTHOST = process.env.MQTTHOST;
|
||||||
|
let MQTTPORT = process.env.MQTTPORT;
|
||||||
|
let MQTTUSR = process.env.MQTTUSR;
|
||||||
|
let MQTTPWD = process.env.MQTTPWD;
|
||||||
|
|
||||||
|
/*
|
||||||
|
if (MQTTHOST === undefined) { MQTTHOST = 'localhost';}
|
||||||
|
if (MQTTPORT === undefined) { MQTTPORT = 1883;}
|
||||||
|
if (MQTTUSR === undefined) { MQTTUSR = "";}
|
||||||
|
if (MQTTPWD === undefined) { MQTTPWD = "";}
|
||||||
|
*/
|
||||||
|
|
||||||
|
if (MQTTHOST === undefined) { MQTTHOST = 'laufschrift.rexfue.de';}
|
||||||
|
if (MQTTPORT === undefined) { MQTTPORT = 1883;}
|
||||||
|
if (MQTTUSR === undefined) { MQTTUSR = "stwLauf";}
|
||||||
|
if (MQTTPWD === undefined) { MQTTPWD = "37CrNcgP";}
|
||||||
|
|
||||||
|
console.log("H",MQTTHOST," P",MQTTPORT," U",MQTTUSR," p",MQTTPWD);
|
||||||
|
|
||||||
let connected = false;
|
let connected = false;
|
||||||
let relais = 'MIST';
|
let relais = 'MIST';
|
||||||
let client = mqtt.connect('mqtt://play.rexfue.de');
|
let client = mqtt.connect("mqtt://" + MQTTHOST + ":" + MQTTPORT,{username: MQTTUSR, password: MQTTPWD});
|
||||||
let offtime = "";
|
let offtime = "";
|
||||||
let retur = {};
|
let retur = {};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user