From 64ab2a64ad7ffed0b0bed240f439cf870d6e3a67 Mon Sep 17 00:00:00 2001 From: thelamer Date: Mon, 11 Feb 2019 17:28:36 -0800 Subject: [PATCH] adding dynamic readme --- README.md | 187 ++++++++++++++++++++++++++++++++++-------------- readme-vars.yml | 145 +++++++++++++++---------------------- 2 files changed, 189 insertions(+), 143 deletions(-) diff --git a/README.md b/README.md index cc363d5..2491d23 100644 --- a/README.md +++ b/README.md @@ -1,88 +1,167 @@ -[linuxserverurl]: https://linuxserver.io -[forumurl]: https://forum.linuxserver.io -[ircurl]: https://www.linuxserver.io/irc/ -[podcasturl]: https://www.linuxserver.io/podcast/ -[appurl]: https://freshrss.org/ -[hub]: https://hub.docker.com/r/linuxserver/freshrss/ +[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io) -[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl] +The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring :- -The [LinuxServer.io][linuxserverurl] team brings you another container release featuring easy user mapping and community support. Find us for support at: -* [forum.linuxserver.io][forumurl] -* [IRC][ircurl] on freenode at `#linuxserver.io` -* [Podcast][podcasturl] covers everything to do with getting the most from your Linux Server plus a focus on all things Docker and containerisation! + * regular and timely application updates + * easy user mappings (PGID, PUID) + * custom base image with s6 overlay + * weekly base OS updates with common layers across the entire LinuxServer.io ecosystem to minimise space usage, down time and bandwidth + * regular security updates -# linuxserver/freshrss -[![](https://images.microbadger.com/badges/version/linuxserver/freshrss.svg)](https://microbadger.com/images/linuxserver/freshrss "Get your own version badge on microbadger.com")[![](https://images.microbadger.com/badges/image/linuxserver/freshrss.svg)](https://microbadger.com/images/linuxserver/freshrss "Get your own image badge on microbadger.com")[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/freshrss.svg)][hub][![Docker Stars](https://img.shields.io/docker/stars/linuxserver/freshrss.svg)][hub][![Build Status](https://ci.linuxserver.io/buildStatus/icon?job=Docker-Builders/x86-64/x86-64-freshrss)](https://ci.linuxserver.io/job/Docker-Builders/job/x86-64/job/x86-64-freshrss/) +Find us at: +* [Discord](https://discord.gg/YWrKVTn) - realtime support / chat with the community and the team. +* [IRC](https://irc.linuxserver.io) - on freenode at `#linuxserver.io`. Our primary support channel is Discord. +* [Blog](https://blog.linuxserver.io) - all the things you can do with our containers including How-To guides, opinions and much more! +* [Podcast](https://anchor.fm/linuxserverio) - on hiatus. Coming back soon (late 2018). -[FreshRSS][appurl] is a free, self-hostable aggregator for rss feeds +# PSA: Changes are happening + +From August 2018 onwards, Linuxserver are in the midst of switching to a new CI platform which will enable us to build and release multiple architectures under a single repo. To this end, existing images for `arm64` and `armhf` builds are being deprecated. They are replaced by a manifest file in each container which automatically pulls the correct image for your architecture. You'll also be able to pull based on a specific architecture tag. + +TLDR: Multi-arch support is changing from multiple repos to one repo per container image. + +# [linuxserver/freshrss](https://github.com/linuxserver/docker-freshrss) +[![](https://img.shields.io/discord/354974912613449730.svg?logo=discord&label=LSIO%20Discord&style=flat-square)](https://discord.gg/YWrKVTn) +[![](https://images.microbadger.com/badges/version/linuxserver/freshrss.svg)](https://microbadger.com/images/linuxserver/freshrss "Get your own version badge on microbadger.com") +[![](https://images.microbadger.com/badges/image/linuxserver/freshrss.svg)](https://microbadger.com/images/linuxserver/freshrss "Get your own version badge on microbadger.com") +![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/freshrss.svg) +![Docker Stars](https://img.shields.io/docker/stars/linuxserver/freshrss.svg) +[![Build Status](https://ci.linuxserver.io/buildStatus/icon?job=Docker-Pipeline-Builders/docker-freshrss/master)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-freshrss/job/master/) +[![](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/freshrss/latest/badge.svg)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/freshrss/latest/index.html) + +[Freshrss](https://freshrss.org/) is a free, self-hostable aggregator for rss feeds. + +[![freshrss](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/freshrss-banner.png)](https://freshrss.org/) + +## Supported Architectures + +Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list). + +Simply pulling `linuxserver/freshrss` should retrieve the correct image for your arch, but you can also pull specific arch images via tags. + +The architectures supported by this image are: + +| Architecture | Tag | +| :----: | --- | +| x86-64 | amd64-latest | +| arm64 | arm64v8-latest | +| armhf | arm32v6-latest | -[![freshrss](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/freshrss-banner.png)][appurl] ## Usage +Here are some example snippets to help you get started creating a container. + +### docker + ``` docker create \ ---name=freshrss \ --v :/config \ --e PGID= -e PUID= \ --p 80:80 \ -linuxserver/freshrss + --name=freshrss \ + -e PUID=1001 \ + -e PGID=1001 \ + -e TZ=Europe/London \ + -p 80:80 \ + -v :/config \ + --restart unless-stopped \ + linuxserver/freshrss ``` -## Parameters -`The parameters are split into two halves, separated by a colon, the left hand side representing the host and the right the container side. -For example with a port -p external:internal - what this shows is the port mapping from internal to external of the container. -So -p 8080:80 would expose port 80 from inside the container to be accessible from the host's IP on port 8080 -http://192.168.x.x:8080 would show you what's running INSIDE the container on port 80.` +### docker-compose + +Compatible with docker-compose v2 schemas. +``` +--- +version: "2" +services: + freshrss: + image: linuxserver/freshrss + container_name: freshrss + environment: + - PUID=1001 + - PGID=1001 + - TZ=Europe/London + volumes: + - :/config + ports: + - 80:80 + mem_limit: 4096m + restart: unless-stopped +``` -* `-p 80` - the port(s) -* `-v /config` - local storage for freshrss site files -* `-e PGID` for GroupID - see below for explanation -* `-e PUID` for UserID - see below for explanation +## Parameters -It is based on phusion-baseimage with ssh removed, for shell access whilst the container is running do `docker exec -it freshrss /bin/bash`. +Container images are configured using parameters passed at runtime (such as those above). These parameters are separated by a colon and indicate `:` respectively. For example, `-p 8080:80` would expose port `80` from inside the container to be accessible from the host's IP on port `8080` outside the container. -### User / Group Identifiers +| Parameter | Function | +| :----: | --- | +| `-p 80` | WebUI | +| `-e PUID=1001` | for UserID - see below for explanation | +| `-e PGID=1001` | for GroupID - see below for explanation | +| `-e TZ=Europe/London` | Specify a timezone to use EG Europe/London. | +| `-v /config` | Local storage for freshrss site files. | -Sometimes when using data volumes (`-v` flags) permissions issues can arise between the host OS and the container. We avoid this issue by allowing you to specify the user `PUID` and group `PGID`. Ensure the data volume directory on the host is owned by the same user you specify and it will "just work" ™. +## User / Group Identifiers -In this instance `PUID=1001` and `PGID=1001`. To find yours use `id user` as below: +When using volumes (`-v` flags) permissions issues can arise between the host OS and the container, we avoid this issue by allowing you to specify the user `PUID` and group `PGID`. + +Ensure any volume directories on the host are owned by the same user you specify and any permissions issues will vanish like magic. + +In this instance `PUID=1001` and `PGID=1001`, to find yours use `id user` as below: ``` - $ id + $ id username uid=1001(dockeruser) gid=1001(dockergroup) groups=1001(dockergroup) ``` -## Setting up the application -Create a user and database in your mysql/mariadb server (not root) and then follow the setup wizard in the webui. Use the IP address for "host" of your database server. +  +## Application Setup -## Info +Create a user and database in your mysql/mariadb server (not root) and then follow the setup wizard in the webui. Use the IP address for "host" of your database server. -* To monitor the logs of the container in realtime `docker logs -f freshrss`. -* container version number -`docker inspect -f '{{ index .Config.Labels "build_version" }}' freshrss` +## Support Info +* Shell access whilst the container is running: `docker exec -it freshrss /bin/bash` +* To monitor the logs of the container in realtime: `docker logs -f freshrss` +* container version number + * `docker inspect -f '{{ index .Config.Labels "build_version" }}' freshrss` * image version number - -`docker inspect -f '{{ index .Config.Labels "build_version" }}' linuxserver/freshrss` + * `docker inspect -f '{{ index .Config.Labels "build_version" }}' linuxserver/freshrss` + +## Updating Info + +Most of our images are static, versioned, and require an image update and container recreation to update the app inside. With some exceptions (ie. nextcloud, plex), we do not recommend or support updating apps inside the container. Please consult the [Application Setup](#application-setup) section above to see if it is recommended for the image. + +Below are the instructions for updating containers: + +### Via Docker Run/Create +* Update the image: `docker pull linuxserver/freshrss` +* Stop the running container: `docker stop freshrss` +* Delete the container: `docker rm freshrss` +* Recreate a new container with the same docker create parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved) +* Start the new container: `docker start freshrss` +* You can also remove the old dangling images: `docker image prune` + +### Via Docker Compose +* Update the image: `docker-compose pull linuxserver/freshrss` +* Let compose update containers as necessary: `docker-compose up -d` +* You can also remove the old dangling images: `docker image prune` ## Versions -+ **14.01.19:** Add multi arch and pipeline logic. -+ **05.09.18:** Rebase to alpine linux 3.8. -+ **17.03.18:** Update nginx config to resolve api not working. -+ **08.01.18:** Rebase to alpine linux 3.7. -+ **25.05.17:** Rebase to alpine linux 3.6. -+ **23.02.17:** Rebase to alpine linux 3.5 and nginx. -+ **14.10.16:** Add version layer information. -+ **08.10.16:** Add Sqlite support for standalone operation. -+ **27.09.16:** Fix for cron job. -+ **11.09.16:** Add layer badges to README. -+ **23.11.15:** Update dependencies to latest requirements. -+ **21.08.15:** Initial Release. +* **14.01.19:** - Add multi arch and pipeline logic. +* **05.09.18:** - Rebase to alpine linux 3.8. +* **17.03.18:** - Update nginx config to resolve api not working. +* **08.01.18:** - Rebase to alpine linux 3.7. +* **25.05.17:** - Rebase to alpine linux 3.6. +* **23.02.17:** - Rebase to alpine linux 3.5 and nginx. +* **14.10.16:** - Add version layer information. +* **08.10.16:** - Add Sqlite support for standalone operation. +* **27.09.16:** - Fix for cron job. +* **11.09.16:** - Add layer badges to README. +* **23.11.15:** - Update dependencies to latest requirements. +* **21.08.15:** - Initial Release. diff --git a/readme-vars.yml b/readme-vars.yml index a18b348..7bca8c4 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -2,94 +2,61 @@ # project information project_name: freshrss -full_custom_readme: | - {% raw -%} - [linuxserverurl]: https://linuxserver.io - [forumurl]: https://forum.linuxserver.io - [ircurl]: https://www.linuxserver.io/irc/ - [podcasturl]: https://www.linuxserver.io/podcast/ - [appurl]: https://freshrss.org/ - [hub]: https://hub.docker.com/r/linuxserver/freshrss/ - - [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl] - - The [LinuxServer.io][linuxserverurl] team brings you another container release featuring easy user mapping and community support. Find us for support at: - * [forum.linuxserver.io][forumurl] - * [IRC][ircurl] on freenode at `#linuxserver.io` - * [Podcast][podcasturl] covers everything to do with getting the most from your Linux Server plus a focus on all things Docker and containerisation! - - # linuxserver/freshrss - [![](https://images.microbadger.com/badges/version/linuxserver/freshrss.svg)](https://microbadger.com/images/linuxserver/freshrss "Get your own version badge on microbadger.com")[![](https://images.microbadger.com/badges/image/linuxserver/freshrss.svg)](https://microbadger.com/images/linuxserver/freshrss "Get your own image badge on microbadger.com")[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/freshrss.svg)][hub][![Docker Stars](https://img.shields.io/docker/stars/linuxserver/freshrss.svg)][hub][![Build Status](https://ci.linuxserver.io/buildStatus/icon?job=Docker-Builders/x86-64/x86-64-freshrss)](https://ci.linuxserver.io/job/Docker-Builders/job/x86-64/job/x86-64-freshrss/) - - [FreshRSS][appurl] is a free, self-hostable aggregator for rss feeds - - [![freshrss](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/freshrss-banner.png)][appurl] - - ## Usage - - ``` - docker create \ - --name=freshrss \ - -v :/config \ - -e PGID= -e PUID= \ - -p 80:80 \ - linuxserver/freshrss - ``` - - ## Parameters - - `The parameters are split into two halves, separated by a colon, the left hand side representing the host and the right the container side. - For example with a port -p external:internal - what this shows is the port mapping from internal to external of the container. - So -p 8080:80 would expose port 80 from inside the container to be accessible from the host's IP on port 8080 - http://192.168.x.x:8080 would show you what's running INSIDE the container on port 80.` - - - * `-p 80` - the port(s) - * `-v /config` - local storage for freshrss site files - * `-e PGID` for GroupID - see below for explanation - * `-e PUID` for UserID - see below for explanation - - It is based on phusion-baseimage with ssh removed, for shell access whilst the container is running do `docker exec -it freshrss /bin/bash`. - - ### User / Group Identifiers - - Sometimes when using data volumes (`-v` flags) permissions issues can arise between the host OS and the container. We avoid this issue by allowing you to specify the user `PUID` and group `PGID`. Ensure the data volume directory on the host is owned by the same user you specify and it will "just work" ™. - - In this instance `PUID=1001` and `PGID=1001`. To find yours use `id user` as below: - - ``` - $ id - uid=1001(dockeruser) gid=1001(dockergroup) groups=1001(dockergroup) - ``` - - ## Setting up the application - +project_url: "https://freshrss.org/" +project_logo: "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/freshrss-banner.png" +project_blurb: "[{{ project_name|capitalize }}]({{ project_url }}) is a free, self-hostable aggregator for rss feeds." +project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}" +project_blurb_optional_extras_enabled: false + +# supported architectures +available_architectures: + - { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"} + - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"} + - { arch: "{{ arch_armhf }}", tag: "arm32v6-latest"} + +# development version +development_versions: false + +# container parameters +common_param_env_vars_enabled: true +param_container_name: "{{ project_name }}" +param_usage_include_net: false +param_usage_include_env: true +param_env_vars: + - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London." } +param_usage_include_vols: true +param_volumes: + - { vol_path: "/config", vol_host_path: "", desc: "Local storage for freshrss site files." } +param_usage_include_ports: true +param_ports: + - { external_port: "80", internal_port: "80", port_desc: "WebUI" } +param_device_map: false +cap_add_param: false + +# optional container parameters +opt_param_usage_include_env: false +opt_param_usage_include_vols: false +opt_param_usage_include_ports: false +opt_param_device_map: false +opt_cap_add_param: false +optional_block_1: false + +# application setup block +app_setup_block_enabled: true +app_setup_block: | Create a user and database in your mysql/mariadb server (not root) and then follow the setup wizard in the webui. Use the IP address for "host" of your database server. - ## Info - - * To monitor the logs of the container in realtime `docker logs -f freshrss`. - - * container version number - - `docker inspect -f '{{ index .Config.Labels "build_version" }}' freshrss` - - * image version number - - `docker inspect -f '{{ index .Config.Labels "build_version" }}' linuxserver/freshrss` - - ## Versions - - + **14.01.19:** Add multi arch and pipeline logic. - + **05.09.18:** Rebase to alpine linux 3.8. - + **17.03.18:** Update nginx config to resolve api not working. - + **08.01.18:** Rebase to alpine linux 3.7. - + **25.05.17:** Rebase to alpine linux 3.6. - + **23.02.17:** Rebase to alpine linux 3.5 and nginx. - + **14.10.16:** Add version layer information. - + **08.10.16:** Add Sqlite support for standalone operation. - + **27.09.16:** Fix for cron job. - + **11.09.16:** Add layer badges to README. - + **23.11.15:** Update dependencies to latest requirements. - + **21.08.15:** Initial Release. - {%- endraw %} +# changelog +changelogs: + - { date: "14.01.19:", desc: "Add multi arch and pipeline logic." } + - { date: "05.09.18:", desc: "Rebase to alpine linux 3.8." } + - { date: "17.03.18:", desc: "Update nginx config to resolve api not working." } + - { date: "08.01.18:", desc: "Rebase to alpine linux 3.7." } + - { date: "25.05.17:", desc: "Rebase to alpine linux 3.6." } + - { date: "23.02.17:", desc: "Rebase to alpine linux 3.5 and nginx." } + - { date: "14.10.16:", desc: "Add version layer information." } + - { date: "08.10.16:", desc: "Add Sqlite support for standalone operation." } + - { date: "27.09.16:", desc: "Fix for cron job." } + - { date: "11.09.16:", desc: "Add layer badges to README." } + - { date: "23.11.15:", desc: "Update dependencies to latest requirements." } + - { date: "21.08.15:", desc: "Initial Release." }