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
This commit is contained in:
Winston Astrachan 2020-03-25 12:10:27 -04:00
parent 9f466ef7a5
commit ca50bfb225
No known key found for this signature in database
GPG Key ID: 19458EC7CC6028D6
4 changed files with 28 additions and 16 deletions

View File

@ -4,7 +4,7 @@ jobs:
environment: environment:
REPO_NAME: "wastrachan" REPO_NAME: "wastrachan"
IMAGE_NAME: "flexget" IMAGE_NAME: "flexget"
IMAGE_VERSION: "3.1.43" IMAGE_VERSION: "3.1.45"
docker: docker:
- image: docker:latest - image: docker:latest
steps: steps:

View File

@ -2,32 +2,45 @@ FROM python:3.7-alpine
LABEL maintainer="Winston Astrachan" LABEL maintainer="Winston Astrachan"
LABEL description="FlexGet on Alpine Linux" LABEL description="FlexGet on Alpine Linux"
ARG FLEXGET_VERSION="3.0.12" ARG FLEXGET_VERSION="3.1.45"
RUN addgroup -g 101 -S flexget && \ ENV DEPS \
adduser -u 100 -S -G flexget flexget libjpeg \
zlib
ENV DEPS_BUILD \
gcc \
libgcc \
jpeg-dev \
musl-dev \
zlib-dev
RUN mkdir /config && \ RUN \
mkdir /download 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 /config
VOLUME /download VOLUME /download
COPY overlay/ /
ADD https://github.com/Flexget/Flexget/tarball/v${FLEXGET_VERSION} flexget.tar.gz ADD https://github.com/Flexget/Flexget/tarball/v${FLEXGET_VERSION} flexget.tar.gz
RUN \ RUN \
# Extract and install FlexGet
mkdir flexget && \ mkdir flexget && \
tar --strip-components=1 -xzvf flexget.tar.gz -C flexget && \ tar --strip-components=1 -xzvf flexget.tar.gz -C flexget && \
cd flexget && \ cd flexget && \
python3 setup.py install && \ python3 setup.py install && \
\ \
# Install python dependencies
pip install deluge-client && \ pip install deluge-client && \
pip install transmissionrpc && \ 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"] 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"] CMD ["su", "-p", "-s", "/bin/sh", "flexget", "-c", "/usr/local/bin/flexget -c /config/config.yml --loglevel verbose daemon start --autoreload-config"]

View File

@ -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 Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the a copy of this software and associated documentation files (the

View File

@ -1,7 +1,6 @@
# Docker FlexGet Image # Docker FlexGet Image
# # Copyright (c) Winston Astrachan 2020
# Winston Astrachan 2019
#
help: help:
@echo "" @echo ""
@echo "Usage: make COMMAND" @echo "Usage: make COMMAND"