Skip to content

Commit 259c06a

Browse files
committed
Rebase to noble
1 parent c6e9645 commit 259c06a

File tree

6 files changed

+17
-19
lines changed

6 files changed

+17
-19
lines changed

Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ghcr.io/linuxserver/unrar:latest as unrar
3+
FROM ghcr.io/linuxserver/unrar:latest AS unrar
44

5-
FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy
5+
FROM ghcr.io/linuxserver/baseimage-ubuntu:noble
66

77
# set version label
88
ARG BUILD_DATE
@@ -29,20 +29,20 @@ RUN \
2929
echo "**** install runtime packages ****" && \
3030
apt-get update && \
3131
apt-get install -y \
32-
jq \
3332
udev \
3433
wget && \
3534
echo "**** install plex ****" && \
3635
if [ -z ${PLEX_RELEASE+x} ]; then \
3736
PLEX_RELEASE=$(curl -sX GET 'https://plex.tv/api/downloads/5.json' \
38-
| jq -r '.computer.Linux.version'); \
37+
| jq -r '.computer.Linux.version'); \
3938
fi && \
4039
curl -o \
4140
/tmp/plexmediaserver.deb -L \
4241
"${PLEX_DOWNLOAD}/${PLEX_RELEASE}/debian/plexmediaserver_${PLEX_RELEASE}_${PLEX_ARCH}.deb" && \
4342
dpkg -i /tmp/plexmediaserver.deb && \
4443
echo "**** ensure abc user's home folder is /app ****" && \
4544
usermod -d /app abc && \
45+
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
4646
echo "**** cleanup ****" && \
4747
apt-get clean && \
4848
rm -rf \

Dockerfile.aarch64

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ghcr.io/linuxserver/unrar:arm64v8-latest as unrar
3+
FROM ghcr.io/linuxserver/unrar:arm64v8-latest AS unrar
44

5-
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy
5+
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-noble
66

77
# set version label
88
ARG BUILD_DATE
@@ -26,21 +26,20 @@ RUN \
2626
echo "**** install runtime packages ****" && \
2727
apt-get update && \
2828
apt-get install -y \
29-
jq \
3029
udev \
31-
unrar \
3230
wget && \
3331
echo "**** install plex ****" && \
3432
if [ -z ${PLEX_RELEASE+x} ]; then \
3533
PLEX_RELEASE=$(curl -sX GET 'https://plex.tv/api/downloads/5.json' \
36-
| jq -r '.computer.Linux.version'); \
34+
| jq -r '.computer.Linux.version'); \
3735
fi && \
3836
curl -o \
3937
/tmp/plexmediaserver.deb -L \
4038
"${PLEX_DOWNLOAD}/${PLEX_RELEASE}/debian/plexmediaserver_${PLEX_RELEASE}_${PLEX_ARCH}.deb" && \
4139
dpkg -i /tmp/plexmediaserver.deb && \
4240
echo "**** ensure abc user's home folder is /app ****" && \
4341
usermod -d /app abc && \
42+
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
4443
echo "**** cleanup ****" && \
4544
apt-get clean && \
4645
rm -rf \

Jenkinsfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ pipeline {
3333
CI_PORT='32400'
3434
CI_SSL='false'
3535
CI_DELAY='120'
36-
CI_DOCKERENV='TZ=US/Pacific'
37-
CI_AUTH='user:password'
36+
CI_DOCKERENV=''
37+
CI_AUTH=''
3838
CI_WEBPATH='/web/index.html'
3939
}
4040
stages {

README.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ services:
119119
- VERSION=docker
120120
- PLEX_CLAIM= #optional
121121
volumes:
122-
- /path/to/library:/config
122+
- /path/to/plex/library:/config
123123
- /path/to/tvseries:/tv
124124
- /path/to/movies:/movies
125125
restart: unless-stopped
@@ -136,7 +136,7 @@ docker run -d \
136136
-e TZ=Etc/UTC \
137137
-e VERSION=docker \
138138
-e PLEX_CLAIM= `#optional` \
139-
-v /path/to/library:/config \
139+
-v /path/to/plex/library:/config \
140140
-v /path/to/tvseries:/tv \
141141
-v /path/to/movies:/movies \
142142
--restart unless-stopped \
@@ -347,6 +347,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
347347

348348
## Versions
349349

350+
* **18.07.24:** - Rebase to Ubuntu Noble.
350351
* **12.02.24:** - Use universal hardware acceleration blurb
351352
* **09.01.24:** - Set ownership on TranscoderTempDirectory when it's been saved in Preferences.
352353
* **16.08.23:** - Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar).

jenkins-vars.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ repo_vars:
2323
- CI_PORT='32400'
2424
- CI_SSL='false'
2525
- CI_DELAY='120'
26-
- CI_DOCKERENV='TZ=US/Pacific'
27-
- CI_AUTH='user:password'
26+
- CI_DOCKERENV=''
27+
- CI_AUTH=''
2828
- CI_WEBPATH='/web/index.html'

readme-vars.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,14 @@ project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_
1010
available_architectures:
1111
- {arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
1212
- {arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
13-
# development version
14-
development_versions: false
1513
# container parameters
1614
common_param_env_vars_enabled: true #PGID, PUID, etc
1715
param_container_name: "{{ project_name }}"
1816
param_usage_include_vols: true
1917
param_volumes:
20-
- {vol_path: "/config", vol_host_path: "/path/to/library", desc: "Plex library location. *This can grow very large, 50gb+ is likely for a large collection.*"}
18+
- {vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/library", desc: "Plex library location. *This can grow very large, 50gb+ is likely for a large collection.*"}
2119
- {vol_path: "/tv", vol_host_path: "/path/to/tvseries", desc: "Media goes here. Add as many as needed e.g. `/movies`, `/tv`, etc."}
2220
- {vol_path: "/movies", vol_host_path: "/path/to/movies", desc: "Media goes here. Add as many as needed e.g. `/movies`, `/tv`, etc."}
23-
param_usage_include_ports: false
2421
param_usage_include_net: true
2522
param_net: "host"
2623
param_net_desc: "Use Host Networking"
@@ -77,6 +74,7 @@ app_setup_block: |
7774
readme_hwaccel: true
7875
# changelog
7976
changelogs:
77+
- {date: "18.07.24:", desc: "Rebase to Ubuntu Noble."}
8078
- {date: "12.02.24:", desc: "Use universal hardware acceleration blurb"}
8179
- {date: "09.01.24:", desc: "Set ownership on TranscoderTempDirectory when it's been saved in Preferences."}
8280
- {date: "16.08.23:", desc: "Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar)."}

0 commit comments

Comments
 (0)