Merge pull request #395 from linuxserver/master-noble
This commit is contained in:
commit
aa902dd60b
6 changed files with 17 additions and 19 deletions
|
|
@ -1,8 +1,8 @@
|
||||||
# syntax=docker/dockerfile:1
|
# syntax=docker/dockerfile:1
|
||||||
|
|
||||||
FROM ghcr.io/linuxserver/unrar:latest as unrar
|
FROM ghcr.io/linuxserver/unrar:latest AS unrar
|
||||||
|
|
||||||
FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy
|
FROM ghcr.io/linuxserver/baseimage-ubuntu:noble
|
||||||
|
|
||||||
# set version label
|
# set version label
|
||||||
ARG BUILD_DATE
|
ARG BUILD_DATE
|
||||||
|
|
@ -29,7 +29,6 @@ RUN \
|
||||||
echo "**** install runtime packages ****" && \
|
echo "**** install runtime packages ****" && \
|
||||||
apt-get update && \
|
apt-get update && \
|
||||||
apt-get install -y \
|
apt-get install -y \
|
||||||
jq \
|
|
||||||
udev \
|
udev \
|
||||||
wget && \
|
wget && \
|
||||||
echo "**** install plex ****" && \
|
echo "**** install plex ****" && \
|
||||||
|
|
@ -43,6 +42,7 @@ RUN \
|
||||||
dpkg -i /tmp/plexmediaserver.deb && \
|
dpkg -i /tmp/plexmediaserver.deb && \
|
||||||
echo "**** ensure abc user's home folder is /app ****" && \
|
echo "**** ensure abc user's home folder is /app ****" && \
|
||||||
usermod -d /app abc && \
|
usermod -d /app abc && \
|
||||||
|
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
|
||||||
echo "**** cleanup ****" && \
|
echo "**** cleanup ****" && \
|
||||||
apt-get clean && \
|
apt-get clean && \
|
||||||
rm -rf \
|
rm -rf \
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
# syntax=docker/dockerfile:1
|
# syntax=docker/dockerfile:1
|
||||||
|
|
||||||
FROM ghcr.io/linuxserver/unrar:arm64v8-latest as unrar
|
FROM ghcr.io/linuxserver/unrar:arm64v8-latest AS unrar
|
||||||
|
|
||||||
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy
|
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-noble
|
||||||
|
|
||||||
# set version label
|
# set version label
|
||||||
ARG BUILD_DATE
|
ARG BUILD_DATE
|
||||||
|
|
@ -26,9 +26,7 @@ RUN \
|
||||||
echo "**** install runtime packages ****" && \
|
echo "**** install runtime packages ****" && \
|
||||||
apt-get update && \
|
apt-get update && \
|
||||||
apt-get install -y \
|
apt-get install -y \
|
||||||
jq \
|
|
||||||
udev \
|
udev \
|
||||||
unrar \
|
|
||||||
wget && \
|
wget && \
|
||||||
echo "**** install plex ****" && \
|
echo "**** install plex ****" && \
|
||||||
if [ -z ${PLEX_RELEASE+x} ]; then \
|
if [ -z ${PLEX_RELEASE+x} ]; then \
|
||||||
|
|
@ -41,6 +39,7 @@ RUN \
|
||||||
dpkg -i /tmp/plexmediaserver.deb && \
|
dpkg -i /tmp/plexmediaserver.deb && \
|
||||||
echo "**** ensure abc user's home folder is /app ****" && \
|
echo "**** ensure abc user's home folder is /app ****" && \
|
||||||
usermod -d /app abc && \
|
usermod -d /app abc && \
|
||||||
|
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
|
||||||
echo "**** cleanup ****" && \
|
echo "**** cleanup ****" && \
|
||||||
apt-get clean && \
|
apt-get clean && \
|
||||||
rm -rf \
|
rm -rf \
|
||||||
|
|
|
||||||
4
Jenkinsfile
vendored
4
Jenkinsfile
vendored
|
|
@ -33,8 +33,8 @@ pipeline {
|
||||||
CI_PORT='32400'
|
CI_PORT='32400'
|
||||||
CI_SSL='false'
|
CI_SSL='false'
|
||||||
CI_DELAY='120'
|
CI_DELAY='120'
|
||||||
CI_DOCKERENV='TZ=US/Pacific'
|
CI_DOCKERENV=''
|
||||||
CI_AUTH='user:password'
|
CI_AUTH=''
|
||||||
CI_WEBPATH='/web/index.html'
|
CI_WEBPATH='/web/index.html'
|
||||||
}
|
}
|
||||||
stages {
|
stages {
|
||||||
|
|
|
||||||
|
|
@ -119,7 +119,7 @@ services:
|
||||||
- VERSION=docker
|
- VERSION=docker
|
||||||
- PLEX_CLAIM= #optional
|
- PLEX_CLAIM= #optional
|
||||||
volumes:
|
volumes:
|
||||||
- /path/to/library:/config
|
- /path/to/plex/library:/config
|
||||||
- /path/to/tvseries:/tv
|
- /path/to/tvseries:/tv
|
||||||
- /path/to/movies:/movies
|
- /path/to/movies:/movies
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
@ -136,7 +136,7 @@ docker run -d \
|
||||||
-e TZ=Etc/UTC \
|
-e TZ=Etc/UTC \
|
||||||
-e VERSION=docker \
|
-e VERSION=docker \
|
||||||
-e PLEX_CLAIM= `#optional` \
|
-e PLEX_CLAIM= `#optional` \
|
||||||
-v /path/to/library:/config \
|
-v /path/to/plex/library:/config \
|
||||||
-v /path/to/tvseries:/tv \
|
-v /path/to/tvseries:/tv \
|
||||||
-v /path/to/movies:/movies \
|
-v /path/to/movies:/movies \
|
||||||
--restart unless-stopped \
|
--restart unless-stopped \
|
||||||
|
|
@ -347,6 +347,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
|
||||||
|
|
||||||
## Versions
|
## Versions
|
||||||
|
|
||||||
|
* **18.07.24:** - Rebase to Ubuntu Noble.
|
||||||
* **12.02.24:** - Use universal hardware acceleration blurb
|
* **12.02.24:** - Use universal hardware acceleration blurb
|
||||||
* **09.01.24:** - Set ownership on TranscoderTempDirectory when it's been saved in Preferences.
|
* **09.01.24:** - Set ownership on TranscoderTempDirectory when it's been saved in Preferences.
|
||||||
* **16.08.23:** - Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar).
|
* **16.08.23:** - Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar).
|
||||||
|
|
|
||||||
|
|
@ -23,6 +23,6 @@ repo_vars:
|
||||||
- CI_PORT='32400'
|
- CI_PORT='32400'
|
||||||
- CI_SSL='false'
|
- CI_SSL='false'
|
||||||
- CI_DELAY='120'
|
- CI_DELAY='120'
|
||||||
- CI_DOCKERENV='TZ=US/Pacific'
|
- CI_DOCKERENV=''
|
||||||
- CI_AUTH='user:password'
|
- CI_AUTH=''
|
||||||
- CI_WEBPATH='/web/index.html'
|
- CI_WEBPATH='/web/index.html'
|
||||||
|
|
|
||||||
|
|
@ -10,17 +10,14 @@ project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_
|
||||||
available_architectures:
|
available_architectures:
|
||||||
- {arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
|
- {arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
|
||||||
- {arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
|
- {arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
|
||||||
# development version
|
|
||||||
development_versions: false
|
|
||||||
# container parameters
|
# container parameters
|
||||||
common_param_env_vars_enabled: true #PGID, PUID, etc
|
common_param_env_vars_enabled: true #PGID, PUID, etc
|
||||||
param_container_name: "{{ project_name }}"
|
param_container_name: "{{ project_name }}"
|
||||||
param_usage_include_vols: true
|
param_usage_include_vols: true
|
||||||
param_volumes:
|
param_volumes:
|
||||||
- {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.*"}
|
- {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.*"}
|
||||||
- {vol_path: "/tv", vol_host_path: "/path/to/tvseries", desc: "Media goes here. Add as many as needed e.g. `/movies`, `/tv`, etc."}
|
- {vol_path: "/tv", vol_host_path: "/path/to/tvseries", desc: "Media goes here. Add as many as needed e.g. `/movies`, `/tv`, etc."}
|
||||||
- {vol_path: "/movies", vol_host_path: "/path/to/movies", desc: "Media goes here. Add as many as needed e.g. `/movies`, `/tv`, etc."}
|
- {vol_path: "/movies", vol_host_path: "/path/to/movies", desc: "Media goes here. Add as many as needed e.g. `/movies`, `/tv`, etc."}
|
||||||
param_usage_include_ports: false
|
|
||||||
param_usage_include_net: true
|
param_usage_include_net: true
|
||||||
param_net: "host"
|
param_net: "host"
|
||||||
param_net_desc: "Use Host Networking"
|
param_net_desc: "Use Host Networking"
|
||||||
|
|
@ -77,6 +74,7 @@ app_setup_block: |
|
||||||
readme_hwaccel: true
|
readme_hwaccel: true
|
||||||
# changelog
|
# changelog
|
||||||
changelogs:
|
changelogs:
|
||||||
|
- {date: "18.07.24:", desc: "Rebase to Ubuntu Noble."}
|
||||||
- {date: "12.02.24:", desc: "Use universal hardware acceleration blurb"}
|
- {date: "12.02.24:", desc: "Use universal hardware acceleration blurb"}
|
||||||
- {date: "09.01.24:", desc: "Set ownership on TranscoderTempDirectory when it's been saved in Preferences."}
|
- {date: "09.01.24:", desc: "Set ownership on TranscoderTempDirectory when it's been saved in Preferences."}
|
||||||
- {date: "16.08.23:", desc: "Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar)."}
|
- {date: "16.08.23:", desc: "Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar)."}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue