Merge branch 'dev'

Release version 1.0.8
alirzaev · Aug 31, 2019 · 266b849 · 266b849
2 parents 593094c + 58a5108
commit 266b849
Show file tree

Hide file tree

Showing 25 changed files with 1,592 additions and 1,913 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -4,10 +4,10 @@ EXPOSE 80
 WORKDIR /usr/src/project
 
 COPY package.json ./
-RUN npm install
+RUN yarn install
 
 COPY . .
 
 ENV NODE_ENV production
 
-CMD ["sh", "./start.sh"]
+CMD ["sh", "./docker-cmd.sh"]
diff --git a/Procfile b/Procfile
@@ -0,0 +1,2 @@
+web: yarn start
+
diff --git a/README.md b/README.md
@@ -41,14 +41,17 @@ Telegram-бот для просмотра расписания занятий с
 
 `WEBHOOK_URL` - webhook для Telegram-бота. Если не указан, то бот будет работать в режиме `polling`.
 
+**Внимание!** Из [соображений безопасности](https://core.telegram.org/bots/api#setwebhook) в webhook URL 
+добавляется токен бота. Полный webhook URL будет выглядеть так: `<WEBHOOK_URL>/<TOKEN>`.
+
 `API_URL` - URL [backend-сервера](https://github.com/alirzaev/vyatsu-schedule-backend).
 
 `WEBAPP_URL` - URL [веб-приложения](https://github.com/alirzaev/vyatsu-schedule).
 
 ### Запуск
 
 ```
-npm start
+yarn start
 ```
 
 ### Docker

diff --git a/app/configs/bot.js b/app/configs/bot.js
diff --git a/docker-cmd.sh b/docker-cmd.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env sh
+export PORT=80 # override variable according to the EXPOSE instruction
+yarn start