diff --git a/.env b/.env index 5e9b92c..59c4d50 100644 --- a/.env +++ b/.env @@ -13,7 +13,7 @@ FRONT_IMAGE=registry.cn-hangzhou.aliyuncs.com/feapderd/feapder_front:2.5 # 后端镜像 BACKEND_IMAGE=registry.cn-hangzhou.aliyuncs.com/feapderd/feapder_backend:3.7 # 爬虫镜像 -SPIDER_IMAGE=registry.cn-hangzhou.aliyuncs.com/feapderd/feapder:2.4 +SPIDER_IMAGE=registry.cn-hangzhou.aliyuncs.com/feapderd/feapder:2.5_3.10.8 # 监控系统端口配置 INFLUXDB_PORT_TCP=8086 INFLUXDB_PORT_UDP=8089 diff --git a/docker-compose-without-network.yaml b/docker-compose-without-network.yaml index af92f02..51cfbcf 100644 --- a/docker-compose-without-network.yaml +++ b/docker-compose-without-network.yaml @@ -37,7 +37,7 @@ services: - SPIDER_AUTO_PULL_IMAGE=1 # 是否自动拉取镜像 否则需要在爬虫节点手动 docker pull 爬虫镜像,为了加快启动速度,可以设置0 - SPIDER_ENV={} # 爬虫环境变量 值为json类型 # 爬虫容器启动参数,支持的参数使用 docker service create --help 查看 - - SPIDER_RUN_ARGS={} + - SPIDER_RUN_ARGS=["--network feaplat", "--log-opt max-size=20m", "--log-opt max-file=1", "--mount type=volume,source=feapder_python3.10,destination=/usr/local/python-3.10.8"] # git ssh 私有密钥,不填则使用默认的 - GIT_SSH_PRIVATE_KEY=${GIT_SSH_PRIVATE_KEY} # 监控配置 diff --git a/docker-compose.yaml b/docker-compose.yaml index 77d4b61..90453c2 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -37,7 +37,7 @@ services: - SPIDER_AUTO_PULL_IMAGE=1 # 是否自动拉取镜像 否则需要在爬虫节点手动 docker pull 爬虫镜像,为了加快启动速度,可以设置0 - SPIDER_ENV={} # 爬虫环境变量 值为json类型 # 爬虫容器启动参数,支持的参数使用 docker service create --help 查看 - - SPIDER_RUN_ARGS=["--network feaplat", "--log-opt max-size=20m", "--log-opt max-file=1"] + - SPIDER_RUN_ARGS=["--network feaplat", "--log-opt max-size=20m", "--log-opt max-file=1", "--mount type=volume,source=feapder_python3.10,destination=/usr/local/python-3.10.8"] # git ssh 私有密钥,不填则使用默认的 - GIT_SSH_PRIVATE_KEY=${GIT_SSH_PRIVATE_KEY} # 监控配置 diff --git a/feapder_dockerfile b/feapder_dockerfile index 5017d73..afa166f 100644 --- a/feapder_dockerfile +++ b/feapder_dockerfile @@ -1,7 +1,42 @@ -FROM registry.cn-hangzhou.aliyuncs.com/feapderd/feapder:[最新版本号] +FROM registry.cn-hangzhou.aliyuncs.com/feapderd/feapder:2.5 -# 例如安装依赖 -RUN pip3 install feapder \ - && pip3 install scrapy +# 安装自定义的openssl版本,1.1.1 +RUN set -ex \ + && wget https://www.openssl.org/source/openssl-1.1.1g.tar.gz --no-check-certificate \ + && tar -zxvf openssl-1.1.1g.tar.gz \ + && cd openssl-1.1.1g \ + && ./config --prefix=/usr/local/openssl-1.1.1 --openssldir=/usr/local/openssl-1.1.1 no-ssl2 \ + && make \ + && make install \ + && make clean \ + && rm -rf /openssl-1.1.1* -# 自己随便搞事情,搞完修改下 `.env`文件里的 SPIDER_IMAGE 的值即可 \ No newline at end of file +# 安装自定义的python版本,3.10.8 +RUN set -ex \ + && wget https://www.python.org/ftp/python/3.10.8/Python-3.10.8.tgz \ + && tar -zxvf Python-3.10.8.tgz \ + && cd Python-3.10.8 \ + && ./configure --prefix=/usr/local/python-3.10.8 --with-openssl=/usr/local/openssl-1.1.1 --with-openssl-rpath=auto \ + && make \ + && make install \ + && make clean \ + && rm -rf /Python-3.10.8* \ + && ln -s /usr/local/python-3.10.8/bin/python3 /usr/bin/python3.10.8 \ + && ln -s /usr/local/python-3.10.8/bin/pip3 /usr/bin/pip3.10.8 + +# 删除之前的默认python版本 +RUN set -ex \ + && rm -rf /usr/bin/python3 \ + && rm -rf /usr/bin/pip3 \ + && rm -rf /usr/bin/python \ + && rm -rf /usr/bin/pip + +# 设置默认为python3.10.8 +RUN set -ex \ + && ln -s /usr/local/python-3.10.8/bin/python3 /usr/bin/python \ + && ln -s /usr/local/python-3.10.8/bin/python3 /usr/bin/python3 \ + && ln -s /usr/local/python-3.10.8/bin/pip3 /usr/bin/pip \ + && ln -s /usr/local/python-3.10.8/bin/pip3 /usr/bin/pip3 + +# 将python3.10.8加入到环境变量 +ENV PATH=$PATH:/usr/local/python-3.10.8/bin/ \ No newline at end of file