Alpine

Dockerfile

@@ -1,11 +1,8 @@
-FROM python:3.6
-# MAINTAINER Sergey (@Kylmakalle) <iceman9831@gmail.com>
-
+FROM python:3.6-alpine
 ENV PYTHONUNBUFFERED 1
 RUN mkdir /src
 WORKDIR /src
 COPY requirements.txt /src/
+RUN apk update && apk add postgresql-dev gcc musl-dev jpeg-dev zlib-dev
 RUN pip install -r requirements.txt
-COPY . /src
-
-
+COPY . /src

README.md

@@ -1,19 +0,0 @@
-# tgvkbot
-Send and receive VK messages in telegram.
-
-# Установка (Ubuntu 16.04)
-```
-git clone https://github.com/Kylmakalle/tgvkbot
-cd tgvkbot
-chmod +x install.sh
-./install.sh 
-
-...
-
-Telegram Token: 123456789:AAABBBCCCDDDEEEFFFGGGHHHIIIJJJKKKLL
-VK APP ID: 1234567 # можно пропустить, будет использован идентификатор Kate Mobile
-```
-
-# Сервисы музыки
-API - https://github.com/Kylmakalle/thatmusic-api
-Token Refresher - https://github.com/Kylmakalle/vk-audio-token/tree/refresh-api

config.py

@@ -32,9 +32,3 @@ 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)

docker-compose.yml

@@ -1,32 +1,22 @@
-version: '3'
+version: '2'
 services:
-  db:
-    image: "postgres:9.6.5"
-    volumes:
-      - "dbdata:/var/lib/postgresql/data"
-    env_file:
-      - env_file
-    restart: always
-    networks:
-      - db_nw
-  tgbot:
-    logging:
-      options:
-        max-size: "10M"
-        max-file: "10"
+  app:
     build: .
-    volumes:
-      - .:/src
-    env_file:
-      - env_file
-    command: bash -c "python manage.py makemigrations data && python manage.py migrate data && python telegram.py"
+    command: sh -c "python manage.py makemigrations data && python manage.py migrate data && python telegram.py"
     restart: always
-    networks:
-      - db_nw
+    environment:
+      BOT_TOKEN:
     depends_on:
       - db
-networks:
-  db_nw:
-    driver: bridge
+  db:
+    image: postgres:9-alpine
+    volumes:
+      - db:/var/lib/postgresql/data
+    restart: always
+    environment:
+      POSTGRES_DB: 'tgvkbot'
+      POSTGRES_PASSWORD: 'postgres'
+
 volumes:
-  dbdata:
+  db:
+    driver: local

install.sh

@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-sudo apt-get update && sudo apt-get upgrade && \
-sudo apt-get install docker.io -y && \
-sudo usermod -aG docker $(whoami) && \
-sudo curl -L https://github.com/docker/compose/releases/download/1.20.1/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose && \
-sudo chmod +x /usr/local/bin/docker-compose && \
-python3 set_env.py && \
-sudo docker-compose build && \
-sudo docker-compose up -d

requirements.txt

@@ -3,12 +3,7 @@ aiohttp==2.3.10
 aiovk==1.3.0
 async-timeout==2.0.1
 attrs==17.4.0
-Babel==2.5.3
-certifi==2018.1.18
-chardet==3.0.4
 Django==2.0.4
-idna==2.6
-idna-ssl==1.0.1
 multidict==4.1.0
 Pillow==5.1.0
 psycopg2-binary==2.7.4
@@ -17,4 +12,4 @@ sentry-sdk==0.9.0
 ujson==1.35
 urllib3==1.25.3
 wget==3.2
-yarl==1.1.1
+yarl==1.1.1