From 41b40e81850fe6ead3b4f8b73a8618f2eb664b20 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Wed, 20 Mar 2024 17:28:50 +0000 Subject: [PATCH] Rebase to 3.19 --- Dockerfile | 4 ++-- Dockerfile.aarch64 | 4 ++-- README.md | 13 +++++++------ readme-vars.yml | 14 +++++--------- 4 files changed, 16 insertions(+), 19 deletions(-) diff --git a/Dockerfile b/Dockerfile index d141a856..d044da06 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:3.18 +FROM ghcr.io/linuxserver/baseimage-alpine:3.19 # set version label ARG BUILD_DATE ARG VERSION ARG RADARR_RELEASE LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" -LABEL maintainer="thelamer" +LABEL maintainer="Roxedus,thespad" # environment settings ARG RADARR_BRANCH="master" diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 347a2dff..b7df6e40 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,13 +1,13 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.18 +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19 # set version label ARG BUILD_DATE ARG VERSION ARG RADARR_RELEASE LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" -LABEL maintainer="thelamer" +LABEL maintainer="Roxedus,thespad" ARG RADARR_BRANCH="master" ENV XDG_CONFIG_HOME="/config/xdg" diff --git a/README.md b/README.md index 3d0f6003..85f93789 100644 --- a/README.md +++ b/README.md @@ -75,7 +75,7 @@ Access the webui at `:7878`, for more information check out [Radarr](ht We have set `/movies` and `/downloads` as ***optional paths***, this is because it is the easiest way to get started. While easy to use, it has some drawbacks. Mainly losing the ability to hardlink (TL;DR a way for a file to exist in multiple places on the same file system while only consuming one file worth of space), or atomic move (TL;DR instant file moves, rather than copy+delete) files while processing content. -Use the optional paths if you dont understand, or dont want hardlinks/atomic moves. +Use the optional paths if you don't understand, or don't want hardlinks/atomic moves. The folks over at servarr.com wrote a good [write-up](https://wiki.servarr.com/docker-guide#consistent-and-well-planned-paths) on how to get started with this. @@ -96,9 +96,9 @@ services: - PGID=1000 - TZ=Etc/UTC volumes: - - /path/to/data:/config + - /path/to/radarr/data:/config - /path/to/movies:/movies #optional - - /path/to/downloadclient-downloads:/downloads #optional + - /path/to/download-client-downloads:/downloads #optional ports: - 7878:7878 restart: unless-stopped @@ -113,9 +113,9 @@ docker run -d \ -e PGID=1000 \ -e TZ=Etc/UTC \ -p 7878:7878 \ - -v /path/to/data:/config \ + -v /path/to/radarr/data:/config \ -v /path/to/movies:/movies `#optional` \ - -v /path/to/downloadclient-downloads:/downloads `#optional` \ + -v /path/to/download-client-downloads:/downloads `#optional` \ --restart unless-stopped \ lscr.io/linuxserver/radarr:latest ``` @@ -126,7 +126,7 @@ Containers are configured using parameters passed at runtime (such as those abov | Parameter | Function | | :----: | --- | -| `-p 7878` | The port for the Radarr webinterface | +| `-p 7878` | The port for the Radarr Web UI | | `-e PUID=1000` | for UserID - see below for explanation | | `-e PGID=1000` | for GroupID - see below for explanation | | `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). | @@ -295,6 +295,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **20.03.24:** - Rebase to Alpine 3.19. * **06.06.23:** - Rebase master to Alpine 3.18, deprecate armhf as per [https://www.linuxserver.io/armhf](https://www.linuxserver.io/armhf). * **17.01.23:** - Rebase master branch to Alpine 3.17, migrate to s6v3. * **06.06.22:** - Rebase master branch to Alpine 3.15. diff --git a/readme-vars.yml b/readme-vars.yml index 552d1309..3d6f569c 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -24,21 +24,16 @@ development_versions_items: param_container_name: "{{ project_name }}" param_usage_include_vols: true param_volumes: - - { vol_path: "/config", vol_host_path: "/path/to/data", desc: "Database and Radarr configs" } + - { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/data", desc: "Database and Radarr configs" } opt_param_usage_include_vols: true opt_param_volumes: - { vol_path: "/movies", vol_host_path: "/path/to/movies", desc: "Location of Movie library on disk (See note in Application setup)" } - - { vol_path: "/downloads", vol_host_path: "/path/to/downloadclient-downloads", desc: "Location of download managers output directory (See note in Application setup)" } + - { vol_path: "/downloads", vol_host_path: "/path/to/download-client-downloads", desc: "Location of download managers output directory (See note in Application setup)" } param_usage_include_ports: true param_ports: - - { external_port: "7878", internal_port: "7878", port_desc: "The port for the Radarr webinterface" } -param_usage_include_env: true -param_env_vars: - - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London, this is required for Radarr"} -# optional env variables -opt_param_usage_include_env: false + - { external_port: "7878", internal_port: "7878", port_desc: "The port for the Radarr Web UI" } # application setup block app_setup_block_enabled: true @@ -49,12 +44,13 @@ app_setup_block: | We have set `/movies` and `/downloads` as ***optional paths***, this is because it is the easiest way to get started. While easy to use, it has some drawbacks. Mainly losing the ability to hardlink (TL;DR a way for a file to exist in multiple places on the same file system while only consuming one file worth of space), or atomic move (TL;DR instant file moves, rather than copy+delete) files while processing content. - Use the optional paths if you dont understand, or dont want hardlinks/atomic moves. + Use the optional paths if you don't understand, or don't want hardlinks/atomic moves. The folks over at servarr.com wrote a good [write-up](https://wiki.servarr.com/docker-guide#consistent-and-well-planned-paths) on how to get started with this. # changelog changelogs: + - { date: "20.03.24:", desc: "Rebase to Alpine 3.19." } - { date: "06.06.23:", desc: "Rebase master to Alpine 3.18, deprecate armhf as per [https://www.linuxserver.io/armhf](https://www.linuxserver.io/armhf)." } - { date: "17.01.23:", desc: "Rebase master branch to Alpine 3.17, migrate to s6v3." } - { date: "06.06.22:", desc: "Rebase master branch to Alpine 3.15." }