diff --git a/ToreksBackend/src/influx.ts b/ToreksBackend/src/influx.ts index 34d4b71..b6c2e30 100644 --- a/ToreksBackend/src/influx.ts +++ b/ToreksBackend/src/influx.ts @@ -2,7 +2,7 @@ import dotenv from 'dotenv'; dotenv.config(); import { InfluxDB, Point } from '@influxdata/influxdb-client'; -const url = 'http://localhost:8086'; +const url = 'http://my_influxdb:8086'; const token = process.env.TOKEN; console.log('Influx Token:', token); const org = 'my-org'; diff --git a/ToreksBackend/src/routes/main.route.ts b/ToreksBackend/src/routes/main.route.ts index 94530d9..5518c3a 100644 --- a/ToreksBackend/src/routes/main.route.ts +++ b/ToreksBackend/src/routes/main.route.ts @@ -7,8 +7,8 @@ router.post('/data', async (req, res) => { try { const { timestamp, num_set, channel, data, block, dev_name } = req.body; - if (!timestamp || !num_set || !channel || !Array.isArray(data) || !dev_name || !block) { - // console.error(req.body); + if (!timestamp || !num_set || !channel || !Array.isArray(data) || !dev_name) { + console.error(req.body); res.status(400).json({ error: 'Invalid payload' }); return } @@ -41,7 +41,7 @@ router.post('/error', async (req, res) => { const { timestamp, num_set, channel, dev_name, sys_error, fiber_error } = req.body; if (!timestamp || !num_set || !channel || !sys_error || !dev_name || !fiber_error) { - // console.error(req.body); + console.error(req.body); res.status(400).json({ error: 'Invalid payload' }); return } diff --git a/backend.Dockerfile b/backend.Dockerfile new file mode 100644 index 0000000..da8aab0 --- /dev/null +++ b/backend.Dockerfile @@ -0,0 +1,10 @@ +FROM node:22-alpine3.22 AS base + +WORKDIR /app +COPY ./ToreksBackend/package.json ./ToreksBackend/yarn.lock ./ +RUN yarn install +COPY ToreksBackend ./ + +FROM base as prod +WORKDIR /app +RUN yarn build \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index d008b08..0560f12 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,14 +16,35 @@ services: - DOCKER_INFLUXDB_INIT_BUCKET=my-bucket - DOCKER_INFLUXDB_INIT_TOKEN=my-super-token restart: unless-stopped + networks: + - app-network - - grafana: - image: grafana/grafana:latest - container_name: grafana + backend-prod: + container_name: backend-prod + restart: always + env_file: + - ToreksBackend/.env + build: + context: . + target: prod + dockerfile: backend.Dockerfile ports: - - "3005:3000" - volumes: - - grafana_data:/var/lib/grafana + - "3000:3000" + networks: + - app-network + command: yarn start + +# grafana: +# image: grafana/grafana:latest +# container_name: grafana +# ports: +# - "3005:3000" +# volumes: +# - grafana_data:/var/lib/grafana + +networks: + app-network: + driver: bridge + volumes: influx_data: