Updated docker

Author: Taaku18

.dockerignore

@@ -0,0 +1,154 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+pip-wheel-metadata/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+.hypothesis/
+.pytest_cache/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# PyCharm
+.idea/
+
+# MacOS
+.DS_Store
+
+# VS Code
+.vscode/
+
+# Node
+package-lock.json
+node_modules/
+
+# Modmail
+config.json
+plugins/
+!plugins/registry.json
+temp/
+test.py
+
+# Other stuff
+.env.example
+.gitignore
+.lint.py
+.pylintrc
+.travis.yml
+app.json
+CHANGELOG.md
+CODE_OF_CONDUCT.md
+CONTRIBUTING.md
+Pipfile
+Pipfile.lock
+Procfile
+pyproject.toml
+README.md
+runtime.txt
+SPONSORS.json

Dockerfile

@@ -1,7 +1,6 @@
-FROM library/python:latest
-RUN apt update && apt install -y pipenv
-RUN mkdir -p /bot && cd /bot && git clone https://github.com/kyb3r/modmail .
-WORKDIR /bot
-RUN pipenv install
-
-CMD ["pipenv", "run", "bot"]
+FROM python:3.7.4-alpine
+RUN apk add --no-cache git
+WORKDIR /modmailbot
+COPY . /modmailbot
+RUN pip install --no-cache-dir -r requirements.min.txt
+CMD ["python", "bot.py"]

README.md

@@ -131,6 +131,41 @@ Finally, start Modmail.
 $ pipenv run bot
 ```
 
+#### Docker
+
+This repo supplies a Dockerfile for simplified deployment. 
+
+You can build your own Docker image:
+
+```console
+$ docker build . --tag=modmail
+```
+
+or run directly from a pre-built version from https://hub.docker.com/. Currently there are two community release of Modmail:
+
+- Kyber's:
+
+```console
+$ docker pull kyb3rr/modmail
+```
+
+- Taku's:
+
+```console
+$ docker pull taaku18/modmail
+# You can also choose one of the following:
+$ docker pull taaku18/modmail:dev
+$ docker pull taaku18/modmail:<version>  (<version> ex: 3.2.0, 3.2, etc.)
+```
+
+And to run your docker image:
+
+```console
+$ docker run --env-file .env user/modmail
+```
+- Replace `user/modmail` with `kyb3rr/modmail`, `taaku18/modmail`, `taaku18/modmail:3.2`, etc as above.
+- `.env` should be the path to your env file, you can also supply a path: `/path/to/.env`.
+
 ## Sponsors
 
 Special thanks to our sponsors for supporting the project.