mirror of
https://github.com/linuxserver/docker-sonarr.git
synced 2026-02-19 22:09:04 +08:00
Merge pull request #294 from linuxserver/master-3.20
Rebase to 3.20 (master)
This commit is contained in:
Adam
GitHub
commit
1c0ce3ae2c
@ -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 \
|
||||
|
||||
@ -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 \
|
||||
|
||||
4
Jenkinsfile
vendored
4
Jenkinsfile
vendored
@ -31,9 +31,9 @@ pipeline {
|
||||
CI_PORT='8989'
|
||||
CI_SSL='false'
|
||||
CI_DELAY='120'
|
||||
CI_DOCKERENV='TZ=US/Pacific'
|
||||
CI_DOCKERENV=''
|
||||
CI_AUTH=''
|
||||
CI_WEBPATH=''
|
||||
CI_WEBPATH='/system/status'
|
||||
}
|
||||
stages {
|
||||
// Setup all the basic environment variables needed for the build
|
||||
|
||||
@ -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,7 +95,7 @@ services:
|
||||
- PGID=1000
|
||||
- TZ=Etc/UTC
|
||||
volumes:
|
||||
- /path/to/data:/config
|
||||
- /path/to/sonarr/data:/config
|
||||
- /path/to/tvseries:/tv #optional
|
||||
- /path/to/downloadclient-downloads:/downloads #optional
|
||||
ports:
|
||||
@ -112,7 +112,7 @@ docker run -d \
|
||||
-e PGID=1000 \
|
||||
-e TZ=Etc/UTC \
|
||||
-p 8989:8989 \
|
||||
-v /path/to/data:/config \
|
||||
-v /path/to/sonarr/data:/config \
|
||||
-v /path/to/tvseries:/tv `#optional` \
|
||||
-v /path/to/downloadclient-downloads:/downloads `#optional` \
|
||||
--restart unless-stopped \
|
||||
@ -125,7 +125,7 @@ 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). |
|
||||
@ -294,6 +294,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
|
||||
|
||||
## Versions
|
||||
|
||||
* **31.05.24:** - Rebase Alpine 3.20.
|
||||
* **12.01.24:** - Update download url.
|
||||
* **30.12.23:** - Rebase master branch to Alpine 3.19.
|
||||
* **15.02.23:** - Rebase master branch to Jammy.
|
||||
|
||||
@ -7,7 +7,6 @@ custom_version_command: "curl -sX GET http://services.sonarr.tv/v1/releases | jq
|
||||
release_type: stable
|
||||
release_tag: latest
|
||||
ls_branch: master
|
||||
build_armhf: false
|
||||
repo_vars:
|
||||
- BUILD_VERSION_ARG = 'SONARR_VERSION'
|
||||
- LS_USER = 'linuxserver'
|
||||
@ -23,8 +22,8 @@ repo_vars:
|
||||
- CI_PORT='8989'
|
||||
- CI_SSL='false'
|
||||
- CI_DELAY='120'
|
||||
- CI_DOCKERENV='TZ=US/Pacific'
|
||||
- CI_DOCKERENV=''
|
||||
- CI_AUTH=''
|
||||
- CI_WEBPATH=''
|
||||
- CI_WEBPATH='/system/status'
|
||||
sponsor_links:
|
||||
- { name: "Sonarr", url: "https://sonarr.tv/donate" }
|
||||
|
||||
@ -23,7 +23,7 @@ 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: "/config", vol_host_path: "/path/to/{{ project_name }}/data", desc: "Database and sonarr configs" }
|
||||
|
||||
opt_param_usage_include_vols: true
|
||||
opt_param_volumes:
|
||||
@ -32,12 +32,7 @@ opt_param_volumes:
|
||||
|
||||
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
|
||||
param_env_vars:
|
||||
- { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London, this is required for Sonarr"}
|
||||
# optional env variables
|
||||
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
|
||||
@ -48,13 +43,14 @@ 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: "31.05.24:", desc: "Rebase Alpine 3.20." }
|
||||
- { date: "12.01.24:", desc: "Update download url." }
|
||||
- { date: "30.12.23:", desc: "Rebase master branch to Alpine 3.19." }
|
||||
- { date: "15.02.23:", desc: "Rebase master branch to Jammy." }
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#!/bin/bash
|
||||
|
||||
if [ -f /config/config.xml ]; then
|
||||
if [[ -f /config/config.xml ]]; then
|
||||
PORT=$(xmlstarlet sel -T -t -v /Config/Port /config/config.xml)
|
||||
fi
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user