Merge branch 'develop' of https://github.com/raidensakura/modmail int…

…o develop

.gitignore

@@ -90,7 +90,7 @@ celerybeat-schedule
 *.sage.py
 
 # Environments
-.env
+*.env
 .venv
 env/
 venv/

compose.dev.yml

@@ -0,0 +1,31 @@
+services:
+  bot:
+    build:
+      context: .
+    container_name: modmail-develop
+    restart: always
+    ports:
+      - 8555:8000
+    volumes:
+      # Add your volume mount for local plugins here
+      - ../modmail-plugins/:/home/modmail/plugins/@local/
+    env_file:
+      - .dev.env
+    environment:
+      - CONNECTION_URI=mongodb://db
+      - PUID=1000
+      - PGID=1000
+    depends_on:
+      - db
+
+  db:
+    image: mongo
+    container_name: modmail-devdb
+    restart: always
+    ports:
+      - 27017:27017
+    volumes:
+      - ./env/devdb:/data/db
+    environment:
+      - PUID=1000
+      - PGID=1000

docker-compose.yml → compose.yml

@@ -4,18 +4,15 @@ services:
     container_name: modmail
     restart: always
     environment:
-      - CONNECTION_URI=mongodb://mongo
+      - CONNECTION_URI=mongodb://db
     env_file:
       - .env
     depends_on:
       - db
 
   db:
     image: mongo
-    container_name: mongodb
+    container_name: modmail-db
     restart: always
     volumes:
-      - mongodb:/data/db
-
-volumes:
-  mongodb:
+      - ./env/db:/data/db