merge env. using existing mqtt

This commit is contained in:
Dobromir Popov ONE
2023-05-15 10:58:49 +03:00
parent b81424a5c8
commit fd7ef73a47
3 changed files with 20 additions and 13 deletions

7
.env Normal file
View File

@@ -0,0 +1,7 @@
# .env
# Replace with the correct values
DB_HOST=mariadb
DB_USER=mariadb
DB_PASS=mariadb
DB_PORT=3306
DB_NAME=mariadb

5
.gitignore vendored
View File

@@ -1,6 +1,7 @@
/node_modules node_modules/
/.vscode /.vscode
access.log access.log
db/documents.db db/documents.db
vendor vendor
/.vs .vs/

View File

@@ -3,7 +3,6 @@ version: '3.3'
services: services:
node-app: node-app:
build: . build: .
command: npm run start:debug
environment: environment:
- DATABASE_HOST=node-mysql - DATABASE_HOST=node-mysql
- DATABASE_NAME=iot - DATABASE_NAME=iot
@@ -11,13 +10,13 @@ services:
- DATABASE_PASS=mitko2021 - DATABASE_PASS=mitko2021
- GARDEN_IP=0.0.0.0 - GARDEN_IP=0.0.0.0
# - GARDEN_IP=192.168.0.100 # - GARDEN_IP=192.168.0.100
- MQTT_HOST=192.168.0.10 - MQTT_HOST=node-mqtt
- MQTT_PORT_HTTP=1883 - MQTT_PORT_HTTP=1883
- MQTT_PORT_HTTPS=8444 - MQTT_PORT_HTTPS=8444
- MQTT_ESP_NAME=Garden - MQTT_ESP_NAME=Garden
depends_on: depends_on:
- node-mysql - node-mysql
#- node-mqtt - node-mqtt
restart: always restart: always
ports: ports:
- 2081:2080 - 2081:2080
@@ -33,13 +32,13 @@ services:
volumes: volumes:
- iotdbdata:/var/lib/mysql - iotdbdata:/var/lib/mysql
# for mitko:mqtt # for mitko:mqtt
# node-mqtt: node-mqtt:
# image: eclipse-mosquitto image: eclipse-mosquitto
# command: mosquitto -c /mosquitto-no-auth.conf command: mosquitto -c /mosquitto-no-auth.conf
# hostname: node-mqtt hostname: node-mqtt
# ports: ports:
# - 1885:1883 - 1885:1883
# - 10883:1883 - 10883:1883
# restart: always restart: always
volumes: volumes:
iotdbdata: iotdbdata: