From ca50bfb22507620dd00dc0ea152c96086c8dae1d Mon Sep 17 00:00:00 2001
From: Winston Astrachan <winston.astrachan@gmail.com>
Date: Wed, 25 Mar 2020 12:10:27 -0400
Subject: [PATCH] Added dependencies for Pillow, bumped version to 3.1.45 PR
 #2621 (https://github.com/Flexget/Flexget/pull/2621) added a dependency on
 Pillow. Pillow has several libraries it requires that needed to be added to
 the Dockerfile

---
 .circleci/config.yml |  2 +-
 Dockerfile           | 35 ++++++++++++++++++++++++-----------
 LICENSE              |  2 +-
 Makefile             |  5 ++---
 4 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6a6718b..41bdcdb 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,7 +4,7 @@ jobs:
     environment:
       REPO_NAME: "wastrachan"
       IMAGE_NAME: "flexget"
-      IMAGE_VERSION: "3.1.43"
+      IMAGE_VERSION: "3.1.45"
     docker:
       - image: docker:latest
     steps:
diff --git a/Dockerfile b/Dockerfile
index aee0654..76838cc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,32 +2,45 @@ FROM python:3.7-alpine
 LABEL maintainer="Winston Astrachan"
 LABEL description="FlexGet on Alpine Linux"
 
-ARG FLEXGET_VERSION="3.0.12"
+ARG FLEXGET_VERSION="3.1.45"
 
-RUN addgroup -g 101 -S flexget && \
-    adduser -u 100 -S -G flexget flexget
+ENV DEPS \
+    libjpeg \
+    zlib
+ENV DEPS_BUILD \
+    gcc \
+    libgcc \
+    jpeg-dev \
+    musl-dev \
+    zlib-dev
 
-RUN mkdir /config && \
-    mkdir /download
+RUN \
+    addgroup -g 101 -S flexget && \
+    adduser -u 100 -S -G flexget flexget && \
+    \
+    mkdir /config && \
+    mkdir /download && \
+    \
+    apk add --no-cache $DEPS $DEPS_BUILD && \
+    pip install -U setuptools pip packaging
 
 VOLUME /config
 VOLUME /download
-
-COPY overlay/ /
 ADD https://github.com/Flexget/Flexget/tarball/v${FLEXGET_VERSION} flexget.tar.gz
+
 RUN \
-    # Extract and install FlexGet
     mkdir flexget && \
     tar --strip-components=1 -xzvf flexget.tar.gz -C flexget && \
     cd flexget && \
     python3 setup.py install && \
     \
-    # Install python dependencies
     pip install deluge-client && \
     pip install transmissionrpc && \
     \
-    # Clean up build files, deps
-    rm -rf /flexget /flexget.tar.gz
+    rm -rf /flexget /flexget.tar.gz && \
+    apk del $DEPS_BUILD
+
+COPY overlay/ /
 
 ENTRYPOINT ["/docker-entrypoint.sh"]
 CMD ["su", "-p", "-s", "/bin/sh", "flexget", "-c", "/usr/local/bin/flexget -c /config/config.yml --loglevel verbose daemon start --autoreload-config"]
diff --git a/LICENSE b/LICENSE
index 9a721c6..b6467f3 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2019 Winston Astrachan
+Copyright (c) 2020 Winston Astrachan
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff --git a/Makefile b/Makefile
index 678b6ea..b55eda1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,6 @@
 # Docker FlexGet Image
-#
-# Winston Astrachan 2019
-#
+# Copyright (c) Winston Astrachan 2020
+
 help:
 	@echo ""
 	@echo "Usage: make COMMAND"