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


From a20d492e5b9743a2e36aecb48106d34a64945df2 Mon Sep 17 00:00:00 2001
From: MarkKoz <KozlovMark@gmail.com>
Date: Sun, 24 Mar 2019 18:10:38 -0700
Subject: Docker: Replace tini with Docker's built-in init feature

Docker implemented this feature using tini too. Requires Docker Engine
18.06 or higher.
---
 docker/Dockerfile         | 6 +++---
 docker/docker-compose.yml | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'docker')

diff --git a/docker/Dockerfile b/docker/Dockerfile
index edeb5b50..c424af5a 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,5 +1,5 @@
 FROM python:3.7-alpine3.7
-RUN apk add --update libffi-dev tini build-base git jpeg-dev zlib zlib-dev
+RUN apk add --update libffi-dev build-base git jpeg-dev zlib zlib-dev
 
 RUN mkdir /bot
 COPY . /bot
@@ -11,5 +11,5 @@ ENV LIBRARY_PATH=/lib:/usr/lib \
 RUN pip install pipenv
 RUN pipenv install --deploy --system
 
-ENTRYPOINT ["/sbin/tini", "--"]
-CMD ["python", "-m", "bot"]
+ENTRYPOINT ["python"]
+CMD ["-m", "bot"]
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index de1f4cf2..6e274451 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -1,8 +1,9 @@
-version: "3"
+version: "3.7"
 services:
   dumbo:
     image: pythondiscord/seasonalbot:latest
     container_name: seasonalbot
+    init: true
 
     restart: always
 
-- 
cgit v1.2.3


From 6d9229464a965c39c37bdbfe5156a866ccad2208 Mon Sep 17 00:00:00 2001
From: MarkKoz <KozlovMark@gmail.com>
Date: Sun, 24 Mar 2019 18:16:59 -0700
Subject: Docker: Disable pip cache & set env vars

---
 docker/Dockerfile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'docker')

diff --git a/docker/Dockerfile b/docker/Dockerfile
index c424af5a..fa34c02b 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -5,8 +5,12 @@ RUN mkdir /bot
 COPY . /bot
 WORKDIR /bot
 
-ENV LIBRARY_PATH=/lib:/usr/lib \
-    PIPENV_VENV_IN_PROJECT=1
+ENV LIBRARY_PATH="/lib:/usr/lib" \
+    PIP_NO_CACHE_DIR="false" \
+    PIPENV_DONT_USE_PYENV="1" \
+    PIPENV_HIDE_EMOJIS="1" \
+    PIPENV_IGNORE_VIRTUALENVS="1" \
+    PIPENV_NOSPIN="1"
 
 RUN pip install pipenv
 RUN pipenv install --deploy --system
-- 
cgit v1.2.3


From cdfd64648a03156bb933421ffc05010734bc3ea0 Mon Sep 17 00:00:00 2001
From: MarkKoz <KozlovMark@gmail.com>
Date: Sun, 24 Mar 2019 18:22:16 -0700
Subject: Docker: Disable apk cache

---
 docker/Dockerfile | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'docker')

diff --git a/docker/Dockerfile b/docker/Dockerfile
index fa34c02b..605be88b 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,9 +1,4 @@
 FROM python:3.7-alpine3.7
-RUN apk add --update libffi-dev build-base git jpeg-dev zlib zlib-dev
-
-RUN mkdir /bot
-COPY . /bot
-WORKDIR /bot
 
 ENV LIBRARY_PATH="/lib:/usr/lib" \
     PIP_NO_CACHE_DIR="false" \
@@ -12,6 +7,19 @@ ENV LIBRARY_PATH="/lib:/usr/lib" \
     PIPENV_IGNORE_VIRTUALENVS="1" \
     PIPENV_NOSPIN="1"
 
+RUN apk add --no-cache --update \
+        build-base \
+        git \
+        libffi-dev \
+        # Pillow dependencies
+        jpeg-dev \
+        zlib \
+        zlib-dev
+
+RUN mkdir /bot
+COPY . /bot
+WORKDIR /bot
+
 RUN pip install pipenv
 RUN pipenv install --deploy --system
 
-- 
cgit v1.2.3


From 29f9cf0ef9f07461fa0598d06dae972a63be3aff Mon Sep 17 00:00:00 2001
From: MarkKoz <KozlovMark@gmail.com>
Date: Sun, 24 Mar 2019 18:23:07 -0700
Subject: Docker: Add freetype-dev & replace libjpeg with libjpeg-turbo

freetype-dev is required for loading fonts with pillow.

* Remove zlib as zlib-dev installs zlib anyway
---
 docker/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'docker')

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 605be88b..678099bd 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -12,8 +12,8 @@ RUN apk add --no-cache --update \
         git \
         libffi-dev \
         # Pillow dependencies
-        jpeg-dev \
-        zlib \
+        freetype-dev \
+        libjpeg-turbo-dev \
         zlib-dev
 
 RUN mkdir /bot
-- 
cgit v1.2.3


From 63d1eac4b7e8ad030932543ab9bb7340ef044faf Mon Sep 17 00:00:00 2001
From: MarkKoz <KozlovMark@gmail.com>
Date: Sun, 24 Mar 2019 18:45:46 -0700
Subject: Docker: Update base image to Python 3.7.2

pip has to be at least version 19.0.2, which fixes a
have_directory_for_build AssertionError when installing with
PIP_NO_CACHE_DIR set. The updated image comes with pip 19.0.3.

See pypa/pip#6219 for more info.
---
 docker/Dockerfile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'docker')

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 678099bd..a12d6497 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.7-alpine3.7
+FROM python:3.7.2-alpine3.9
 
 ENV LIBRARY_PATH="/lib:/usr/lib" \
     PIP_NO_CACHE_DIR="false" \
@@ -15,12 +15,11 @@ RUN apk add --no-cache --update \
         freetype-dev \
         libjpeg-turbo-dev \
         zlib-dev
+RUN pip install pipenv
 
-RUN mkdir /bot
 COPY . /bot
 WORKDIR /bot
 
-RUN pip install pipenv
 RUN pipenv install --deploy --system
 
 ENTRYPOINT ["python"]
-- 
cgit v1.2.3


From 62e25fb1861a76c6ae3ac114acb14d72525539e0 Mon Sep 17 00:00:00 2001
From: MarkKoz <KozlovMark@gmail.com>
Date: Sun, 24 Mar 2019 19:04:15 -0700
Subject: Docker: Move ENTRYPOINT & CMD to the top

This allows the cache to be leveraged for these commands, and thus may
also avoid pushing/pulling extra layers.

* Remove LIBRARY_PATH environment variable
---
 docker/Dockerfile | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'docker')

diff --git a/docker/Dockerfile b/docker/Dockerfile
index a12d6497..1445441c 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,7 +1,9 @@
 FROM python:3.7.2-alpine3.9
 
-ENV LIBRARY_PATH="/lib:/usr/lib" \
-    PIP_NO_CACHE_DIR="false" \
+ENTRYPOINT ["python"]
+CMD ["-m", "bot"]
+
+ENV PIP_NO_CACHE_DIR="false" \
     PIPENV_DONT_USE_PYENV="1" \
     PIPENV_HIDE_EMOJIS="1" \
     PIPENV_IGNORE_VIRTUALENVS="1" \
@@ -21,6 +23,3 @@ COPY . /bot
 WORKDIR /bot
 
 RUN pipenv install --deploy --system
-
-ENTRYPOINT ["python"]
-CMD ["-m", "bot"]
-- 
cgit v1.2.3