From a184466a4294a5d58e6fa72baf0c932b8766e3a0 Mon Sep 17 00:00:00 2001 From: Stille Date: Thu, 6 Jan 2022 17:20:20 +0800 Subject: [PATCH] optimize --- .env | 4 +++- README.md | 16 ++++++++------ acme/acme.sh | 2 +- acme/start.sh | 2 +- compose_files/arm/freshrss-http.yml | 2 +- compose_files/arm/freshrss-https.yml | 2 +- compose_files/arm/freshrss-rsshub-http.yml | 4 ++-- compose_files/arm/freshrss-rsshub-https.yml | 4 ++-- compose_files/arm/ttrss-rsshub-http.yml | 2 +- compose_files/arm/ttrss-rsshub-https.yml | 2 +- compose_files/x86/freshrss-http.yml | 2 +- compose_files/x86/freshrss-https.yml | 2 +- compose_files/x86/freshrss-rsshub-http.yml | 4 ++-- compose_files/x86/freshrss-rsshub-https.yml | 4 ++-- compose_files/x86/ttrss-rsshub-http.yml | 2 +- compose_files/x86/ttrss-rsshub-https.yml | 2 +- install.sh | 24 ++++++++++----------- 17 files changed, 43 insertions(+), 37 deletions(-) diff --git a/.env b/.env index 98a5de0..486d12a 100644 --- a/.env +++ b/.env @@ -31,6 +31,8 @@ TTRSS_IMAGE=wangqiru/ttrss TTRSS_VERSION=latest-2021-05-19 # ------------------------------------- FreshRSS ------------------------------------- # +FRESHRSS_X86_VERSION=1.19.1 +FRESHRSS_ARM_VERSION=1.19.1-arm POSTGRES_DB=freshrss POSTGRES_USER=freshrss -EXPOSED_PORT=30001 \ No newline at end of file +EXPOSED_PORT=30001 diff --git a/README.md b/README.md index d62cfc4..422303b 100644 --- a/README.md +++ b/README.md @@ -47,11 +47,7 @@ wget https://raw.githubusercontent.com/stilleshan/rssforever/main/install.sh && chmod +x install.sh && ./install.sh ``` -## 注意事项 -### docker-compose 版本 -建议将 docker-compose 版本升级到 v2.x.x 以上,建议 v2.2.2 版本. -新版 docker-compose 启动的容器名命名格式于老版本不同,使用旧版会导致`Watchtower`无法监控更新镜像.除此之外无其他影响. - +## 使用 ### TTRSS 默认账户: admin 默认密码: password @@ -65,7 +61,15 @@ FreshRSS 首次访问需要设置数据库,选择`PostgreSQL`: ![snapshot01.jpg](./snapshot01.jpg) -### 定时更新证书 +### docker compose 版本 +建议将 docker compose 版本升级到 v2.x.x 以上,建议 v2.2.2 版本. + +### 更新镜像 +本项目配置有`Watchtower`来监控部分容器的镜像更新. +Nginx / TTRSS / FreshRSS 的版本在`.env`文件中定义,请谨慎修改更新. +如需更新,建议先行备份`rssforever`目录,再执行`docker-compose down`停止服务,修改版本号后再次执行`docker-compose up -d`启动服务. + +### 更新证书 证书每月`1`日自动更新,请执行以下命令来定时每月重启`nginx`服务刷新证书.也可每月手动执行`docker-compose restart`来重启服务. ```shell crontab -e diff --git a/acme/acme.sh b/acme/acme.sh index 26e3e01..3805567 100755 --- a/acme/acme.sh +++ b/acme/acme.sh @@ -40,5 +40,5 @@ else fi cat >/var/spool/cron/crontabs/root </dev/null 2>&1 +0 0 1 * * /conf/acme.sh >/dev/null 2>&1 EOF diff --git a/acme/start.sh b/acme/start.sh index c6d9b21..5f69d0a 100755 --- a/acme/start.sh +++ b/acme/start.sh @@ -14,7 +14,7 @@ DOMAIN=$(cat /conf/account.conf | awk -F= '{if($1~"DOMAIN")print $2}') DNSAPI=$(cat /conf/account.conf | awk -F= '{if($1~"DNSAPI")print $2}') cat >/var/spool/cron/crontabs/root</dev/null 2>&1 +0 0 1 * * /conf/acme.sh >/dev/null 2>&1 EOF if [ ! -f "/ssl/${DOMAIN}.cer" ] && [ -n "${DOMAIN}" ]; then diff --git a/compose_files/arm/freshrss-http.yml b/compose_files/arm/freshrss-http.yml index f3b2588..86a5ca5 100644 --- a/compose_files/arm/freshrss-http.yml +++ b/compose_files/arm/freshrss-http.yml @@ -50,7 +50,7 @@ services: - rssforever service.rss: - image: freshrss/freshrss:arm + image: freshrss/freshrss:${FRESHRSS_ARM_VERSION} # container_name: freshrss-app hostname: freshrss-app restart: unless-stopped diff --git a/compose_files/arm/freshrss-https.yml b/compose_files/arm/freshrss-https.yml index fada8e8..c4ad0bd 100644 --- a/compose_files/arm/freshrss-https.yml +++ b/compose_files/arm/freshrss-https.yml @@ -50,7 +50,7 @@ services: - rssforever service.rss: - image: freshrss/freshrss:arm + image: freshrss/freshrss:${FRESHRSS_ARM_VERSION} # container_name: freshrss-app hostname: freshrss-app restart: unless-stopped diff --git a/compose_files/arm/freshrss-rsshub-http.yml b/compose_files/arm/freshrss-rsshub-http.yml index 9e4a91f..00c6194 100644 --- a/compose_files/arm/freshrss-rsshub-http.yml +++ b/compose_files/arm/freshrss-rsshub-http.yml @@ -51,7 +51,7 @@ services: - rssforever service.rss: - image: freshrss/freshrss:arm + image: freshrss/freshrss:${FRESHRSS_ARM_VERSION} # container_name: freshrss-app hostname: freshrss-app restart: unless-stopped @@ -105,7 +105,7 @@ services: - WATCHTOWER_CLEANUP=true - WATCHTOWER_SCHEDULE=0 0 10 * * * restart: always - command: rssforever-watchtower-1 rssforever_rsshub-1 rssforever_redis-1 rssforever_browserless-1 rssforever_acme-1 + command: rssforever_acme-1 rssforever_watchtower_1 rssforever_rsshub_1 rssforever_redis_1 rssforever_browserless_1 rssforever_acme_1 rssforever-watchtower-1 rssforever_rsshub-1 rssforever_redis-1 rssforever_browserless-1 networks: - rssforever diff --git a/compose_files/arm/freshrss-rsshub-https.yml b/compose_files/arm/freshrss-rsshub-https.yml index f52a9bf..b9d4088 100644 --- a/compose_files/arm/freshrss-rsshub-https.yml +++ b/compose_files/arm/freshrss-rsshub-https.yml @@ -51,7 +51,7 @@ services: - rssforever service.rss: - image: freshrss/freshrss:arm + image: freshrss/freshrss:${FRESHRSS_ARM_VERSION} # container_name: freshrss-app hostname: freshrss-app restart: unless-stopped @@ -105,7 +105,7 @@ services: - WATCHTOWER_CLEANUP=true - WATCHTOWER_SCHEDULE=0 0 10 * * * restart: always - command: rssforever-watchtower-1 rssforever_rsshub-1 rssforever_redis-1 rssforever_browserless-1 rssforever_acme-1 + command: rssforever_acme-1 rssforever_watchtower_1 rssforever_rsshub_1 rssforever_redis_1 rssforever_browserless_1 rssforever_acme_1 rssforever-watchtower-1 rssforever_rsshub-1 rssforever_redis-1 rssforever_browserless-1 networks: - rssforever diff --git a/compose_files/arm/ttrss-rsshub-http.yml b/compose_files/arm/ttrss-rsshub-http.yml index 2a38a1a..baa8d19 100644 --- a/compose_files/arm/ttrss-rsshub-http.yml +++ b/compose_files/arm/ttrss-rsshub-http.yml @@ -100,7 +100,7 @@ services: - WATCHTOWER_CLEANUP=true - WATCHTOWER_SCHEDULE=0 0 10 * * * restart: always - command: rssforever-watchtower-1 rssforever_rsshub-1 rssforever_redis-1 rssforever_browserless-1 rssforever_acme-1 + command: rssforever_acme-1 rssforever_watchtower_1 rssforever_rsshub_1 rssforever_redis_1 rssforever_browserless_1 rssforever_acme_1 rssforever-watchtower-1 rssforever_rsshub-1 rssforever_redis-1 rssforever_browserless-1 networks: - rssforever diff --git a/compose_files/arm/ttrss-rsshub-https.yml b/compose_files/arm/ttrss-rsshub-https.yml index 5150a9f..c104ff5 100644 --- a/compose_files/arm/ttrss-rsshub-https.yml +++ b/compose_files/arm/ttrss-rsshub-https.yml @@ -100,7 +100,7 @@ services: - WATCHTOWER_CLEANUP=true - WATCHTOWER_SCHEDULE=0 0 10 * * * restart: always - command: rssforever-watchtower-1 rssforever_rsshub-1 rssforever_redis-1 rssforever_browserless-1 rssforever_acme-1 + command: rssforever_acme-1 rssforever_watchtower_1 rssforever_rsshub_1 rssforever_redis_1 rssforever_browserless_1 rssforever_acme_1 rssforever-watchtower-1 rssforever_rsshub-1 rssforever_redis-1 rssforever_browserless-1 networks: - rssforever diff --git a/compose_files/x86/freshrss-http.yml b/compose_files/x86/freshrss-http.yml index ca74e6a..192d0b1 100644 --- a/compose_files/x86/freshrss-http.yml +++ b/compose_files/x86/freshrss-http.yml @@ -50,7 +50,7 @@ services: - rssforever service.rss: - image: freshrss/freshrss:latest + image: freshrss/freshrss:${FRESHRSS_X86_VERSION} # container_name: freshrss-app hostname: freshrss-app restart: unless-stopped diff --git a/compose_files/x86/freshrss-https.yml b/compose_files/x86/freshrss-https.yml index 4461ca3..f5244e1 100644 --- a/compose_files/x86/freshrss-https.yml +++ b/compose_files/x86/freshrss-https.yml @@ -50,7 +50,7 @@ services: - rssforever service.rss: - image: freshrss/freshrss:latest + image: freshrss/freshrss:${FRESHRSS_X86_VERSION} # container_name: freshrss-app hostname: freshrss-app restart: unless-stopped diff --git a/compose_files/x86/freshrss-rsshub-http.yml b/compose_files/x86/freshrss-rsshub-http.yml index 6e8ec49..577be5c 100644 --- a/compose_files/x86/freshrss-rsshub-http.yml +++ b/compose_files/x86/freshrss-rsshub-http.yml @@ -51,7 +51,7 @@ services: - rssforever service.rss: - image: freshrss/freshrss:latest + image: freshrss/freshrss:${FRESHRSS_X86_VERSION} # container_name: freshrss-app hostname: freshrss-app restart: unless-stopped @@ -114,7 +114,7 @@ services: - WATCHTOWER_CLEANUP=true - WATCHTOWER_SCHEDULE=0 0 10 * * * restart: always - command: rssforever-watchtower-1 rssforever_rsshub-1 rssforever_redis-1 rssforever_browserless-1 rssforever_acme-1 + command: rssforever_acme-1 rssforever_watchtower_1 rssforever_rsshub_1 rssforever_redis_1 rssforever_browserless_1 rssforever_acme_1 rssforever-watchtower-1 rssforever_rsshub-1 rssforever_redis-1 rssforever_browserless-1 networks: - rssforever diff --git a/compose_files/x86/freshrss-rsshub-https.yml b/compose_files/x86/freshrss-rsshub-https.yml index 1a43e65..b5fd3b0 100644 --- a/compose_files/x86/freshrss-rsshub-https.yml +++ b/compose_files/x86/freshrss-rsshub-https.yml @@ -51,7 +51,7 @@ services: - rssforever service.rss: - image: freshrss/freshrss:latest + image: freshrss/freshrss:${FRESHRSS_X86_VERSION} # container_name: freshrss-app hostname: freshrss-app restart: unless-stopped @@ -114,7 +114,7 @@ services: - WATCHTOWER_CLEANUP=true - WATCHTOWER_SCHEDULE=0 0 10 * * * restart: always - command: rssforever-watchtower-1 rssforever_rsshub-1 rssforever_redis-1 rssforever_browserless-1 rssforever_acme-1 + command: rssforever_acme-1 rssforever_watchtower_1 rssforever_rsshub_1 rssforever_redis_1 rssforever_browserless_1 rssforever_acme_1 rssforever-watchtower-1 rssforever_rsshub-1 rssforever_redis-1 rssforever_browserless-1 networks: - rssforever diff --git a/compose_files/x86/ttrss-rsshub-http.yml b/compose_files/x86/ttrss-rsshub-http.yml index 95df17e..bc4af11 100644 --- a/compose_files/x86/ttrss-rsshub-http.yml +++ b/compose_files/x86/ttrss-rsshub-http.yml @@ -125,6 +125,6 @@ services: - WATCHTOWER_CLEANUP=true - WATCHTOWER_SCHEDULE=0 0 10 * * * restart: always - command: rssforever-watchtower-1 rssforever_rsshub-1 rssforever_redis-1 rssforever_browserless-1 rssforever_acme-1 + command: rssforever_acme-1 rssforever_watchtower_1 rssforever_rsshub_1 rssforever_redis_1 rssforever_browserless_1 rssforever_acme_1 rssforever-watchtower-1 rssforever_rsshub-1 rssforever_redis-1 rssforever_browserless-1 networks: - rssforever diff --git a/compose_files/x86/ttrss-rsshub-https.yml b/compose_files/x86/ttrss-rsshub-https.yml index cb2dce4..03ae060 100644 --- a/compose_files/x86/ttrss-rsshub-https.yml +++ b/compose_files/x86/ttrss-rsshub-https.yml @@ -125,7 +125,7 @@ services: - WATCHTOWER_CLEANUP=true - WATCHTOWER_SCHEDULE=0 0 10 * * * restart: always - command: rssforever-watchtower-1 rssforever_rsshub-1 rssforever_redis-1 rssforever_browserless-1 rssforever_acme-1 + command: rssforever_acme-1 rssforever_watchtower_1 rssforever_rsshub_1 rssforever_redis_1 rssforever_browserless_1 rssforever_acme_1 rssforever-watchtower-1 rssforever_rsshub-1 rssforever_redis-1 rssforever_browserless-1 networks: - rssforever diff --git a/install.sh b/install.sh index 160c525..5c65e91 100644 --- a/install.sh +++ b/install.sh @@ -42,18 +42,18 @@ welcome (){ check_env (){ echo -e "${Green}=========================================================================================${Font}" echo -e "${Green}开始检查服务器环境${Font}" - # if ! type docker >/dev/null 2>&1 ; then - # echo -e "${Red}当前系统 docker 未安装,已退出脚本.${Font}" - # exit 0 - # fi - # if ! type docker-compose >/dev/null 2>&1 ; then - # echo -e "${Red}当前系统 docker-compose 未安装,已退出脚本.${Font}" - # exit 0 - # fi - # if ! type git >/dev/null 2>&1 ; then - # echo -e "${Red}当前系统 git 未安装,已退出脚本.${Font}" - # exit 0 - # fi + if ! type docker >/dev/null 2>&1 ; then + echo -e "${Red}当前系统 docker 未安装,已退出脚本.${Font}" + exit 0 + fi + if ! type docker-compose >/dev/null 2>&1 ; then + echo -e "${Red}当前系统 docker-compose 未安装,已退出脚本.${Font}" + exit 0 + fi + if ! type git >/dev/null 2>&1 ; then + echo -e "${Red}当前系统 git 未安装,已退出脚本.${Font}" + exit 0 + fi if [ -d "${WORK_PATH}/rssforever" ] ; then echo -e "${Red}当前目录存在 rssforever 项目.请更换目录,或删除后再次执行脚本.${Font}" exit 0