From 9957b24acd22ee4a037cb3d4253a3ac123373280 Mon Sep 17 00:00:00 2001
From: Michael <18199611+Code-You-Fools@users.noreply.github.com>
Date: Wed, 7 Oct 2020 16:32:27 -0500
Subject: [PATCH 1/3] Fix Dockerfile

Python after 3.7 removes `tp_print` from `PyTypeObject`, preventing `pyclipper` 1.1.0.post1 from compiling.
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 03d9f501b..13ab60bb7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:buster
+FROM python:3.7
 RUN apt update && apt install -y \
     git \
     zopfli \

From 9ac8776f448c99b4a8ca87c0d79d31e79a6f0ef9 Mon Sep 17 00:00:00 2001
From: Michael <mtemple12@gmail.com>
Date: Wed, 7 Oct 2020 23:01:22 -0500
Subject: [PATCH 2/3] Optimize Dockerfile

---
 .dockerignore |  5 ++++-
 Dockerfile    | 22 ++++++++++++----------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index a1571bb83..b7007de54 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,5 +1,8 @@
+Dockerfile
+.dockerignore
 add_emoji_gsub.pyc
 build
 waveflag
 
-.git/
\ No newline at end of file
+.git/
+fonts/
diff --git a/Dockerfile b/Dockerfile
index 13ab60bb7..ba054604e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,20 +1,22 @@
-FROM python:3.7
-RUN apt update && apt install -y \
+FROM python:3.7-slim
+
+RUN apt-get update \
+    && apt-get install --no-install-recommends -y \
     git \
     zopfli \
-    libcairo2-dev
+    libcairo2-dev \
+    make \
+    imagemagick \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
 
-# Install nototools
 RUN git clone https://github.com/googlefonts/nototools.git /nototools
 WORKDIR /nototools
-RUN pip install -r requirements.txt
-RUN pip install -e .
-
-# Create output dir
-RUN mkdir /output
+RUN pip install --no-cache -r requirements.txt && pip install --no-cache -e .
 
 ADD . /blobmoji
 WORKDIR /blobmoji
 
-# Build blobmoji font
+RUN mkdir /output
+
 CMD make -j $(nproc) && cp NotoColorEmoji.ttf /output/

From 16413ce465aa666bf93cdb72cd4ab3429c83bb4b Mon Sep 17 00:00:00 2001
From: Michael <mtemple12@gmail.com>
Date: Thu, 8 Oct 2020 11:11:10 -0500
Subject: [PATCH 3/3] Update to python:slim

---
 Dockerfile | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ba054604e..ddc72b874 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,18 +1,18 @@
-FROM python:3.7-slim
+FROM python:slim
 
 RUN apt-get update \
     && apt-get install --no-install-recommends -y \
-    git \
-    zopfli \
-    libcairo2-dev \
     make \
+    gcc \
+    zopfli \
+    libc-dev \
+    libpng-dev \
+    libcairo2-dev \
     imagemagick \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
-RUN git clone https://github.com/googlefonts/nototools.git /nototools
-WORKDIR /nototools
-RUN pip install --no-cache -r requirements.txt && pip install --no-cache -e .
+RUN pip install --no-cache notofonttools
 
 ADD . /blobmoji
 WORKDIR /blobmoji