diff options
| author |  Joseph <[email protected]> | 2018-05-19 19:21:37 +0100 |
|---|---|---|
| committer | Joseph <[email protected]> | 2018-05-19 19:21:37 +0100 |
| commit | 8f299e4750742778e7a342eafaeca868e38b2da5 (patch) | |
| tree | 382bec226553bfc7d7ff18603380215a3d012b92 | |
| parent | Re-instate pillow in Pipfile (diff) | |
| parent | re-add snake cog and install zlib in base container (diff) | |
Merge branch 'master' of github.com:discord-python/bot
| -rw-r--r-- | bot/__main__.py | 2 | ||||
| -rw-r--r-- | docker/Dockerfile.base | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/bot/__main__.py b/bot/__main__.py index 88ab82245..6c115f40c 100644 --- a/bot/__main__.py +++ b/bot/__main__.py @@ -59,7 +59,7 @@ bot.load_extension("bot.cogs.deployment") bot.load_extension("bot.cogs.eval") bot.load_extension("bot.cogs.fun") bot.load_extension("bot.cogs.hiphopify") -# bot.load_extension("bot.cogs.snakes"), temporarily disabled while we fix a PIL/zlib issue +bot.load_extension("bot.cogs.snakes") bot.load_extension("bot.cogs.tags") bot.load_extension("bot.cogs.verification") diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base index 41b4fa46e..7183bd2fa 100644 --- a/docker/Dockerfile.base +++ b/docker/Dockerfile.base @@ -3,6 +3,7 @@ FROM python:3.6-alpine3.7 RUN apk add --update tini RUN apk add --update build-base RUN apk add --update libffi-dev +RUN apk add --update zlib RUN pip install pipenv RUN mkdir /bot |