Bladeren bron

Merge pull request #16 from thelamer/master

adding dynamic readme
j0nnymoe 6 jaren geleden
bovenliggende
commit
59a70e6b69
2 gewijzigde bestanden met toevoegingen van 195 en 157 verwijderingen
  1. 138 61
      README.md
  2. 57 96
      readme-vars.yml

+ 138 - 61
README.md

@@ -1,95 +1,172 @@
-[linuxserverurl]: https://linuxserver.io
-[forumurl]: https://forum.linuxserver.io
-[ircurl]: https://www.linuxserver.io/irc/
-[podcasturl]: https://www.linuxserver.io/podcast/
-[appurl]: https://github.com/thibaud-rohmer/PhotoShow
-[hub]: https://hub.docker.com/r/linuxserver/photoshow/
+[![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/photoshow
-[![](https://images.microbadger.com/badges/version/linuxserver/photoshow.svg)](https://microbadger.com/images/linuxserver/photoshow "Get your own version badge on microbadger.com")[![](https://images.microbadger.com/badges/image/linuxserver/photoshow.svg)](https://microbadger.com/images/linuxserver/photoshow "Get your own image badge on microbadger.com")[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/photoshow.svg)][hub][![Docker Stars](https://img.shields.io/docker/stars/linuxserver/photoshow.svg)][hub][![Build Status](https://ci.linuxserver.io/buildStatus/icon?job=Docker-Builders/x86-64/x86-64-photoshow)](https://ci.linuxserver.io/job/Docker-Builders/job/x86-64/job/x86-64-photoshow/)
+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).
 
-[Photoshow][appurl] is gallery software at its easiest, it doesn't even require a database.
+# 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/photoshow](https://github.com/linuxserver/docker-photoshow)
+[![](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/photoshow.svg)](https://microbadger.com/images/linuxserver/photoshow "Get your own version badge on microbadger.com")
+[![](https://images.microbadger.com/badges/image/linuxserver/photoshow.svg)](https://microbadger.com/images/linuxserver/photoshow "Get your own version badge on microbadger.com")
+![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/photoshow.svg)
+![Docker Stars](https://img.shields.io/docker/stars/linuxserver/photoshow.svg)
+[![Build Status](https://ci.linuxserver.io/buildStatus/icon?job=Docker-Pipeline-Builders/docker-photoshow/master)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-photoshow/job/master/)
+[![](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/photoshow/latest/badge.svg)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/photoshow/latest/index.html)
+
+[Photoshow](https://github.com/thibaud-rohmer/PhotoShow) is gallery software at its easiest, it doesn't even require a database.
+
+[![photoshow](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/photoshow-icon.png)](https://github.com/thibaud-rohmer/PhotoShow)
+
+## 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/photoshow` 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 |
 
-[![photoshow](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/photoshow-icon.png)][appurl]
 
 ## Usage
 
+Here are some example snippets to help you get started creating a container.
+
+### docker
+
 ```
 docker create \
---name=photoshow \
--v <path to data>:/config \
--v <path to pictures>:/Pictures:ro \
--v <path to store thumbs>:/Thumbs \
--e PGID=<gid> -e PUID=<uid> \
--e TZ=<timezone> \
--p 80:80 \
-linuxserver/photoshow
+  --name=photoshow \
+  -e PUID=1001 \
+  -e PGID=1001 \
+  -e TZ=Europe/London \
+  -p 80:80 \
+  -v <path to data>:/config \
+  -v <path to pictures>:/Pictures:ro \
+  -v <path to store thumbs>:/Thumbs \
+  --restart unless-stopped \
+  linuxserver/photoshow
 ```
 
-## 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:
+  photoshow:
+    image: linuxserver/photoshow
+    container_name: photoshow
+    environment:
+      - PUID=1001
+      - PGID=1001
+      - TZ=Europe/London
+    volumes:
+      - <path to data>:/config
+      - <path to pictures>:/Pictures:ro
+      - <path to store thumbs>:/Thumbs
+    ports:
+      - 80:80
+    mem_limit: 4096m
+    restart: unless-stopped
+```
+
+## Parameters
 
+Container images are configured using parameters passed at runtime (such as those above). These parameters are separated by a colon and indicate `<external>:<internal>` 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.
 
-* `-p 80` - port for the webui
-* `-v /config` - stores config and logs for nginx base
-* `-v /Pictures` - your local folder of photos you wish to share
-* `-v /Thumbs` - local folder to store thumbnails of your images
-* `-e PGID` for GroupID - see below for explanation
-* `-e PUID` for UserID - see below for explanation
-* `-e TZ` - for timezone information *eg Europe/London, etc*
+| 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` | Stores config and logs for nginx base. |
+| `-v /Pictures:ro` | Your local folder of photos you wish to share. |
+| `-v /Thumbs` | Local folder to store thumbnails of your images. |
 
-It is based on alpine linux with s6 overlay, for shell access whilst the container is running do `docker exec -it photoshow /bin/bash`.
+## User / Group Identifiers
 
-### User / Group Identifiers
+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`.
 
-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" ™.
+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:
+In this instance `PUID=1001` and `PGID=1001`, to find yours use `id user` as below:
 
 ```
-  $ id <dockeruser>
+  $ id username
     uid=1001(dockeruser) gid=1001(dockergroup) groups=1001(dockergroup)
 ```
 
-## Setting up the application
-
-On first run create an admin account, any folder and its subfolders that you map to /Pictures will be presented as a webgallery. Config settings are persistent and stored as a subfolder of the /Thumbs mapping.
-
 
-## Info
+&nbsp;
+## Application Setup
 
-* To monitor the logs of the container in realtime `docker logs -f photoshow`.
+On first run create an admin account, any folder and its subfolders that you map to /Pictures will be presented as a webgallery. Config settings are persistent and stored as a subfolder of the /Thumbs mapping.
 
 
-* container version number
 
-`docker inspect -f '{{ index .Config.Labels "build_version" }}' photoshow`
+## Support Info
 
+* Shell access whilst the container is running: `docker exec -it photoshow /bin/bash`
+* To monitor the logs of the container in realtime: `docker logs -f photoshow`
+* container version number 
+  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' photoshow`
 * image version number
-
-`docker inspect -f '{{ index .Config.Labels "build_version" }}' linuxserver/photoshow`
+  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' linuxserver/photoshow`
+
+## 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/photoshow`
+* Stop the running container: `docker stop photoshow`
+* Delete the container: `docker rm photoshow`
+* 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 photoshow`
+* You can also remove the old dangling images: `docker image prune`
+
+### Via Docker Compose
+* Update the image: `docker-compose pull linuxserver/photoshow`
+* Let compose update containers as necessary: `docker-compose up -d`
+* You can also remove the old dangling images: `docker image prune`
 
 ## Versions
 
-+ **16.01.19:** Add pipeline logic and multi arch.
-+ **05.09.18:** Rebase to alpine 3.8.
-+ **07.01.18:** Rebase to alpine 3.7.
-+ **25.05.17:** Rebase to alpine 3.6.
-+ **03.05.17:** Use repo pinning to better solve dependencies, use repo version of php7-imagick.
-+ **14.02.17:** Rebase to alpine 3.5.
-+ **14.10.16:** Add version layer information.
-+ **30.09.16:** Rebase to alpine linux.
-+ **11.09.16:** Add layer badges to README.
-+ **21.08.15:** Use patched keybaord js from fork of photoshow
-+ **21.08.15:** Initial Release.
+* **16.01.19:** - Add pipeline logic and multi arch.
+* **05.09.18:** - Rebase to alpine 3.8.
+* **07.01.18:** - Rebase to alpine 3.7.
+* **25.05.17:** - Rebase to alpine 3.6.
+* **03.05.17:** - Use repo pinning to better solve dependencies, use repo version of php7-imagick.
+* **14.02.17:** - Rebase to alpine 3.5.
+* **14.10.16:** - Add version layer information.
+* **30.09.16:** - Rebase to alpine linux.
+* **11.09.16:** - Add layer badges to README.
+* **21.08.15:** - Use patched keybaord js from fork of photoshow.
+* **21.08.15:** - Initial Release.

+ 57 - 96
readme-vars.yml

@@ -2,101 +2,62 @@
 
 # project information
 project_name: photoshow
-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://github.com/thibaud-rohmer/PhotoShow
-  [hub]: https://hub.docker.com/r/linuxserver/photoshow/
-
-  [![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/photoshow
-  [![](https://images.microbadger.com/badges/version/linuxserver/photoshow.svg)](https://microbadger.com/images/linuxserver/photoshow "Get your own version badge on microbadger.com")[![](https://images.microbadger.com/badges/image/linuxserver/photoshow.svg)](https://microbadger.com/images/linuxserver/photoshow "Get your own image badge on microbadger.com")[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/photoshow.svg)][hub][![Docker Stars](https://img.shields.io/docker/stars/linuxserver/photoshow.svg)][hub][![Build Status](https://ci.linuxserver.io/buildStatus/icon?job=Docker-Builders/x86-64/x86-64-photoshow)](https://ci.linuxserver.io/job/Docker-Builders/job/x86-64/job/x86-64-photoshow/)
-
-  [Photoshow][appurl] is gallery software at its easiest, it doesn't even require a database.
-
-  [![photoshow](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/photoshow-icon.png)][appurl]
-
-  ## Usage
-
-  ```
-  docker create \
-  --name=photoshow \
-  -v <path to data>:/config \
-  -v <path to pictures>:/Pictures:ro \
-  -v <path to store thumbs>:/Thumbs \
-  -e PGID=<gid> -e PUID=<uid> \
-  -e TZ=<timezone> \
-  -p 80:80 \
-  linuxserver/photoshow
-  ```
-
-  ## 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` - port for the webui
-  * `-v /config` - stores config and logs for nginx base
-  * `-v /Pictures` - your local folder of photos you wish to share
-  * `-v /Thumbs` - local folder to store thumbnails of your images
-  * `-e PGID` for GroupID - see below for explanation
-  * `-e PUID` for UserID - see below for explanation
-  * `-e TZ` - for timezone information *eg Europe/London, etc*
-
-  It is based on alpine linux with s6 overlay, for shell access whilst the container is running do `docker exec -it photoshow /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 <dockeruser>
-      uid=1001(dockeruser) gid=1001(dockergroup) groups=1001(dockergroup)
-  ```
-
-  ## Setting up the application
-
+project_url: "https://github.com/thibaud-rohmer/PhotoShow"
+project_logo: "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/photoshow-icon.png"
+project_blurb: "[{{ project_name|capitalize }}]({{ project_url }}) is gallery software at its easiest, it doesn't even require a database."
+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: "<path to data>", desc: "Stores config and logs for nginx base." }
+  - { vol_path: "/Pictures:ro", vol_host_path: "<path to pictures>", desc: "Your local folder of photos you wish to share." }
+  - { vol_path: "/Thumbs", vol_host_path: "<path to store thumbs>", desc: "Local folder to store thumbnails of your images." }
+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: |
   On first run create an admin account, any folder and its subfolders that you map to /Pictures will be presented as a webgallery. Config settings are persistent and stored as a subfolder of the /Thumbs mapping.
 
-
-  ## Info
-
-  * To monitor the logs of the container in realtime `docker logs -f photoshow`.
-
-
-  * container version number
-
-  `docker inspect -f '{{ index .Config.Labels "build_version" }}' photoshow`
-
-  * image version number
-
-  `docker inspect -f '{{ index .Config.Labels "build_version" }}' linuxserver/photoshow`
-
-  ## Versions
-
-  + **16.01.19:** Add pipeline logic and multi arch.
-  + **05.09.18:** Rebase to alpine 3.8.
-  + **07.01.18:** Rebase to alpine 3.7.
-  + **25.05.17:** Rebase to alpine 3.6.
-  + **03.05.17:** Use repo pinning to better solve dependencies, use repo version of php7-imagick.
-  + **14.02.17:** Rebase to alpine 3.5.
-  + **14.10.16:** Add version layer information.
-  + **30.09.16:** Rebase to alpine linux.
-  + **11.09.16:** Add layer badges to README.
-  + **21.08.15:** Use patched keybaord js from fork of photoshow
-  + **21.08.15:** Initial Release.
-  {%- endraw %}
+# changelog
+changelogs:
+  - { date: "16.01.19:", desc: "Add pipeline logic and multi arch." }
+  - { date: "05.09.18:", desc: "Rebase to alpine 3.8." }
+  - { date: "07.01.18:", desc: "Rebase to alpine 3.7." }
+  - { date: "25.05.17:", desc: "Rebase to alpine 3.6." }
+  - { date: "03.05.17:", desc: "Use repo pinning to better solve dependencies, use repo version of php7-imagick." }
+  - { date: "14.02.17:", desc: "Rebase to alpine 3.5." }
+  - { date: "14.10.16:", desc: "Add version layer information." }
+  - { date: "30.09.16:", desc: "Rebase to alpine linux." }
+  - { date: "11.09.16:", desc: "Add layer badges to README." }
+  - { date: "21.08.15:", desc: "Use patched keybaord js from fork of photoshow." }
+  - { date: "21.08.15:", desc: "Initial Release." }