diff --git a/scrapyd/Dockerfile b/scrapyd/Dockerfile index 6f36f98..467906c 100644 --- a/scrapyd/Dockerfile +++ b/scrapyd/Dockerfile @@ -1,5 +1,5 @@ # -# Dockerfile for scrapyd (python2) +# Dockerfile for scrapyd (python2) [deprecated] # FROM debian:buster diff --git a/scrapyd/README.md b/scrapyd/README.md index db7d95c..9680a04 100644 --- a/scrapyd/README.md +++ b/scrapyd/README.md @@ -34,32 +34,36 @@ Please use this as base image for your own project. ## docker-compose.yml ```yaml -scrapyd: - image: vimagick/scrapyd:py3 - ports: - - "6800:6800" - volumes: - - ./data:/var/lib/scrapyd - - /usr/local/lib/python3.7/dist-packages - restart: unless-stopped +version: "3.8" -scrapy: - image: vimagick/scrapyd:py3 - command: bash - volumes: - - .:/code - working_dir: /code - restart: unless-stopped +services: -scrapyrt: - image: vimagick/scrapyd:py3 - command: scrapyrt -i 0.0.0.0 -p 9080 - ports: - - "9080:9080" - volumes: - - .:/code - working_dir: /code - restart: unless-stopped + scrapyd: + image: vimagick/scrapyd:py3 + ports: + - "6800:6800" + volumes: + - ./data:/var/lib/scrapyd + - /usr/local/lib/python3.9/dist-packages + restart: unless-stopped + + scrapy: + image: vimagick/scrapyd:py3 + command: bash + volumes: + - .:/code + working_dir: /code + restart: unless-stopped + + scrapyrt: + image: vimagick/scrapyd:py3 + command: scrapyrt -i 0.0.0.0 -p 9080 + ports: + - "9080:9080" + volumes: + - .:/code + working_dir: /code + restart: unless-stopped ``` ## Run it as background-daemon for scrapyd diff --git a/scrapyd/arm/Dockerfile b/scrapyd/arm/Dockerfile index 4cedd57..bbcdd8b 100644 --- a/scrapyd/arm/Dockerfile +++ b/scrapyd/arm/Dockerfile @@ -15,6 +15,7 @@ RUN set -xe \ && apt-get update \ && apt-get install -y autoconf \ build-essential \ + cargo \ curl \ git \ libffi-dev \ @@ -51,6 +52,7 @@ RUN set -xe \ && echo 'source /etc/bash_completion.d/scrapy_bash_completion' >> /root/.bashrc \ && apt-get purge -y --auto-remove autoconf \ build-essential \ + cargo \ curl \ libffi-dev \ libssl-dev \ diff --git a/scrapyd/arm/docker-compose.yml b/scrapyd/arm/docker-compose.yml index e27dedb..3d5fbb6 100644 --- a/scrapyd/arm/docker-compose.yml +++ b/scrapyd/arm/docker-compose.yml @@ -1,8 +1,10 @@ -scrapyd: - image: easypi/scrapyd-arm - ports: - - "6800:6800" - volumes: - - ./data:/var/lib/scrapyd - - /usr/local/lib/python3.7/dist-packages - restart: unless-stopped +version: "3.8" +services: + scrapyd: + image: easypi/scrapyd-arm + ports: + - "6800:6800" + volumes: + - ./data:/var/lib/scrapyd + - /usr/local/lib/python3.9/dist-packages + restart: unless-stopped diff --git a/scrapyd/docker-compose.yml b/scrapyd/docker-compose.yml index cbc5139..2a80ee2 100644 --- a/scrapyd/docker-compose.yml +++ b/scrapyd/docker-compose.yml @@ -1,26 +1,30 @@ -scrapyd: - image: vimagick/scrapyd - ports: - - "6800:6800" - volumes: - - ./data:/var/lib/scrapyd - - /usr/local/lib/python2.7/dist-packages - restart: unless-stopped +version: "3.8" -scrapy: - image: vimagick/scrapyd - command: bash - volumes: - - .:/code - working_dir: /code - restart: unless-stopped +services: -scrapyrt: - image: vimagick/scrapyd - command: scrapyrt -i 0.0.0.0 -p 9080 - ports: - - "9080:9080" - volumes: - - .:/code - working_dir: /code - restart: unless-stopped + scrapyd: + image: vimagick/scrapyd:py3 + ports: + - "6800:6800" + volumes: + - ./data:/var/lib/scrapyd + - /usr/local/lib/python3.9/dist-packages + restart: unless-stopped + + scrapy: + image: vimagick/scrapyd:py3 + command: bash + volumes: + - .:/code + working_dir: /code + restart: unless-stopped + + scrapyrt: + image: vimagick/scrapyd:py3 + command: scrapyrt -i 0.0.0.0 -p 9080 + ports: + - "9080:9080" + volumes: + - .:/code + working_dir: /code + restart: unless-stopped diff --git a/scrapyd/py3/docker-compose.yml b/scrapyd/py3/docker-compose.yml index ba90258..2857a92 100644 --- a/scrapyd/py3/docker-compose.yml +++ b/scrapyd/py3/docker-compose.yml @@ -1,8 +1,10 @@ -scrapyd: - image: vimagick/scrapyd:py3 - ports: - - "6800:6800" - volumes: - - ./data:/var/lib/scrapyd - - /usr/local/lib/python3.7/dist-packages - restart: unless-stopped +version: "3.8" +services: + scrapyd: + image: vimagick/scrapyd:py3 + ports: + - "6800:6800" + volumes: + - ./data:/var/lib/scrapyd + - /usr/local/lib/python3.9/dist-packages + restart: unless-stopped