From 5add6099184ae584c7980cea6f035fa3216ce8c6 Mon Sep 17 00:00:00 2001 From: Stille Date: Sat, 19 Jun 2021 13:26:57 +0800 Subject: [PATCH] chore(build): add tag for docker build release (#7722) --- .github/workflows/docker-release.yml | 3 ++- docs/en/install/README.md | 9 +++++++++ docs/install/README.md | 8 ++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml index 58e2062e63..05f153ae72 100644 --- a/.github/workflows/docker-release.yml +++ b/.github/workflows/docker-release.yml @@ -37,4 +37,5 @@ jobs: --platform=linux/amd64,linux/arm/v7,linux/arm64 \ --output "type=image,push=true" \ --file ./Dockerfile . \ - --tag $(echo "${DOCKER_USERNAME}" | tr '[:upper:]' '[:lower:]')/rsshub:latest + --tag $(echo "${DOCKER_USERNAME}" | tr '[:upper:]' '[:lower:]')/rsshub:latest \ + --tag $(echo "${DOCKER_USERNAME}" | tr '[:upper:]' '[:lower:]')/rsshub:$(date +%Y)-$(date +%m)-$(date +%d) diff --git a/docs/en/install/README.md b/docs/en/install/README.md index 1913004bcf..e73f58715b 100644 --- a/docs/en/install/README.md +++ b/docs/en/install/README.md @@ -21,6 +21,15 @@ Deploy for public access may require: 1. [Heroku](https://devcenter.heroku.com/articles/getting-started-with-nodejs) 1. [Google App Engine](https://cloud.google.com/appengine/) +## Docker Image +We recommend using the latest version of the docker image. +When the latest version is unavailable , you can use image with date tag. For example : +``` +$ docker pull diygod/rsshub:2021-06-18 +``` +Your can back to the latest version when code has been fixed and rebuild the image. + + ## Docker Compose Deployment ### Install diff --git a/docs/install/README.md b/docs/install/README.md index 9599aeee85..034eab9afb 100644 --- a/docs/install/README.md +++ b/docs/install/README.md @@ -21,6 +21,14 @@ sidebar: auto 4. [Heroku](https://devcenter.heroku.com/articles/getting-started-with-nodejs) 5. [Google App Engine](https://cloud.google.com/appengine/) +## Docker 镜像 +默认推荐使用`diygod/rsshub`即`diygod/rsshub:latest`最新版镜像以获取最新路由. +当`diygod/rsshub:latest`存在问题时,可以使用以日期为标签的近期镜像临时使用,例如: +```bash +$ docker pull diygod/rsshub:2021-06-18 +``` +待最新镜像更新后在切换回`diygod/rsshub:latest`最新版镜像. + ## Docker Compose 部署 ### 安装