Compare commits

...

5 Commits

9 changed files with 32 additions and 30 deletions

2
.dockerignore Normal file
View File

@@ -0,0 +1,2 @@
.git
*

View File

@@ -16,7 +16,8 @@ ARG app_env=prod
# ARG add_user=www-data # ARG add_user=www-data
ENV APP_ENV=${app_env:-"prod"} \ ENV APP_ENV=${app_env:-"prod"} \
TIMEZONE=${timezone:-"Asia/Shanghai"} TIMEZONE=${timezone:-"Asia/Shanghai"} \
cron="0 10 * * 0"
## ##
# ---------- building ---------- # ---------- building ----------
@@ -91,6 +92,7 @@ RUN set -ex \
# - config timezone # - config timezone
&& ln -sf /usr/share/zoneinfo/${TIMEZONE} /etc/localtime \ && ln -sf /usr/share/zoneinfo/${TIMEZONE} /etc/localtime \
&& echo "${TIMEZONE}" > /etc/timezone \ && echo "${TIMEZONE}" > /etc/timezone \
&& echo '2 */5 * * * cd /var/www && git fetch --all && git reset --hard origin/master' >> /etc/crontabs/root \
# ---------- some config work ---------- # ---------- some config work ----------
# - ensure 'www-data' user exists(82 is the standard uid/gid for "www-data" in Alpine) # - ensure 'www-data' user exists(82 is the standard uid/gid for "www-data" in Alpine)
# && addgroup -g 82 -S ${add_user} \ # && addgroup -g 82 -S ${add_user} \
@@ -103,3 +105,5 @@ RUN set -ex \
EXPOSE 9000 EXPOSE 9000
# VOLUME ["/var/www", "/data"] # VOLUME ["/var/www", "/data"]
WORKDIR /var/www WORKDIR /var/www
CMD ["sh", "-c", "/usr/bin/php /var/www/iyuu.php ; /usr/sbin/crond ; (crontab -l ;echo \"$cron /usr/bin/php /var/www/iyuu.php &> /dev/null\") | crontab - ; tail -f /dev/null"]

View File

