From e37462d176677edc3540e0b082074e0f0353d841 Mon Sep 17 00:00:00 2001 From: Chika Date: Sat, 14 Nov 2020 16:16:24 +0300 Subject: [PATCH] edit docker files | packages --- Dockerfile | 8 ++++---- docker-compose.yml | 20 ++++++++++++++++++++ package.json | 3 +-- 3 files changed, 25 insertions(+), 6 deletions(-) create mode 100644 docker-compose.yml diff --git a/Dockerfile b/Dockerfile index 0a335ca..36f60d1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,12 @@ -FROM node:12-alpine +FROM node:14-alpine WORKDIR /home/app -COPY package*.json ./ +COPY . . -RUN npm install +RUN yarn -COPY build ./ +RUN yarn build EXPOSE 3001 diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..dfa1df7 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,20 @@ +version: '3.3' +services: + evocalculator: + container_name: evocalc + build: . + # ports: + # - "3001:3001" + networks: + - web + labels: + - 'traefik.enable=true' + - 'traefik.backend=evocalc' + - 'traefik.docker.network=web' + - 'traefik.http.routers.evocalc.rule=Host(`calculator.evoleasing.ru`)' + - 'traefik.http.routers.evocalc.entrypoints=web-secure' + - 'traefik.http.routers.evocalc.tls.certresolver=le' + +networks: + web: + external: true diff --git a/package.json b/package.json index 661e0da..ae4c9f0 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,6 @@ "mobx": "^6.0.0", "mobx-react-lite": "^3.0.0", "morgan": "^1.10.0", - "mssql": "^6.2.1", "nodemon": "^2.0.4", "normalize.css": "^8.0.1", "pluralize": "^8.0.0", @@ -45,7 +44,6 @@ "styled-components": "^5.1.1", "styled-system": "^5.1.5", "ts-loader": "^8.0.2", - "typeorm": "^0.2.25", "typescript": "3.9.7", "use-debounce": "^3.4.3", "validator": "^13.1.1" @@ -68,6 +66,7 @@ "@types/styled-components": "^5.1.2", "@types/styled-system": "^5.1.10", "agentkeepalive": "^4.1.3", + "cross-env": "^7.0.2", "dotenv": "^8.2.0", "faker": "^5.1.0", "http-proxy-middleware": "^1.0.6",