Merge pull request #72 from dark0ghost/beta

Beta

Author: dark0ghost

.gitignore

@@ -1,3 +1,6 @@
+*.db
+/grafana
+/influxdb
 *.db3
 postgres/
 *.log

docker-compose.yml

@@ -1,25 +1,30 @@
-version: '3.3'
+version: '3.8'
 
 services:
   bot:
     build:
       context: .
       dockerfile:
         Dockerfile
+    depends_on:
+      - postgres
+      - redis
+      - influxdb
     env_file:
-       bot.evn
+      evn/bot.evn
     restart:
        on-failure
     volumes:
         - ".:/usr/src/app"
 
   postgres:
+    container_name:  postgres
     image:
-       postgres
+       postgres:13
     volumes:
       - "./postgres/data:/var/lib/postgresql/data/pgdata"
     env_file:
-      - pg.env
+      - evn/pg.env
     restart:
         always
     ports:
@@ -42,33 +47,32 @@ services:
     restart: always
 
   influxdb:
-    image: influxdb:1.8-alpine
+    image: influxdb:1.8
     container_name: "influxdb"
     restart: always
     volumes:
-      - "influxdb:/var/lib/influxdb"
-    environment: # см. файл .env (в репозитории - .env_dist)
-      - INFLUXDB_DB=${DB}
-      - INFLUXDB_ADMIN_USER=${DB_ADMIN_USER}  # Этот юзер нужен для создания базы
-      - INFLUXDB_ADMIN_USER_PASSWORD=${DB_ADMIN_PASS}
-      - INFLUXDB_USER=${DB_USER}  # Этот юзер для записи в БД и чтения со стороны Grafana
-      - INFLUXDB_USER_PASSWORD=${DB_PASS}
-      - INFLUXDB_HTTP_AUTH_ENABLED=true
+      - "./influxdb:/var/lib/influxdb"
+    env_file:
+      - evn/influxdb.evn
+    ports:
+      -  8086:8086
 
   grafana:
       image: grafana/grafana:7.3.4
       container_name: "grafana"
+      restart: always
       volumes:
-        - "grafana-data:/var/lib/grafana"
+        - "/grafana:/var/lib/grafana"
       environment:
         - GF_DATE_FORMATS_DEFAULT_TIMEZONE=browser
       ports:
-        - "3000:3000"
+        - 3000:3000
+      user: "472"
 
   adminer:
     image:
        adminer
     restart:
       always
     ports:
-      - 8080:8080
+      - 8080:8080

bot.evn renamed to evn/bot.evn

@@ -0,0 +1,6 @@
+INFLUXDB_DB=Metric
+INFLUXDB_ADMIN_USER=metric_admin
+INFLUXDB_ADMIN_USER_PASSWORD=FZ8P(uJ5K8n_,4"5 # random password
+INFLUXDB_USER=metric
+INFLUXDB_USER_PASSWORD=`S*B-9kJ62U^7d?K # random password
+INFLUXDB_HTTP_AUTH_ENABLED=true