@@ -13,7 +13,7 @@ use IYUU\Library\Table;
class AutoReseed class AutoReseed
{ {
// 版本号 // 版本号
const VER = '1.10.1'; const VER = '1.10.2';
// RPC连接 // RPC连接
private static $links = []; private static $links = [];
// 客户端配置 // 客户端配置

View File

@@ -32,9 +32,9 @@ return array(
array( array(
'type' => 'transmission', // 支持transmission、qBittorrent 'type' => 'transmission', // 支持transmission、qBittorrent
'host' => 'http://127.0.0.1:9091/transmission/rpc', // 警告注意transmission/rpc这段别动你只需要修改 127.0.0.1:9091 'host' => 'http://127.0.0.1:9091/transmission/rpc', // 警告注意transmission/rpc这段别动你只需要修改 127.0.0.1:9091
'username' => 'null', 'username' => '', // 没有用户名请填写null
'password' => 'null', 'password' => '', // 没有密码 请填写null
'BT_backup' => '/var/lib/transmission/torrents', // 移动做种:如果脚本与当前客户端不在一台机器,必须配置 'BT_backup' => '/torrents', // 移动做种:如果脚本与当前客户端不在一台机器,必须配置
'move' => 0, // 0不移动1移动并辅种2移动且只在当前客户端辅种 'move' => 0, // 0不移动1移动并辅种2移动且只在当前客户端辅种
), ),
# 结束 # 结束
@@ -45,7 +45,7 @@ return array(
'username' => 'admin', 'username' => 'admin',
'password' => '', 'password' => '',
'root_folder'=> 1, // 0不创建根目录1创建根目录 'root_folder'=> 1, // 0不创建根目录1创建根目录
'BT_backup' => 'C:\Users\ASUS\AppData\Local\qBittorrent\BT_backup', // 移动做种必须配置Linux搜索方法find / -name BT_backup 'BT_backup' => '/BT_backup', // 移动做种必须配置Linux搜索方法find / -name BT_backup
'move' => 0, // 0不移动1移动并辅种2移动且只在当前客户端辅种 'move' => 0, // 0不移动1移动并辅种2移动且只在当前客户端辅种
), ),
# 结束 # 结束
@@ -67,7 +67,7 @@ return array(
// 6.RSS工作模式 // 6.RSS工作模式
'workingMode' => 0, 'workingMode' => 0,
// 7.监控目录 // 7.监控目录
'watch' => '/volume1/downloads', 'watch' => '/volume1/watch',
// 8.RSS过滤参数配置 // 8.RSS过滤参数配置
'filter' => array( 'filter' => array(
'size'=>array( 'size'=>array(
@@ -194,23 +194,6 @@ return array(
//'ipv6=1', // 种子Tracker的IP地址选择 可选ipv4ipv6 //'ipv6=1', // 种子Tracker的IP地址选择 可选ipv4ipv6
'https=1', 'https=1',
), ),
'clients' => array(
array(
'type' => 'transmission', // 支持transmission、qBittorrent
'host' => 'http://127.0.0.1:9091/transmission/rpc', // 警告注意transmission/rpc这段别动你只需要修改 127.0.0.1:9091
'username' => '',
'password' => '',
'downloadDir'=> '',
),
),
'workingMode' => 1,
'watch' => '',
'filter' => array(
'size'=>array(
'min' => '1GB',
'max' => '280GB',
),
),
), ),
// keepfrds // keepfrds
'keepfrds' => array( 'keepfrds' => array(

View File

@@ -16,7 +16,8 @@ ARG app_env=prod
# ARG add_user=www-data # ARG add_user=www-data
ENV APP_ENV=${app_env:-"prod"} \ ENV APP_ENV=${app_env:-"prod"} \
TIMEZONE=${timezone:-"Asia/Shanghai"} TIMEZONE=${timezone:-"Asia/Shanghai"} \
cron="0 10 * * 0"
## ##
# ---------- building ---------- # ---------- building ----------
@@ -91,6 +92,7 @@ RUN set -ex \
# - config timezone # - config timezone
&& ln -sf /usr/share/zoneinfo/${TIMEZONE} /etc/localtime \ && ln -sf /usr/share/zoneinfo/${TIMEZONE} /etc/localtime \
&& echo "${TIMEZONE}" > /etc/timezone \ && echo "${TIMEZONE}" > /etc/timezone \
&& echo '2 */5 * * * cd /var/www && git fetch --all && git reset --hard origin/master' >> /etc/crontabs/root \
# ---------- some config work ---------- # ---------- some config work ----------
# - ensure 'www-data' user exists(82 is the standard uid/gid for "www-data" in Alpine) # - ensure 'www-data' user exists(82 is the standard uid/gid for "www-data" in Alpine)
# && addgroup -g 82 -S ${add_user} \ # && addgroup -g 82 -S ${add_user} \
@@ -103,3 +105,5 @@ RUN set -ex \
EXPOSE 9000 EXPOSE 9000
# VOLUME ["/var/www", "/data"] # VOLUME ["/var/www", "/data"]
WORKDIR /var/www WORKDIR /var/www
CMD ["sh", "-c", "/usr/bin/php /var/www/iyuu.php ; /usr/sbin/crond ; (crontab -l ;echo \"$cron /usr/bin/php /var/www/iyuu.php &> /dev/null\") | crontab - ; tail -f /dev/null"]

View File

@@ -17,8 +17,11 @@ RUN set -ex \
&& git clone https://gitee.com/ledc/IYUUAutoReseed.git /IYUU \ && git clone https://gitee.com/ledc/IYUUAutoReseed.git /IYUU \
&& cp /IYUU/config/config.sample.php /IYUU/config/config.php \ && cp /IYUU/config/config.sample.php /IYUU/config/config.php \
&& ln -sf /IYUU/config/config.php /config.php \ && ln -sf /IYUU/config/config.php /config.php \
&& apk del --purge *-dev \
&& rm -rf /var/cache/apk/* /tmp/* /usr/share/man \
&& echo "${TZ}" > /etc/timezone \ && echo "${TZ}" > /etc/timezone \
&& ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime && ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime \
&& echo '2 */6 * * * cd /IYUU && git fetch --all && git reset --hard origin/master' >> /etc/crontabs/root
WORKDIR /IYUU WORKDIR /IYUU

View File

@@ -1,4 +1,4 @@
#!/bin/sh #!/bin/sh
docker build -t iyuu:latest . docker build -t iyuu:arm64v8 .
docker run -it -v /root/config.php:/config.php -v /var/lib/transmission/torrents:/torrents -v /var/lib/qbittorrent/.local/share/data/qBittorrent/BT_backup:/BT_backup --network bridge --name IYUUAutoReseed --restart always -d iyuu:latest docker run -it -v /root/config.php:/config.php -v /var/lib/transmission/torrents:/torrents -v /var/lib/qbittorrent/.local/share/data/qBittorrent/BT_backup:/BT_backup --network bridge --name IYUUAutoReseed --restart always -d iyuu:arm64v8
docker exec -it IYUUAutoReseed php iyuu.php docker exec -it IYUUAutoReseed php iyuu.php

View File

@@ -1,4 +1,4 @@
#!/bin/sh #!/bin/sh
docker build -f Dockerfile -t iyuu:latest . docker build -f Dockerfile -t iyuu:arm64v8 .
docker run -it -v /root/config.php:/config.php --network bridge --name IYUUAutoReseed --restart always -d iyuu:latest docker run -it -v /root/config.php:/config.php --network bridge --name IYUUAutoReseed --restart always -d iyuu:arm64v8
docker exec -it IYUUAutoReseed php iyuu.php docker exec -it IYUUAutoReseed php iyuu.php

View File

@@ -1,5 +1,11 @@
# 公告栏 # 公告栏
### 2020年7月31日09:25:55
1. IYUUAutoReseed正式建立了docke镜像自动编译2个版本ARM64【iyuucn/iyuuautoreseed:arm64v8】、AMD64【iyuucn/iyuuautoreseed:latest】使用方法[点击查看](https://gitee.com/ledc/IYUUAutoReseed/tree/master/docker)
2. 优化默认流控参数单次最多20个间隔20秒。天空辅种请配置cookie必须更新至最新版本并配置浏览器UA获取UA请访问[http://demo.iyuu.cn](http://demo.iyuu.cn/)
3. v1.10.2版本以后的docker每5小时会自动拉取最新代码从此您只需要看公告更新配置就行啦。
### 2020年7月13日08:00:00 ### 2020年7月13日08:00:00
【更新提醒】v1.9.1 【更新提醒】v1.9.1