haeaeae/docker-sonarr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #292 from linuxserver/develop-3.20

Browse Source 
Rebase to 3.20 (Develop)
This commit is contained in:
Adam
2024-05-26 18:39:02 +01:00
committed by GitHub
parent ca92b55eb3 89b38bfab7
commit 0d61017d0b
6 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Dockerfile
+2 -1
View File
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
FROM ghcr.io/linuxserver/baseimage-alpine:3.19
FROM ghcr.io/linuxserver/baseimage-alpine:3.20
# set version label
ARG BUILD_DATE
@@ -33,6 +33,7 @@ RUN \
/tmp/sonarr.tar.gz -C \
/app/sonarr/bin --strip-components=1 && \
echo -e "UpdateMethod=docker\nBranch=${SONARR_BRANCH}\nPackageVersion=${VERSION:-LocalBuild}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)" > /app/sonarr/package_info && \
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
echo "**** cleanup ****" && \
rm -rf \
/app/sonarr/bin/Sonarr.Update \
Dockerfile.aarch64
+2 -1
View File
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20
# set version label
ARG BUILD_DATE
@@ -33,6 +33,7 @@ RUN \
/tmp/sonarr.tar.gz -C \
/app/sonarr/bin --strip-components=1 && \
echo -e "UpdateMethod=docker\nBranch=${SONARR_BRANCH}\nPackageVersion=${VERSION:-LocalBuild}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)" > /app/sonarr/package_info && \
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
echo "**** cleanup ****" && \
rm -rf \
/app/sonarr/bin/Sonarr.Update \
Jenkinsfile
Vendored
+1 -1
View File
@@ -31,7 +31,7 @@ pipeline {
CI_PORT='8989'
CI_SSL='false'
CI_DELAY='120'
CI_DOCKERENV='TZ=US/Pacific'
CI_DOCKERENV=''
CI_AUTH=''
CI_WEBPATH='/system/status'
}
README.md
+10 -9
View File
@@ -74,7 +74,7 @@ Access the webui at `<your-ip>:8989`, for more information check out [Sonarr](ht
We have set `/tv` 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.
@@ -95,9 +95,9 @@ services:
- PGID=1000
- TZ=Etc/UTC
volumes:
- <path to data>:/config
- <path/to/tvseries>:/tv
- <path/to/downloadclient-downloads>:/downloads
- /path/to/sonarr/data:/config
- /path/to/tv:/tv
- /path/to/download-client-downloads:/downloads
ports:
- 8989:8989
restart: unless-stopped
@@ -112,9 +112,9 @@ docker run -d \
-e PGID=1000 \
-e TZ=Etc/UTC \
-p 8989:8989 \
-v <path to data>:/config \
-v <path/to/tvseries>:/tv \
-v <path/to/downloadclient-downloads>:/downloads \
-v /path/to/sonarr/data:/config \
-v /path/to/tv:/tv \
-v /path/to/download-client-downloads:/downloads \
--restart unless-stopped \
lscr.io/linuxserver/sonarr:develop
```
@@ -125,11 +125,11 @@ Containers are configured using parameters passed at runtime (such as those abov
| Parameter | Function |
| :----: | --- |
| `-p 8989` | The port for the Sonarr webinterface |
| `-p 8989` | The port for the Sonarr web interface |
| `-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). |
| `-v /config` | Database and sonarr configs |
| `-v /config` | Database and Sonarr configs |
| `-v /tv` | Location of TV library on disk |
| `-v /downloads` | Location of download managers output directory |
@@ -294,6 +294,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions
* **25.05.24:** - Rebase to Alpine 3.20.
* **12.01.24:** - Update download url.
* **30.12.23:** - Rebase to Alpine 3.19.
* **30.05.23:** - Rebase to Alpine 3.18.
jenkins-vars.yml
+1 -2
View File
@@ -7,7 +7,6 @@ custom_version_command: "curl -sX GET http://services.sonarr.tv/v1/releases | jq
release_type: prerelease
release_tag: develop
ls_branch: develop
build_armhf: false
repo_vars:
- BUILD_VERSION_ARG = 'SONARR_VERSION'
- LS_USER = 'linuxserver'
@@ -23,7 +22,7 @@ repo_vars:
- CI_PORT='8989'
- CI_SSL='false'
- CI_DELAY='120'
- CI_DOCKERENV='TZ=US/Pacific'
- CI_DOCKERENV=''
- CI_AUTH=''
- CI_WEBPATH='/system/status'
sponsor_links:
readme-vars.yml
+6 -8
View File
@@ -23,16 +23,13 @@ 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 sonarr configs" }
- { vol_path: "/tv", vol_host_path: "<path/to/tvseries>", desc: "Location of TV library on disk" }
- { vol_path: "/downloads", vol_host_path: "<path/to/downloadclient-downloads>", desc: "Location of download managers output directory" }
- { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/data", desc: "Database and Sonarr configs" }
- { vol_path: "/tv", vol_host_path: "/path/to/tv", desc: "Location of TV library on disk" }
- { vol_path: "/downloads", vol_host_path: "/path/to/download-client-downloads", desc: "Location of download managers output directory" }
param_usage_include_ports: true
param_ports:
- { external_port: "8989", internal_port: "8989", port_desc: "The port for the Sonarr webinterface" }
param_usage_include_env: false
opt_param_usage_include_env: false
- { external_port: "8989", internal_port: "8989", port_desc: "The port for the Sonarr web interface" }
# application setup block
app_setup_block_enabled: true
@@ -43,12 +40,13 @@ app_setup_block: |
We have set `/tv` 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: "25.05.24:", desc: "Rebase to Alpine 3.20." }
- { date: "12.01.24:", desc: "Update download url." }
- { date: "30.12.23:", desc: "Rebase to Alpine 3.19." }
- { date: "30.05.23:", desc: "Rebase to Alpine 3.18." }