From 8eac19f9f59f3d6ceb811aa8ddcf2271a323e919 Mon Sep 17 00:00:00 2001 From: kev Date: Tue, 26 May 2020 17:31:46 +0800 Subject: [PATCH] update scrapyd --- scrapyd/Dockerfile | 14 +++++++++----- scrapyd/README.md | 4 +++- scrapyd/py3/Dockerfile | 14 +++++++++----- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/scrapyd/Dockerfile b/scrapyd/Dockerfile index cc02e4d..0833bc0 100644 --- a/scrapyd/Dockerfile +++ b/scrapyd/Dockerfile @@ -2,8 +2,12 @@ # Dockerfile for scrapyd # -FROM debian:stretch -MAINTAINER kev +FROM debian:buster +MAINTAINER EasyPi Software Foundation + +ENV SCRAPY_VERSION=1.8.0 +ENV SCRAPYD_VERSION=1.2.1 +ENV PILLOW_VERSION=6.2.2 RUN set -xe \ && apt-get update \ @@ -33,12 +37,12 @@ RUN set -xe \ zlib1g \ zlib1g-dev \ && curl -sSL https://bootstrap.pypa.io/get-pip.py | python \ - && pip install git+https://github.com/scrapy/scrapy.git \ - git+https://github.com/scrapy/scrapyd.git \ + && pip install git+https://github.com/scrapy/scrapy.git@$SCRAPY_VERSION \ + git+https://github.com/scrapy/scrapyd.git@$SCRAPYD_VERSION \ git+https://github.com/scrapy/scrapyd-client.git \ git+https://github.com/scrapinghub/scrapy-splash.git \ git+https://github.com/scrapinghub/scrapyrt.git \ - git+https://github.com/python-pillow/Pillow.git \ + git+https://github.com/python-pillow/Pillow.git@$PILLOW_VERSION \ && curl -sSL https://github.com/scrapy/scrapy/raw/master/extras/scrapy_bash_completion -o /etc/bash_completion.d/scrapy_bash_completion \ && echo 'source /etc/bash_completion.d/scrapy_bash_completion' >> /root/.bashrc \ && apt-get purge -y --auto-remove autoconf \ diff --git a/scrapyd/README.md b/scrapyd/README.md index df453ae..77ba537 100644 --- a/scrapyd/README.md +++ b/scrapyd/README.md @@ -18,7 +18,7 @@ utility which allows you to deploy your project to a Scrapyd server. [pillow][6] is the Python Imaging Library to support the ImagesPipeline. -This image is based on `debian:stretch`, 6 latest python packages are installed: +This image is based on `debian:buster`, 6 latest python packages are installed: - `scrapy`: git+https://github.com/scrapy/scrapy.git - `scrapyd`: git+https://github.com/scrapy/scrapyd.git @@ -29,6 +29,8 @@ This image is based on `debian:stretch`, 6 latest python packages are installed: Please use this as base image for your own project. +:warning: Scrapy has dropped support for Python 2.7, which reached end-of-life on 2020-01-01. + ## docker-compose.yml ```yaml diff --git a/scrapyd/py3/Dockerfile b/scrapyd/py3/Dockerfile index 4d4fc1a..9c22831 100644 --- a/scrapyd/py3/Dockerfile +++ b/scrapyd/py3/Dockerfile @@ -2,8 +2,12 @@ # Dockerfile for scrapyd:py3 # -FROM debian:stretch -MAINTAINER kev +FROM debian:buster +MAINTAINER EasyPi Software Foundation + +ENV SCRAPY_VERSION=2.1.0 +ENV SCRAPYD_VERSION=1.2.1 +ENV PILLOW_VERSION=7.1.2 RUN set -xe \ && apt-get update \ @@ -33,12 +37,12 @@ RUN set -xe \ zlib1g \ zlib1g-dev \ && curl -sSL https://bootstrap.pypa.io/get-pip.py | python3 \ - && pip install git+https://github.com/scrapy/scrapy.git \ - git+https://github.com/scrapy/scrapyd.git \ + && pip install git+https://github.com/scrapy/scrapy.git@$SCRAPY_VERSION \ + git+https://github.com/scrapy/scrapyd.git@$SCRAPYD_VERSION \ git+https://github.com/scrapy/scrapyd-client.git \ git+https://github.com/scrapinghub/scrapy-splash.git \ git+https://github.com/scrapinghub/scrapyrt.git \ - git+https://github.com/python-pillow/Pillow.git \ + git+https://github.com/python-pillow/Pillow.git@$PILLOW_VERSION \ && curl -sSL https://github.com/scrapy/scrapy/raw/master/extras/scrapy_bash_completion -o /etc/bash_completion.d/scrapy_bash_completion \ && echo 'source /etc/bash_completion.d/scrapy_bash_completion' >> /root/.bashrc \ && apt-get purge -y --auto-remove autoconf \