diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 19bba91e..e0d87314 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -5,9 +5,12 @@ repos: rev: v4.0.1 hooks: - id: check-merge-conflict + - id: check-json - id: check-toml - id: check-yaml exclude: 'mkdocs.yml' # Exclude all mkdocs.yml as they use tags i.e. `!!!` + - id: pretty-format-json + args: ['--indent=4','--autofix'] - id: end-of-file-fixer - id: no-commit-to-branch args: [--branch=main, --branch=master] diff --git a/Procfile b/Procfile deleted file mode 100644 index 135be655..00000000 --- a/Procfile +++ /dev/null @@ -1 +0,0 @@ -web: python -m modmail diff --git a/app.json b/app.json new file mode 100644 index 00000000..11af2756 --- /dev/null +++ b/app.json @@ -0,0 +1,12 @@ +{ + "env": { + "TOKEN": { + "description": "Discord bot token. This is from https://discord.com/developers/applications", + "required": true + } + }, + "name": "Modmail Bot", + "repository": "https://github.com/discord-modmail/modmail", + "stack": "container", + "website": "https://discord-modmail.readthedocs.io/" +} diff --git a/docs/changelog.md b/docs/changelog.md index ab0ba54c..40f75bb8 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Added +- docker-compose.yml (#13) + - Running the bot after configuring the env vars is now as simple as `docker-compose up` +- Automatic docker image creation: `ghcr.io/discord-modmail/modmail` (#19) +- Dockerfile support for all supported hosting providers. (#58) + ### Changed - Refactored bot creation and bot running (#56) @@ -15,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 handling loop errors, as run() does this automatically. + ## [0.1.0] - 2021-08-13 ### Added diff --git a/heroku.yml b/heroku.yml new file mode 100644 index 00000000..7b13190d --- /dev/null +++ b/heroku.yml @@ -0,0 +1,3 @@ +build: + docker: + worker: Dockerfile diff --git a/runtime.txt b/runtime.txt deleted file mode 100644 index 9bff0e00..00000000 --- a/runtime.txt +++ /dev/null @@ -1 +0,0 @@ -python-3.9.6