From a3b57c36944fad7d4e98349344d6ecc4ad0e1249 Mon Sep 17 00:00:00 2001
From: Sergey <iceman9831@gmail.com>
Date: Tue, 23 Feb 2021 20:48:11 +0300
Subject: [PATCH] Updates

---
 .dockerignore                    | 24 ++++++++++++++++++++++++
 .github/workflow/dockerimage.yml | 25 +++++++++++++++++++++++++
 config.py                        |  6 ++++++
 docker-compose.yml               | 20 +++++++++++++-------
 readme.md                        |  1 +
 requirements.txt                 |  2 +-
 6 files changed, 70 insertions(+), 8 deletions(-)
 create mode 100644 .dockerignore
 create mode 100644 .github/workflow/dockerimage.yml
 create mode 100644 readme.md

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..74796ff
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,24 @@
+# Project
+.idea/
+.github/
+pyproject.toml
+.flake8
+.*ignore
+.isort.cfg
+Makefile
+readme.md
+
+# Cache
+*.py[cod]
+__pycache__
+
+# Texts
+*.mo
+
+# Environment
+*.env
+env_file
+
+# Docker
+docker-compose*.yml
+Dockerfile
diff --git a/.github/workflow/dockerimage.yml b/.github/workflow/dockerimage.yml
new file mode 100644
index 0000000..f47c37d
--- /dev/null
+++ b/.github/workflow/dockerimage.yml
@@ -0,0 +1,25 @@
+name: Build Docker Image
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Build and publish
+        uses: elgohr/Publish-Docker-Github-Action@master
+        with:
+          name: Kylmakalle/tgvkbot:latest
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          snapshot: true
+      - name: Docker Hub Description
+        uses: peter-evans/dockerhub-description@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          repository: peterevans/dockerhub-description
diff --git a/config.py b/config.py
index 3c0dba7..4745060 100644
--- a/config.py
+++ b/config.py
@@ -32,3 +32,9 @@ AUDIO_API_VERSION = os.environ.get('API_VERSION', '5.78')
 # Возможно достаточно заглушки в стиле 'tgvkbot-super-secret-key(nope)'
 SECRET_KEY = os.environ.get('SECRET_KEY', '!jh4wm=%s%l&jv7-lru6hg)mq2pk&rd@i*s0*c!v!zv01cf9iw')
 
+SENTRY_URL = os.environ.get('SENTRY_URL', None)
+
+if SENTRY_URL:
+    import sentry_sdk
+
+    sentry_sdk.init(SENTRY_URL)
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index e9251f8..4626780 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,21 +1,27 @@
-version: '2'
+version: '3'
+
 services:
   app:
-    build: .
+    logging:
+      options:
+        max-size: "10M"
+        max-file: "10"
+    image: kylmakalle/tgvkbot:latest
     restart: always
-    environment:
-      BOT_TOKEN:
+    env_file:
+      - env_file
+    labels:
+      com.centurylinklabs.watchtower.enable: 'true'
     depends_on:
       - db
   db:
     image: postgres:9-alpine
     volumes:
-      - db:/var/lib/postgresql/data
+      - "dbdata:/var/lib/postgresql/data"
     restart: always
     environment:
       POSTGRES_DB: 'tgvkbot'
       POSTGRES_PASSWORD: 'postgres'
 
 volumes:
-  db:
-    driver: local
\ No newline at end of file
+  dbdata:
\ No newline at end of file
diff --git a/readme.md b/readme.md
new file mode 100644
index 0000000..0c703ec
--- /dev/null
+++ b/readme.md
@@ -0,0 +1 @@
+# tgvkbot
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index 7bf3fdf..800c354 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,7 @@ multidict==4.1.0
 Pillow==5.1.0
 psycopg2-binary==2.7.4
 pytz==2018.3
-sentry-sdk==0.9.0
+sentry-sdk==0.20.3
 ujson==1.35
 urllib3==1.25.3
 wget==3.2