From 5ac36f968125b8813d16d602362fc0f86f5994f3 Mon Sep 17 00:00:00 2001 From: Artemy Egorov Date: Mon, 28 Aug 2023 22:15:13 +0300 Subject: [PATCH] fix: all docker issues --- Dockerfile | 4 ++-- docker-compose.yml | 8 ++++---- package.json | 1 + src/config/config.service.ts | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index c8553a2..9bd5954 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ RUN npm run build FROM node:18-alpine as run WORKDIR /app -COPY /app/dist /app/package*.json . --from=build +COPY --from=build /app/dist/ /app/package*.json ./ RUN npm install --omit=dev -CMD npm start +CMD npm run start:docker EXPOSE 8080 diff --git a/docker-compose.yml b/docker-compose.yml index 44a7b43..8fe9dea 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,11 +2,11 @@ version: "3" services: txtdot: - image: darkcat09/txtdot:latest + build: . + ports: + - "8080:8080" restart: unless-stopped - network_mode: host environment: - - HOST=127.0.0.1 + - HOST=0.0.0.0 - PORT=8080 - REVERSE_PROXY=true - # env_file: .env diff --git a/package.json b/package.json index 39dd3ea..793d9ef 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,7 @@ "test": "echo \"Error: no test specified\" && exit 1", "build": "npm run clean-css && copyfiles ./templates/*.ejs .env ./dist/ && tsc", "start": "cd ./dist && node ./src/app.js", + "start:docker": "node ./src/app.js", "clean-css": "cleancss --batch static/*.css -o dist/static --batch-suffix \"\"", "dev": "tsc-watch --onSuccess \"node ./dist/src/app.js\"" }, diff --git a/src/config/config.service.ts b/src/config/config.service.ts index 652404b..fa870ab 100644 --- a/src/config/config.service.ts +++ b/src/config/config.service.ts @@ -8,7 +8,7 @@ export class ConfigService { constructor() { config(); - this.host = process.env.HOST || "localhost"; + this.host = process.env.HOST || "0.0.0.0"; this.port = Number(process.env.PORT) || 8080; this.reverse_proxy = Boolean(process.env.REVERSE_PROXY) || false;