From 259c06aaa957cc15f869fe54a638cd4c621d662c Mon Sep 17 00:00:00 2001 From: thespad Date: Thu, 18 Jul 2024 16:56:38 +0100 Subject: [PATCH] Rebase to noble --- Dockerfile | 8 ++++---- Dockerfile.aarch64 | 9 ++++----- Jenkinsfile | 4 ++-- README.md | 5 +++-- jenkins-vars.yml | 4 ++-- readme-vars.yml | 6 ++---- 6 files changed, 17 insertions(+), 19 deletions(-) diff --git a/Dockerfile b/Dockerfile index 36ef5db..43c7e49 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ # 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 ARG BUILD_DATE @@ -29,13 +29,12 @@ RUN \ echo "**** install runtime packages ****" && \ apt-get update && \ apt-get install -y \ - jq \ udev \ wget && \ echo "**** install plex ****" && \ if [ -z ${PLEX_RELEASE+x} ]; then \ PLEX_RELEASE=$(curl -sX GET 'https://plex.tv/api/downloads/5.json' \ - | jq -r '.computer.Linux.version'); \ + | jq -r '.computer.Linux.version'); \ fi && \ curl -o \ /tmp/plexmediaserver.deb -L \ @@ -43,6 +42,7 @@ RUN \ dpkg -i /tmp/plexmediaserver.deb && \ echo "**** ensure abc user's home folder is /app ****" && \ usermod -d /app abc && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ apt-get clean && \ rm -rf \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 3492c98..257ca96 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,8 +1,8 @@ # 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 ARG BUILD_DATE @@ -26,14 +26,12 @@ RUN \ echo "**** install runtime packages ****" && \ apt-get update && \ apt-get install -y \ - jq \ udev \ - unrar \ wget && \ echo "**** install plex ****" && \ if [ -z ${PLEX_RELEASE+x} ]; then \ PLEX_RELEASE=$(curl -sX GET 'https://plex.tv/api/downloads/5.json' \ - | jq -r '.computer.Linux.version'); \ + | jq -r '.computer.Linux.version'); \ fi && \ curl -o \ /tmp/plexmediaserver.deb -L \ @@ -41,6 +39,7 @@ RUN \ dpkg -i /tmp/plexmediaserver.deb && \ echo "**** ensure abc user's home folder is /app ****" && \ usermod -d /app abc && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ apt-get clean && \ rm -rf \ diff --git a/Jenkinsfile b/Jenkinsfile index 006613b..b2bd1ea 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -33,8 +33,8 @@ pipeline { CI_PORT='32400' CI_SSL='false' CI_DELAY='120' - CI_DOCKERENV='TZ=US/Pacific' - CI_AUTH='user:password' + CI_DOCKERENV='' + CI_AUTH='' CI_WEBPATH='/web/index.html' } stages { diff --git a/README.md b/README.md index 9f4f97e..5c2006d 100644 --- a/README.md +++ b/README.md @@ -119,7 +119,7 @@ services: - VERSION=docker - PLEX_CLAIM= #optional volumes: - - /path/to/library:/config + - /path/to/plex/library:/config - /path/to/tvseries:/tv - /path/to/movies:/movies restart: unless-stopped @@ -136,7 +136,7 @@ docker run -d \ -e TZ=Etc/UTC \ -e VERSION=docker \ -e PLEX_CLAIM= `#optional` \ - -v /path/to/library:/config \ + -v /path/to/plex/library:/config \ -v /path/to/tvseries:/tv \ -v /path/to/movies:/movies \ --restart unless-stopped \ @@ -347,6 +347,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **18.07.24:** - Rebase to Ubuntu Noble. * **12.02.24:** - Use universal hardware acceleration blurb * **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). diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 8ec8648..81f23f8 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -23,6 +23,6 @@ repo_vars: - CI_PORT='32400' - CI_SSL='false' - CI_DELAY='120' - - CI_DOCKERENV='TZ=US/Pacific' - - CI_AUTH='user:password' + - CI_DOCKERENV='' + - CI_AUTH='' - CI_WEBPATH='/web/index.html' diff --git a/readme-vars.yml b/readme-vars.yml index d37392e..705594a 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -10,17 +10,14 @@ project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_ available_architectures: - {arch: "{{ arch_x86_64 }}", tag: "amd64-latest"} - {arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"} -# development version -development_versions: false # container parameters common_param_env_vars_enabled: true #PGID, PUID, etc param_container_name: "{{ project_name }}" param_usage_include_vols: true 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: "/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_net: "host" param_net_desc: "Use Host Networking" @@ -77,6 +74,7 @@ app_setup_block: | readme_hwaccel: true # changelog changelogs: + - {date: "18.07.24:", desc: "Rebase to Ubuntu Noble."} - {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: "16.08.23:", desc: "Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar)."}