diff --git a/Dockerfile b/Dockerfile index 7fff452..ecd38a8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,10 @@ -FROM python:3.6 -# MAINTAINER Sergey (@Kylmakalle) - -ENV PYTHONUNBUFFERED 1 -RUN mkdir /src -WORKDIR /src -COPY requirements.txt /src/ -RUN pip install -r requirements.txt -COPY . /src - +FROM python:3.6-slim AS builder +RUN apt-get update && apt-get install -y gcc +COPY requirements.txt . +RUN pip install --user -r requirements.txt +FROM python:3.6-slim +COPY --from=builder /root/.local /root/.local +COPY . . +ENV PATH=/root/.local/bin:$PATH +ENTRYPOINT bash -c "python manage.py makemigrations data && python manage.py migrate data && python telegram.py" \ No newline at end of file diff --git a/README.md b/README.md deleted file mode 100644 index e2eb576..0000000 --- a/README.md +++ /dev/null @@ -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 diff --git a/config.py b/config.py index 69b05de..3c0dba7 100644 --- a/config.py +++ b/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) diff --git a/docker-compose.yml b/docker-compose.yml index 2277bf6..e9251f8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,32 +1,21 @@ -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" 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 \ No newline at end of file diff --git a/install.sh b/install.sh deleted file mode 100755 index bb17dc8..0000000 --- a/install.sh +++ /dev/null @@ -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 diff --git a/requirements.txt b/requirements.txt index 05f7fcf..7bf3fdf 100644 --- a/requirements.txt +++ b/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 \ No newline at end of file