Merge remote-tracking branch 'origin/master' into master

docker-compose.yml.example

@@ -120,6 +120,29 @@ services:
       PMA_PASSWORD: 123456
     ports:
       - "81:80"
+  dbpg:
+    image: postgres
+    restart: always
+    environment:
+      POSTGRES_PASSWORD: postgres
+    volumes:
+      - databasepg:/var/lib/postgresql/data
+      - /data/hostfiles:/hostfiles
+  adminer:
+    image: adminer
+    restart: always
+    ports:
+      - 8080:8080
+  pgadmin:
+    image: dpage/pgadmin4
+    restart: always
+    environment:
+      PGADMIN_DEFAULT_EMAIL: info@wpstudio.ru
+      PGADMIN_DEFAULT_PASSWORD: postgres
+    ports:
+      - "83:80"
+    volumes:
+      - /data/hostfiles/pgadmin:/var/lib/pgadmin
   redis:
     image: redis
     restart: always