From d748b47e34e72d8dc33775ad28db278dc5287a38 Mon Sep 17 00:00:00 2001
From: Scragly <29337040+scragly@users.noreply.github.com>
Date: Sat, 9 Mar 2019 22:19:58 +1000
Subject: Base container py3.7 update, add libffi-dev for aiodns v2.0

---
 docker/Dockerfile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'docker')

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 1613261c..e4adf2a6 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,5 +1,5 @@
-FROM python:3.6-alpine3.7
-RUN apk add --update tini build-base git jpeg-dev zlib zlib-dev
+FROM python:3.7-alpine3.7
+RUN apk add --update libffi-dev tini build-base git jpeg-dev zlib zlib-dev
 
 RUN mkdir /bot
 COPY . /bot
@@ -12,4 +12,3 @@ RUN pipenv install --deploy --system
 
 ENTRYPOINT ["/sbin/tini", "--"]
 CMD ["python", "-m", "bot"]
-
-- 
cgit v1.2.3


From 610bfe0820bd797f522f717509c778e80b3d9848 Mon Sep 17 00:00:00 2001
From: Scragly <29337040+scragly@users.noreply.github.com>
Date: Sat, 9 Mar 2019 23:01:07 +1000
Subject: Venv in project, add `.cache` in lint ignore.

---
 docker/Dockerfile | 3 ++-
 tox.ini           | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'docker')

diff --git a/docker/Dockerfile b/docker/Dockerfile
index e4adf2a6..edeb5b50 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -5,7 +5,8 @@ RUN mkdir /bot
 COPY . /bot
 WORKDIR /bot
 
-ENV LIBRARY_PATH=/lib:/usr/lib
+ENV LIBRARY_PATH=/lib:/usr/lib \
+    PIPENV_VENV_IN_PROJECT=1
 
 RUN pip install pipenv
 RUN pipenv install --deploy --system
diff --git a/tox.ini b/tox.ini
index bff048cb..cbf21e33 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,5 +2,5 @@
 max-line-length=120
 application_import_names=bot
 ignore=P102,B311,W503,E226,S311
-exclude=__pycache__, venv, .venv, tests
+exclude=__pycache__,venv,.venv,tests,.cache
 import-order-style=pycharm
-- 
cgit v1.2.3