From e51403818d00b2c35de9527532c85046120435d2 Mon Sep 17 00:00:00 2001 From: Robert Baker <51850403+robertbaker@users.noreply.github.com> Date: Thu, 15 Aug 2019 23:30:00 -0700 Subject: [PATCH 001/514] match tv,movies path with LSIO standard --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 8ee3aa8..d9537fb 100644 --- a/README.md +++ b/README.md @@ -83,8 +83,8 @@ services: - UMASK_SET=022 #optional volumes: - :/config - - :/data/tvshows - - :/data/movies + - :/tv + - :/movies - :/transcode restart: unless-stopped ``` @@ -101,8 +101,8 @@ Container images are configured using parameters passed at runtime (such as thos | `-e VERSION=docker` | Set whether to update plex or not - see Application Setup section. | | `-e UMASK_SET=022` | control permissions of files and directories created by Plex | | `-v /config` | Plex library location. *This can grow very large, 50gb+ is likely for a large collection.* | -| `-v /data/tvshows` | Media goes here. Add as many as needed e.g. `/data/movies`, `/data/tv`, etc. | -| `-v /data/movies` | Media goes here. Add as many as needed e.g. `/data/movies`, `/data/tv`, etc. | +| `-v /tv` | Media goes here. Add as many as needed e.g. `/movies`, `/tv`, etc. | +| `-v /movies` | Media goes here. Add as many as needed e.g. `/movies`, `/tv`, etc. | | `-v /transcode` | Path for transcoding folder, *optional*. | ## Optional Parameters From ca518c4f2eda5a6355da95d4aadbc50df33d0f7e Mon Sep 17 00:00:00 2001 From: thelamer Date: Mon, 19 Aug 2019 08:39:31 -0700 Subject: [PATCH 002/514] update readme using vars --- README.md | 4 ++-- readme-vars.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index d9537fb..9978e54 100644 --- a/README.md +++ b/README.md @@ -56,8 +56,8 @@ docker create \ -e VERSION=docker \ -e UMASK_SET=022 `#optional` \ -v :/config \ - -v :/data/tvshows \ - -v :/data/movies \ + -v :/tv \ + -v :/movies \ -v :/transcode \ --restart unless-stopped \ linuxserver/plex diff --git a/readme-vars.yml b/readme-vars.yml index 4e38465..2391000 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -20,8 +20,8 @@ param_container_name: "{{ project_name }}" param_usage_include_vols: true param_volumes: - { vol_path: "/config", vol_host_path: "", desc: "Plex library location. *This can grow very large, 50gb+ is likely for a large collection.*" } - - { vol_path: "/data/tvshows", vol_host_path: "", desc: "Media goes here. Add as many as needed e.g. `/data/movies`, `/data/tv`, etc." } - - { vol_path: "/data/movies", vol_host_path: "", desc: "Media goes here. Add as many as needed e.g. `/data/movies`, `/data/tv`, etc." } + - { vol_path: "/tv", vol_host_path: "", desc: "Media goes here. Add as many as needed e.g. `/movies`, `/tv`, etc." } + - { vol_path: "/movies", vol_host_path: "", desc: "Media goes here. Add as many as needed e.g. `/movies`, `/tv`, etc." } - { vol_path: "/transcode", vol_host_path: "", desc: "Path for transcoding folder, *optional*." } param_usage_include_ports: false param_usage_include_net: true From 7c1840f02e6e33905f3897b952006bd4c015ada7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 19 Aug 2019 16:59:16 +0100 Subject: [PATCH 003/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 17ec86c..bcf9489 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -115,7 +115,7 @@ ncurses-bin6.1-1ubuntu1.18.04 openssl1.1.1-1ubuntu2.1~18.04.4 passwd1:4.5-1ubuntu2 perl-base5.26.1-6ubuntu0.3 -plexmediaserver1.16.4.1469-6d5612c2f +plexmediaserver1.16.5.1488-deeb86e7f procps2:3.3.12-3ubuntu1.1 publicsuffix20180223.1310-1 sed4.4-2 From f1c50c0bb01f67cc0a3043bbf593461fbd8d72e4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 26 Aug 2019 13:02:18 +0100 Subject: [PATCH 004/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index bcf9489..67003e0 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -115,7 +115,7 @@ ncurses-bin6.1-1ubuntu1.18.04 openssl1.1.1-1ubuntu2.1~18.04.4 passwd1:4.5-1ubuntu2 perl-base5.26.1-6ubuntu0.3 -plexmediaserver1.16.5.1488-deeb86e7f +plexmediaserver1.16.5.1554-1e5ff713d procps2:3.3.12-3ubuntu1.1 publicsuffix20180223.1310-1 sed4.4-2 From 1602f97912d433cc07d955d1946c4901875fab24 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 29 Aug 2019 06:53:30 +0200 Subject: [PATCH 005/514] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 67003e0..f3444e9 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -13,7 +13,7 @@ dash0.5.8-2.10 debconf1.5.66ubuntu1 debianutils4.8.4 diffutils1:3.6-1 -dpkg1.19.0.5ubuntu2.1 +dpkg1.19.0.5ubuntu2.2 e2fsprogs1.44.1-1ubuntu1.1 fdisk2.31.1-0.4ubuntu3.3 findutils4.6.0+git+20170828-2 @@ -64,8 +64,8 @@ libkmod224-1ubuntu3.2 libkrb5-26-heimdal7.5.0+dfsg-1 libkrb5-31.16-2ubuntu0.1 libkrb5support01.16-2ubuntu0.1 -libldap-2.4-22.4.45+dfsg-1ubuntu1.3 -libldap-common2.4.45+dfsg-1ubuntu1.3 +libldap-2.4-22.4.45+dfsg-1ubuntu1.4 +libldap-common2.4.45+dfsg-1ubuntu1.4 liblz4-10.0~r131-2ubuntu3 liblzma55.2.2-1.3 libmount12.31.1-0.4ubuntu3.3 @@ -80,7 +80,7 @@ libpam-modules1.1.8-3.6ubuntu2.18.04.1 libpam-modules-bin1.1.8-3.6ubuntu2.18.04.1 libpam-runtime1.1.8-3.6ubuntu2.18.04.1 libpcre32:8.39-9 -libprocps62:3.3.12-3ubuntu1.1 +libprocps62:3.3.12-3ubuntu1.2 libpsl50.19.1-5build1 libroken18-heimdal7.5.0+dfsg-1 librtmp12.4+20151223.gitfa8646d.1-1 @@ -104,7 +104,7 @@ libudev1237-3ubuntu10.25 libunistring20.9.9-0ubuntu2 libuuid12.31.1-0.4ubuntu3.3 libwind0-heimdal7.5.0+dfsg-1 -libzstd11.3.3+dfsg-2ubuntu1 +libzstd11.3.3+dfsg-2ubuntu1.1 locales2.27-3ubuntu1 login1:4.5-1ubuntu2 lsb-base9.20170808ubuntu1 @@ -116,7 +116,7 @@ openssl1.1.1-1ubuntu2.1~18.04.4 passwd1:4.5-1ubuntu2 perl-base5.26.1-6ubuntu0.3 plexmediaserver1.16.5.1554-1e5ff713d -procps2:3.3.12-3ubuntu1.1 +procps2:3.3.12-3ubuntu1.2 publicsuffix20180223.1310-1 sed4.4-2 sensible-utils0.0.12 From 76588a537f8c5dad8b40a39f9a61062d715031a8 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 5 Sep 2019 05:46:15 +0100 Subject: [PATCH 006/514] Bot Updating Templated Files --- Jenkinsfile | 15 +++++++++++++-- README.md | 40 +++++++++++++++++++++++++--------------- 2 files changed, 38 insertions(+), 17 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index eb632fe..5ea5ba7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -59,6 +59,14 @@ pipeline { echo none fi''', returnStdout: true).trim() + env.FUNDING_TAG = sh( + script: '''#!/bin/bash + if [ -e ./.github/FUNDING.yml ] ; then + cat ./.github/FUNDING.yml | md5sum | cut -c1-8 + else + echo none + fi''', + returnStdout: true).trim() } script{ env.LS_RELEASE_NUMBER = sh( @@ -226,15 +234,18 @@ pipeline { docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/readme linuxserver/doc-builder:latest if [ "$(md5sum ${TEMPDIR}/${LS_REPO}/Jenkinsfile | awk '{ print $1 }')" != "$(md5sum Jenkinsfile | awk '{ print $1 }')" ] || \ [ "$(md5sum ${TEMPDIR}/${CONTAINER_NAME}/README.md | awk '{ print $1 }')" != "$(md5sum README.md | awk '{ print $1 }')" ] || \ - [ "$(cat ${TEMPDIR}/${LS_REPO}/LICENSE | md5sum | cut -c1-8)" != "${LICENSE_TAG}" ]; then + [ "$(cat ${TEMPDIR}/${LS_REPO}/LICENSE | md5sum | cut -c1-8)" != "${LICENSE_TAG}" ] || \ + [ "$(cat ${TEMPDIR}/${LS_REPO}/.github/FUNDING.yml | md5sum | cut -c1-8)" != "${FUNDING_TAG}" ]; then mkdir -p ${TEMPDIR}/repo git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git checkout -f master cp ${TEMPDIR}/${CONTAINER_NAME}/README.md ${TEMPDIR}/repo/${LS_REPO}/ cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/ cp ${TEMPDIR}/docker-${CONTAINER_NAME}/LICENSE ${TEMPDIR}/repo/${LS_REPO}/ + mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.github/FUNDING.yml ${TEMPDIR}/repo/${LS_REPO}/.github/FUNDING.yml cd ${TEMPDIR}/repo/${LS_REPO}/ - git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git add Jenkinsfile README.md LICENSE + git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git add Jenkinsfile README.md LICENSE ./.github/FUNDING.yml git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git commit -m 'Bot Updating Templated Files' git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} diff --git a/README.md b/README.md index 9978e54..d27a122 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,12 @@ [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io) +[![Blog](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!") +[![Discord](https://img.shields.io/discord/354974912613449730.svg?style=flat-square&color=E68523&label=Discord&logo=discord&logoColor=FFFFFF)](https://discord.gg/YWrKVTn "realtime support / chat with the community and the team.") +[![Discourse](https://img.shields.io/discourse/https/discourse.linuxserver.io/topics.svg?style=flat-square&color=E68523&logo=discourse&logoColor=FFFFFF)](https://discourse.linuxserver.io "post on our community forum.") +[![Fleet](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Fleet)](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.") +[![Podcast](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Podcast)](https://anchor.fm/linuxserverio "on hiatus. Coming back soon (late 2018).") +[![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?style=flat-square&color=E68523&label=Open%20Collective%20Supporters)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget") + The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring :- * regular and timely application updates @@ -9,17 +16,20 @@ The [LinuxServer.io](https://linuxserver.io) team brings you another container r * regular security updates Find us at: -* [Discord](https://discord.gg/YWrKVTn) - realtime support / chat with the community and the team. -* [IRC](https://irc.linuxserver.io) - on freenode at `#linuxserver.io`. Our primary support channel is Discord. * [Blog](https://blog.linuxserver.io) - all the things you can do with our containers including How-To guides, opinions and much more! +* [Discord](https://discord.gg/YWrKVTn) - realtime support / chat with the community and the team. +* [Discourse](https://discourse.linuxserver.io) - post on our community forum. +* [Fleet](https://fleet.linuxserver.io) - an online web interface which displays all of our maintained images. +* [Podcast](https://anchor.fm/linuxserverio) - on hiatus. Coming back soon (late 2018). +* [Open Collective](https://opencollective.com/linuxserver) - please consider helping us by either donating or contributing to our budget # [linuxserver/plex](https://github.com/linuxserver/docker-plex) -[![](https://img.shields.io/discord/354974912613449730.svg?logo=discord&label=LSIO%20Discord&style=flat-square)](https://discord.gg/YWrKVTn) -[![](https://images.microbadger.com/badges/version/linuxserver/plex.svg)](https://microbadger.com/images/linuxserver/plex "Get your own version badge on microbadger.com") -[![](https://images.microbadger.com/badges/image/linuxserver/plex.svg)](https://microbadger.com/images/linuxserver/plex "Get your own version badge on microbadger.com") -![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/plex.svg) -![Docker Stars](https://img.shields.io/docker/stars/linuxserver/plex.svg) -[![Build Status](https://ci.linuxserver.io/buildStatus/icon?job=Docker-Pipeline-Builders/docker-plex/master)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-plex/job/master/) +[![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-plex.svg?style=flat-square&color=E68523)](https://github.com/linuxserver/docker-plex/releases) +[![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/plex.svg?style=flat-square&color=E68523)](https://microbadger.com/images/linuxserver/plex "Get your own version badge on microbadger.com") +[![MicroBadger Size](https://img.shields.io/microbadger/image-size/linuxserver/plex.svg?style=flat-square&color=E68523)](https://microbadger.com/images/linuxserver/plex "Get your own version badge on microbadger.com") +[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/plex.svg?style=flat-square&color=E68523)](https://hub.docker.com/r/linuxserver/plex) +[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/plex.svg?style=flat-square&color=E68523)](https://hub.docker.com/r/linuxserver/plex) +[![Build Status](https://ci.linuxserver.io/view/all/job/Docker-Pipeline-Builders/job/docker-plex/job/master/badge/icon?style=flat-square)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-plex/job/master/) [![](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/plex/latest/badge.svg)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/plex/latest/index.html) [Plex](https://plex.tv) organizes video, music and photos from personal media libraries and streams them to smart TVs, streaming boxes and mobile devices. This container is packaged as a standalone Plex Media Server. has always been a top priority. Straightforward design and bulk actions mean getting things done faster. @@ -28,7 +38,7 @@ Find us at: ## Supported Architectures -Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/). +Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/). Simply pulling `linuxserver/plex` should retrieve the correct image for your arch, but you can also pull specific arch images via tags. @@ -176,17 +186,17 @@ We automatically add the necessary environment variable that will utilise all th * Shell access whilst the container is running: `docker exec -it plex /bin/bash` * To monitor the logs of the container in realtime: `docker logs -f plex` -* container version number +* container version number * `docker inspect -f '{{ index .Config.Labels "build_version" }}' plex` * image version number * `docker inspect -f '{{ index .Config.Labels "build_version" }}' linuxserver/plex` ## Updating Info -Most of our images are static, versioned, and require an image update and container recreation to update the app inside. With some exceptions (ie. nextcloud, plex), we do not recommend or support updating apps inside the container. Please consult the [Application Setup](#application-setup) section above to see if it is recommended for the image. - -Below are the instructions for updating containers: - +Most of our images are static, versioned, and require an image update and container recreation to update the app inside. With some exceptions (ie. nextcloud, plex), we do not recommend or support updating apps inside the container. Please consult the [Application Setup](#application-setup) section above to see if it is recommended for the image. + +Below are the instructions for updating containers: + ### Via Docker Run/Create * Update the image: `docker pull linuxserver/plex` * Stop the running container: `docker stop plex` @@ -217,7 +227,7 @@ Below are the instructions for updating containers: ## Building locally -If you want to make local modifications to these images for development purposes or just to customize the logic: +If you want to make local modifications to these images for development purposes or just to customize the logic: ``` git clone https://github.com/linuxserver/docker-plex.git cd docker-plex From b76c5ff92701f18b56f7a97da410e2369685fb31 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 5 Sep 2019 05:47:13 +0100 Subject: [PATCH 007/514] Bot Updating Templated Files --- .github/FUNDING.yml | 1 + 1 file changed, 1 insertion(+) create mode 100755 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100755 index 0000000..7972213 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1 @@ +open_collective: linuxserver From e87291f1ea09928705811de94370ca5fa26e31a6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 5 Sep 2019 00:53:59 -0400 Subject: [PATCH 008/514] Bot Updating Package Versions --- package_versions.txt | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index f3444e9..42d3176 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -4,7 +4,7 @@ apt-utils1.6.11 base-files10.1ubuntu2.6 base-passwd3.5.44 bash4.4.18-2ubuntu1.2 -bsdutils1:2.31.1-0.4ubuntu3.3 +bsdutils1:2.31.1-0.4ubuntu3.4 bzip21.0.6-8.1ubuntu0.2 ca-certificates20180409 coreutils8.28-1ubuntu1 @@ -15,7 +15,7 @@ debianutils4.8.4 diffutils1:3.6-1 dpkg1.19.0.5ubuntu2.2 e2fsprogs1.44.1-1ubuntu1.1 -fdisk2.31.1-0.4ubuntu3.3 +fdisk2.31.1-0.4ubuntu3.4 findutils4.6.0+git+20170828-2 gcc-8-base8.3.0-6ubuntu1~18.04.1 gpgv2.2.4-1ubuntu1.2 @@ -32,7 +32,7 @@ libasn1-8-heimdal7.5.0+dfsg-1 libattr11:2.4.47-2build1 libaudit11:2.8.2-1ubuntu1 libaudit-common1:2.8.2-1ubuntu1 -libblkid12.31.1-0.4ubuntu3.3 +libblkid12.31.1-0.4ubuntu3.4 libbz2-1.01.0.6-8.1ubuntu0.2 libc62.27-3ubuntu1 libcap-ng00.7.7-3.1 @@ -42,7 +42,7 @@ libcurl47.58.0-2ubuntu3.7 libdb5.35.3.28-13.1ubuntu1.1 libdebconfclient00.213ubuntu1 libext2fs21.44.1-1ubuntu1.1 -libfdisk12.31.1-0.4ubuntu3.3 +libfdisk12.31.1-0.4ubuntu3.4 libffi63.2.1-8 libgcc11:8.3.0-6ubuntu1~18.04.1 libgcrypt201.8.1-4ubuntu1.1 @@ -68,7 +68,7 @@ libldap-2.4-22.4.45+dfsg-1ubuntu1.4 libldap-common2.4.45+dfsg-1ubuntu1.4 liblz4-10.0~r131-2ubuntu3 liblzma55.2.2-1.3 -libmount12.31.1-0.4ubuntu3.3 +libmount12.31.1-0.4ubuntu3.4 libncurses56.1-1ubuntu1.18.04 libncursesw56.1-1ubuntu1.18.04 libnettle63.4-1 @@ -92,24 +92,24 @@ libselinux12.7-2build2 libsemanage12.7-2build2 libsemanage-common2.7-2build2 libsepol12.7-1 -libsmartcols12.31.1-0.4ubuntu3.3 +libsmartcols12.31.1-0.4ubuntu3.4 libsqlite3-03.22.0-1ubuntu0.1 libss21.44.1-1ubuntu1.1 libssl1.11.1.1-1ubuntu2.1~18.04.4 libstdc++68.3.0-6ubuntu1~18.04.1 -libsystemd0237-3ubuntu10.25 +libsystemd0237-3ubuntu10.28 libtasn1-64.13-2 libtinfo56.1-1ubuntu1.18.04 -libudev1237-3ubuntu10.25 +libudev1237-3ubuntu10.28 libunistring20.9.9-0ubuntu2 -libuuid12.31.1-0.4ubuntu3.3 +libuuid12.31.1-0.4ubuntu3.4 libwind0-heimdal7.5.0+dfsg-1 libzstd11.3.3+dfsg-2ubuntu1.1 locales2.27-3ubuntu1 login1:4.5-1ubuntu2 lsb-base9.20170808ubuntu1 mawk1.3.3-17ubuntu3 -mount2.31.1-0.4ubuntu3.3 +mount2.31.1-0.4ubuntu3.4 ncurses-base6.1-1ubuntu1.18.04 ncurses-bin6.1-1ubuntu1.18.04 openssl1.1.1-1ubuntu2.1~18.04.4 @@ -124,8 +124,8 @@ sysvinit-utils2.88dsf-59.10ubuntu1 tar1.29b-2ubuntu0.1 tzdata2019b-0ubuntu0.18.04 ubuntu-keyring2018.09.18.1~18.04.0 -udev237-3ubuntu10.25 +udev237-3ubuntu10.28 unrar1:5.5.8-1 -util-linux2.31.1-0.4ubuntu3.3 +util-linux2.31.1-0.4ubuntu3.4 wget1.19.4-1ubuntu2.2 zlib1g1:1.2.11.dfsg-0ubuntu2 From f22dc94338eca41a8b74a16c90bc846c7d704106 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 12 Sep 2019 00:51:37 -0400 Subject: [PATCH 009/514] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 42d3176..d011760 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -8,7 +8,7 @@ bsdutils1:2.31.1-0.4ubuntu3.4 bzip21.0.6-8.1ubuntu0.2 ca-certificates20180409 coreutils8.28-1ubuntu1 -curl7.58.0-2ubuntu3.7 +curl7.58.0-2ubuntu3.8 dash0.5.8-2.10 debconf1.5.66ubuntu1 debianutils4.8.4 @@ -38,7 +38,7 @@ libc62.27-3ubuntu1 libcap-ng00.7.7-3.1 libc-bin2.27-3ubuntu1 libcom-err21.44.1-1ubuntu1.1 -libcurl47.58.0-2ubuntu3.7 +libcurl47.58.0-2ubuntu3.8 libdb5.35.3.28-13.1ubuntu1.1 libdebconfclient00.213ubuntu1 libext2fs21.44.1-1ubuntu1.1 @@ -100,7 +100,7 @@ libstdc++68.3.0-6ubuntu1~18.04.1 libsystemd0237-3ubuntu10.28 libtasn1-64.13-2 libtinfo56.1-1ubuntu1.18.04 -libudev1237-3ubuntu10.28 +libudev1237-3ubuntu10.29 libunistring20.9.9-0ubuntu2 libuuid12.31.1-0.4ubuntu3.4 libwind0-heimdal7.5.0+dfsg-1 @@ -124,7 +124,7 @@ sysvinit-utils2.88dsf-59.10ubuntu1 tar1.29b-2ubuntu0.1 tzdata2019b-0ubuntu0.18.04 ubuntu-keyring2018.09.18.1~18.04.0 -udev237-3ubuntu10.28 +udev237-3ubuntu10.29 unrar1:5.5.8-1 util-linux2.31.1-0.4ubuntu3.4 wget1.19.4-1ubuntu2.2 From 06be423a83b7699bb8bbbb758807253411bcc04e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 16 Sep 2019 19:00:15 -0400 Subject: [PATCH 010/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index d011760..8ce0953 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -115,7 +115,7 @@ ncurses-bin6.1-1ubuntu1.18.04 openssl1.1.1-1ubuntu2.1~18.04.4 passwd1:4.5-1ubuntu2 perl-base5.26.1-6ubuntu0.3 -plexmediaserver1.16.5.1554-1e5ff713d +plexmediaserver1.16.6.1592-b9d49bdb7 procps2:3.3.12-3ubuntu1.2 publicsuffix20180223.1310-1 sed4.4-2 From 66046f95827bd9a8e42082851d520f5dd332fde8 Mon Sep 17 00:00:00 2001 From: aptalca Date: Tue, 17 Sep 2019 12:55:06 -0400 Subject: [PATCH 011/514] add abc to all video and render groups --- root/etc/cont-init.d/50-gid-video | 43 ++++++++++++++----------------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/root/etc/cont-init.d/50-gid-video b/root/etc/cont-init.d/50-gid-video index b643dc2..96736a1 100755 --- a/root/etc/cont-init.d/50-gid-video +++ b/root/etc/cont-init.d/50-gid-video @@ -3,32 +3,29 @@ # check for the existence of a video and/or tuner device if [ -e /dev/dri ] || [ -e /dev/dvb ]; then if [ -e /dev/dri ]; then - VIDEO_GID=$(stat -c '%g' /dev/dri/* | grep -v '^0$' | head -n 1) - else - VIDEO_GID=$(stat -c '%g' /dev/dvb/* | grep -v '^0$' | head -n 1) + FILES="${FILES} /dev/dri/*" fi - # just add abc to root if stuff in dri/dvb is root owned - if [ -z "${VIDEO_GID}" ]; then - usermod -a -G root abc - exit 0 + if [ -e /dev/dvb ]; then + FILES="${FILES} /dev/dvb/*" fi else exit 0 fi -# Check if this GID matches the current abc user -ABCGID=$(getent group abc | awk -F: '{print $3}') -if [ "${ABCGID}" == "${VIDEO_GID}" ]; then - exit 0 -fi - -# Check if the GID is taken and swap to 65533 -CURRENT=$(getent group ${VIDEO_GID} | awk -F: '{print $1}') -if [ -z "${CURRENT}" ] || [ "${CURRENT}" == 'video' ]; then - groupmod -g ${VIDEO_GID} video - usermod -a -G video abc -else - groupmod -g 65533 ${CURRENT} - groupmod -g ${VIDEO_GID} video - usermod -a -G video abc -fi +for i in $FILES +do + VIDEO_GID=$(stat -c '%g' "$i") + if ! id -G abc | grep -qw "$VIDEO_GID"; then + if [ "${VIDEO_GID}" == '0' ]; then + usermod -a -G root abc + else + VIDEO_NAME=$(getent group "${VIDEO_GID}" | awk -F: '{print $1}') + if [ -z "${VIDEO_NAME}" ]; then + VIDEO_NAME="video$(head /dev/urandom | tr -dc 0-9 | head -c4)" + groupadd "$VIDEO_NAME" + groupmod -g "$VIDEO_GID" "$VIDEO_NAME" + fi + usermod -a -G "$VIDEO_NAME" abc + fi + fi +done \ No newline at end of file From baa34948d86fc9ca99b06af42a3035aaacef60ad Mon Sep 17 00:00:00 2001 From: aptalca Date: Wed, 18 Sep 2019 11:32:00 -0400 Subject: [PATCH 012/514] improve logic for root owned devices --- root/etc/cont-init.d/50-gid-video | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/root/etc/cont-init.d/50-gid-video b/root/etc/cont-init.d/50-gid-video index 96736a1..74e8050 100755 --- a/root/etc/cont-init.d/50-gid-video +++ b/root/etc/cont-init.d/50-gid-video @@ -15,10 +15,10 @@ fi for i in $FILES do VIDEO_GID=$(stat -c '%g' "$i") - if ! id -G abc | grep -qw "$VIDEO_GID"; then - if [ "${VIDEO_GID}" == '0' ]; then - usermod -a -G root abc - else + if id -G abc | grep -qw "$VIDEO_GID"; then + touch /groupadd + else + if [ ! "${VIDEO_GID}" == '0' ]; then VIDEO_NAME=$(getent group "${VIDEO_GID}" | awk -F: '{print $1}') if [ -z "${VIDEO_NAME}" ]; then VIDEO_NAME="video$(head /dev/urandom | tr -dc 0-9 | head -c4)" @@ -26,6 +26,11 @@ do groupmod -g "$VIDEO_GID" "$VIDEO_NAME" fi usermod -a -G "$VIDEO_NAME" abc + touch /groupadd fi fi -done \ No newline at end of file +done + +if [ ! -z "${FILES}" ] && [ ! -f "/groupadd" ]; then + usermod -a -G root abc +fi \ No newline at end of file From 177088c2988aa610d0a5b81a3525e08e40d79b36 Mon Sep 17 00:00:00 2001 From: thelamer Date: Wed, 18 Sep 2019 09:12:00 -0700 Subject: [PATCH 013/514] decrease chance of collision if we are setting multiple group names --- root/etc/cont-init.d/50-gid-video | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root/etc/cont-init.d/50-gid-video b/root/etc/cont-init.d/50-gid-video index 74e8050..c3d7f67 100755 --- a/root/etc/cont-init.d/50-gid-video +++ b/root/etc/cont-init.d/50-gid-video @@ -21,7 +21,7 @@ do if [ ! "${VIDEO_GID}" == '0' ]; then VIDEO_NAME=$(getent group "${VIDEO_GID}" | awk -F: '{print $1}') if [ -z "${VIDEO_NAME}" ]; then - VIDEO_NAME="video$(head /dev/urandom | tr -dc 0-9 | head -c4)" + VIDEO_NAME="video$(head /dev/urandom | tr -dc 'a-zA-Z0-9' | head -c8)" groupadd "$VIDEO_NAME" groupmod -g "$VIDEO_GID" "$VIDEO_NAME" fi @@ -33,4 +33,4 @@ done if [ ! -z "${FILES}" ] && [ ! -f "/groupadd" ]; then usermod -a -G root abc -fi \ No newline at end of file +fi From b01cd522f1b5e41763e4943fc6df30e0de97a263 Mon Sep 17 00:00:00 2001 From: thelamer Date: Wed, 18 Sep 2019 17:27:28 -0700 Subject: [PATCH 014/514] optmizations from @nemchik --- root/etc/cont-init.d/50-gid-video | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/root/etc/cont-init.d/50-gid-video b/root/etc/cont-init.d/50-gid-video index c3d7f67..8e0dec3 100755 --- a/root/etc/cont-init.d/50-gid-video +++ b/root/etc/cont-init.d/50-gid-video @@ -1,16 +1,6 @@ #!/usr/bin/with-contenv bash -# check for the existence of a video and/or tuner device -if [ -e /dev/dri ] || [ -e /dev/dvb ]; then - if [ -e /dev/dri ]; then - FILES="${FILES} /dev/dri/*" - fi - if [ -e /dev/dvb ]; then - FILES="${FILES} /dev/dvb/*" - fi -else - exit 0 -fi +FILES=$(find /dev/dri /dev/dvb -type c -print 2>/dev/null) for i in $FILES do @@ -31,6 +21,6 @@ do fi done -if [ ! -z "${FILES}" ] && [ ! -f "/groupadd" ]; then +if [ -n "${FILES}" ] && [ ! -f "/groupadd" ]; then usermod -a -G root abc fi From d98506e71de7dfeae463132ec0625eaa7fffc09e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 19 Sep 2019 05:48:53 +0100 Subject: [PATCH 015/514] Bot Updating Package Versions --- package_versions.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 8ce0953..03f1d79 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,6 +1,6 @@ adduser3.116ubuntu1 -apt1.6.11 -apt-utils1.6.11 +apt1.6.12 +apt-utils1.6.12 base-files10.1ubuntu2.6 base-passwd3.5.44 bash4.4.18-2ubuntu1.2 @@ -26,8 +26,8 @@ init-system-helpers1.51 jq1.5+dfsg-2 krb5-locales1.16-2ubuntu0.1 libacl12.2.52-3build1 -libapt-inst2.01.6.11 -libapt-pkg5.01.6.11 +libapt-inst2.01.6.12 +libapt-pkg5.01.6.12 libasn1-8-heimdal7.5.0+dfsg-1 libattr11:2.4.47-2build1 libaudit11:2.8.2-1ubuntu1 @@ -97,7 +97,7 @@ libsqlite3-03.22.0-1ubuntu0.1 libss21.44.1-1ubuntu1.1 libssl1.11.1.1-1ubuntu2.1~18.04.4 libstdc++68.3.0-6ubuntu1~18.04.1 -libsystemd0237-3ubuntu10.28 +libsystemd0237-3ubuntu10.29 libtasn1-64.13-2 libtinfo56.1-1ubuntu1.18.04 libudev1237-3ubuntu10.29 From 9e611a50c492d5a997a2f21b997d29b238b061a6 Mon Sep 17 00:00:00 2001 From: Steffen Fredriksen Date: Sun, 1 Sep 2019 21:08:55 +0200 Subject: [PATCH 016/514] Make sure we expose the same ports as plex --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 924882e..7610c3a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -57,5 +57,5 @@ RUN \ COPY root/ / # ports and volumes -EXPOSE 32400 32400/udp 32469 32469/udp 5353/udp 1900/udp +EXPOSE 32400/tcp 3005/tcp 8324/tcp 32469/tcp 1900/udp 32410/udp 32412/udp 32413/udp 32414/udp VOLUME /config /transcode From 0fbeb599d5686eb6c0c846bbce55f5b2f83e4df1 Mon Sep 17 00:00:00 2001 From: thelamer Date: Mon, 23 Sep 2019 22:05:44 -0700 Subject: [PATCH 017/514] sync up ports across dockerfiles --- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 6a6f66a..a9d1305 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -54,5 +54,5 @@ RUN \ COPY root/ / # ports and volumes -EXPOSE 32400 32400/udp 32469 32469/udp 5353/udp 1900/udp +EXPOSE 32400/tcp 3005/tcp 8324/tcp 32469/tcp 1900/udp 32410/udp 32412/udp 32413/udp 32414/udp VOLUME /config /transcode diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 1ebf0f8..eae127e 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -54,5 +54,5 @@ RUN \ COPY root/ / # ports and volumes -EXPOSE 32400 32400/udp 32469 32469/udp 5353/udp 1900/udp +EXPOSE 32400/tcp 3005/tcp 8324/tcp 32469/tcp 1900/udp 32410/udp 32412/udp 32413/udp 32414/udp VOLUME /config /transcode From 6c1ecf7b495b0e94b5e6f51d8ec52c6026c4e618 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 24 Sep 2019 18:59:11 -0400 Subject: [PATCH 018/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 03f1d79..b502680 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -115,7 +115,7 @@ ncurses-bin6.1-1ubuntu1.18.04 openssl1.1.1-1ubuntu2.1~18.04.4 passwd1:4.5-1ubuntu2 perl-base5.26.1-6ubuntu0.3 -plexmediaserver1.16.6.1592-b9d49bdb7 +plexmediaserver1.17.0.1709-982421575 procps2:3.3.12-3ubuntu1.2 publicsuffix20180223.1310-1 sed4.4-2 From dc0083bda2156ff22559efec332c820ea6787a58 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 1 Oct 2019 10:58:41 +0100 Subject: [PATCH 019/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index b502680..a969d03 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -115,7 +115,7 @@ ncurses-bin6.1-1ubuntu1.18.04 openssl1.1.1-1ubuntu2.1~18.04.4 passwd1:4.5-1ubuntu2 perl-base5.26.1-6ubuntu0.3 -plexmediaserver1.17.0.1709-982421575 +plexmediaserver1.17.0.1841-d42cfa161 procps2:3.3.12-3ubuntu1.2 publicsuffix20180223.1310-1 sed4.4-2 From 9029de170d430c9c10b9608c2b53b8a695ff8944 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 3 Oct 2019 05:53:31 +0100 Subject: [PATCH 020/514] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index a969d03..9e12e96 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -13,13 +13,13 @@ dash0.5.8-2.10 debconf1.5.66ubuntu1 debianutils4.8.4 diffutils1:3.6-1 -dpkg1.19.0.5ubuntu2.2 -e2fsprogs1.44.1-1ubuntu1.1 +dpkg1.19.0.5ubuntu2.3 +e2fsprogs1.44.1-1ubuntu1.2 fdisk2.31.1-0.4ubuntu3.4 findutils4.6.0+git+20170828-2 gcc-8-base8.3.0-6ubuntu1~18.04.1 gpgv2.2.4-1ubuntu1.2 -grep3.1-2 +grep3.1-2build1 gzip1.6-5ubuntu1 hostname3.20 init-system-helpers1.51 @@ -37,11 +37,11 @@ libbz2-1.01.0.6-8.1ubuntu0.2 libc62.27-3ubuntu1 libcap-ng00.7.7-3.1 libc-bin2.27-3ubuntu1 -libcom-err21.44.1-1ubuntu1.1 +libcom-err21.44.1-1ubuntu1.2 libcurl47.58.0-2ubuntu3.8 libdb5.35.3.28-13.1ubuntu1.1 libdebconfclient00.213ubuntu1 -libext2fs21.44.1-1ubuntu1.1 +libext2fs21.44.1-1ubuntu1.2 libfdisk12.31.1-0.4ubuntu3.4 libffi63.2.1-8 libgcc11:8.3.0-6ubuntu1~18.04.1 @@ -94,7 +94,7 @@ libsemanage-common2.7-2build2 libsepol12.7-1 libsmartcols12.31.1-0.4ubuntu3.4 libsqlite3-03.22.0-1ubuntu0.1 -libss21.44.1-1ubuntu1.1 +libss21.44.1-1ubuntu1.2 libssl1.11.1.1-1ubuntu2.1~18.04.4 libstdc++68.3.0-6ubuntu1~18.04.1 libsystemd0237-3ubuntu10.29 From 60c7abbeced5e70a8af603c16082a1bce5a76509 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 9 Oct 2019 14:56:06 -0400 Subject: [PATCH 021/514] Bot Updating Templated Files --- Jenkinsfile | 52 +++++++++++++++++++--------------------------------- 1 file changed, 19 insertions(+), 33 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5ea5ba7..bdf7cc9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,6 +2,10 @@ pipeline { agent { label 'X86-64-MULTI' } + options { + buildDiscarder(logRotator(numToKeepStr: '10', daysToKeepStr: '60')) + parallelsAlwaysFailFast() + } // Input to determine if this is a package check parameters { string(defaultValue: 'false', description: 'package check run', name: 'PACKAGE_CHECK') @@ -51,22 +55,7 @@ pipeline { env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/' env.PULL_REQUEST = env.CHANGE_ID - env.LICENSE_TAG = sh( - script: '''#!/bin/bash - if [ -e LICENSE ] ; then - cat LICENSE | md5sum | cut -c1-8 - else - echo none - fi''', - returnStdout: true).trim() - env.FUNDING_TAG = sh( - script: '''#!/bin/bash - if [ -e ./.github/FUNDING.yml ] ; then - cat ./.github/FUNDING.yml | md5sum | cut -c1-8 - else - echo none - fi''', - returnStdout: true).trim() + env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE.md ./.github/PULL_REQUEST_TEMPLATE.md' } script{ env.LS_RELEASE_NUMBER = sh( @@ -230,35 +219,32 @@ pipeline { TEMPDIR=$(mktemp -d) docker pull linuxserver/jenkins-builder:latest docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest - docker pull linuxserver/doc-builder:latest - docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/readme linuxserver/doc-builder:latest - if [ "$(md5sum ${TEMPDIR}/${LS_REPO}/Jenkinsfile | awk '{ print $1 }')" != "$(md5sum Jenkinsfile | awk '{ print $1 }')" ] || \ - [ "$(md5sum ${TEMPDIR}/${CONTAINER_NAME}/README.md | awk '{ print $1 }')" != "$(md5sum README.md | awk '{ print $1 }')" ] || \ - [ "$(cat ${TEMPDIR}/${LS_REPO}/LICENSE | md5sum | cut -c1-8)" != "${LICENSE_TAG}" ] || \ - [ "$(cat ${TEMPDIR}/${LS_REPO}/.github/FUNDING.yml | md5sum | cut -c1-8)" != "${FUNDING_TAG}" ]; then + CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) + cd ${TEMPDIR}/docker-${CONTAINER_NAME} + NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) + if [[ "${CURRENTHASH}" != "${NEWHASH}" ]]; then mkdir -p ${TEMPDIR}/repo git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} - git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git checkout -f master - cp ${TEMPDIR}/${CONTAINER_NAME}/README.md ${TEMPDIR}/repo/${LS_REPO}/ - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/ - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/LICENSE ${TEMPDIR}/repo/${LS_REPO}/ + cd ${TEMPDIR}/repo/${LS_REPO} + git checkout -f master + cd ${TEMPDIR}/docker-${CONTAINER_NAME} mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.github/FUNDING.yml ${TEMPDIR}/repo/${LS_REPO}/.github/FUNDING.yml + cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ cd ${TEMPDIR}/repo/${LS_REPO}/ - git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git add Jenkinsfile README.md LICENSE ./.github/FUNDING.yml - git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git commit -m 'Bot Updating Templated Files' - git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all + git add ${TEMPLATED_FILES} + git commit -m 'Bot Updating Templated Files' + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} else echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} fi mkdir -p ${TEMPDIR}/gitbook git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/gitbook/docker-documentation - if [[ "${BRANCH_NAME}" == "master" ]] && [[ (! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then - cp ${TEMPDIR}/${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/ + if [[ "${BRANCH_NAME}" == "master" ]] && [[ (! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/ cd ${TEMPDIR}/gitbook/docker-documentation/ git add images/docker-${CONTAINER_NAME}.md - git commit -m 'Bot Updating Templated Files' + git commit -m 'Bot Updating Documentation' git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git --all fi rm -Rf ${TEMPDIR}''' From 6b66071261966893aa44dffe25de3bc796140147 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 9 Oct 2019 19:56:58 +0100 Subject: [PATCH 022/514] Bot Updating Templated Files --- .github/ISSUE_TEMPLATE.md | 37 +++++++++++++++++++++----------- .github/PULL_REQUEST_TEMPLATE.md | 30 +++++++++++++++++++++++--- 2 files changed, 52 insertions(+), 15 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index c73c33b..01a2c15 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,21 +1,34 @@ - - [linuxserverurl]: https://linuxserver.io [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl] - - +If you are new to Docker or this application our issue tracker is **ONLY** used for reporting bugs or requesting features. Please use [our discord server](https://discord.gg/YWrKVTn) for general support. - - - - + +------------------------------ - +## Expected Behavior + - - +## Current Behavior + -## Thanks, team linuxserver.io +## Steps to Reproduce + + +1. +2. +3. +4. +## Environment +**OS:** +**CPU architecture:** x86_64/arm32/arm64 +**How docker service was installed:** + + +## Command used to create docker container (run/create/compose/screenshot) + + +## Docker logs + diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index f6a6381..26d5031 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -6,10 +6,34 @@ - + + - + -## Thanks, team linuxserver.io + + + + + + +------------------------------ + +We welcome all PR’s though this doesn’t guarantee it will be accepted. + +## Description: + + +## Benefits of this PR and context: + + +## How Has This Been Tested? + + + + + +## Source / References: + From 06d4e0f9655daf5e4fbd86d80a98a0467c8c7e29 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 9 Oct 2019 15:00:36 -0400 Subject: [PATCH 023/514] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 9e12e96..26cabf9 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -115,14 +115,14 @@ ncurses-bin6.1-1ubuntu1.18.04 openssl1.1.1-1ubuntu2.1~18.04.4 passwd1:4.5-1ubuntu2 perl-base5.26.1-6ubuntu0.3 -plexmediaserver1.17.0.1841-d42cfa161 +plexmediaserver1.18.0.1913-e5cc93306 procps2:3.3.12-3ubuntu1.2 publicsuffix20180223.1310-1 sed4.4-2 sensible-utils0.0.12 sysvinit-utils2.88dsf-59.10ubuntu1 tar1.29b-2ubuntu0.1 -tzdata2019b-0ubuntu0.18.04 +tzdata2019c-0ubuntu0.18.04 ubuntu-keyring2018.09.18.1~18.04.0 udev237-3ubuntu10.29 unrar1:5.5.8-1 From c7f70017ccb5fde99829fb5f90a21e0260188ca0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 10 Oct 2019 00:55:03 -0400 Subject: [PATCH 024/514] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 26cabf9..9ae73fd 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -100,7 +100,7 @@ libstdc++68.3.0-6ubuntu1~18.04.1 libsystemd0237-3ubuntu10.29 libtasn1-64.13-2 libtinfo56.1-1ubuntu1.18.04 -libudev1237-3ubuntu10.29 +libudev1237-3ubuntu10.31 libunistring20.9.9-0ubuntu2 libuuid12.31.1-0.4ubuntu3.4 libwind0-heimdal7.5.0+dfsg-1 @@ -124,7 +124,7 @@ sysvinit-utils2.88dsf-59.10ubuntu1 tar1.29b-2ubuntu0.1 tzdata2019c-0ubuntu0.18.04 ubuntu-keyring2018.09.18.1~18.04.0 -udev237-3ubuntu10.29 +udev237-3ubuntu10.31 unrar1:5.5.8-1 util-linux2.31.1-0.4ubuntu3.4 wget1.19.4-1ubuntu2.2 From 847ecf447c3ae72724920f032bdbde8f456edf8f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 14 Oct 2019 06:59:15 -0400 Subject: [PATCH 025/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 9ae73fd..309e391 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -115,7 +115,7 @@ ncurses-bin6.1-1ubuntu1.18.04 openssl1.1.1-1ubuntu2.1~18.04.4 passwd1:4.5-1ubuntu2 perl-base5.26.1-6ubuntu0.3 -plexmediaserver1.18.0.1913-e5cc93306 +plexmediaserver1.18.0.1944-f2cae8d6b procps2:3.3.12-3ubuntu1.2 publicsuffix20180223.1310-1 sed4.4-2 From fddbc02cf0ef8f80f52ab5ebd871800a5b67f627 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 17 Oct 2019 00:50:37 -0400 Subject: [PATCH 026/514] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 309e391..bbc363e 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,7 +1,7 @@ adduser3.116ubuntu1 apt1.6.12 apt-utils1.6.12 -base-files10.1ubuntu2.6 +base-files10.1ubuntu2.7 base-passwd3.5.44 bash4.4.18-2ubuntu1.2 bsdutils1:2.31.1-0.4ubuntu3.4 @@ -97,7 +97,7 @@ libsqlite3-03.22.0-1ubuntu0.1 libss21.44.1-1ubuntu1.2 libssl1.11.1.1-1ubuntu2.1~18.04.4 libstdc++68.3.0-6ubuntu1~18.04.1 -libsystemd0237-3ubuntu10.29 +libsystemd0237-3ubuntu10.31 libtasn1-64.13-2 libtinfo56.1-1ubuntu1.18.04 libudev1237-3ubuntu10.31 From 19fa1ad25bf1d08e4d499f0f3237c1a8e9805e28 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 28 Oct 2019 03:59:46 +0000 Subject: [PATCH 027/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index bbc363e..2c2ec5b 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -115,7 +115,7 @@ ncurses-bin6.1-1ubuntu1.18.04 openssl1.1.1-1ubuntu2.1~18.04.4 passwd1:4.5-1ubuntu2 perl-base5.26.1-6ubuntu0.3 -plexmediaserver1.18.0.1944-f2cae8d6b +plexmediaserver1.18.1.1973-0f4abfbcc procps2:3.3.12-3ubuntu1.2 publicsuffix20180223.1310-1 sed4.4-2 From c907535a32dbaf3e5be2164e5d9bd465d5418d05 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 31 Oct 2019 01:46:19 -0400 Subject: [PATCH 028/514] Bot Updating Templated Files --- Jenkinsfile | 162 +++++++++++++++++++++++++++++++++++++++------------- README.md | 16 ++++-- 2 files changed, 133 insertions(+), 45 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index bdf7cc9..ad76149 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,6 +14,8 @@ pipeline { environment { BUILDS_DISCORD=credentials('build_webhook_url') GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab') + GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0') + GITLAB_NAMESPACE=credentials('gitlab-namespace-id') JSON_URL = 'https://plex.tv/api/downloads/5.json' JSON_PATH = '.computer.Linux.version' BUILD_VERSION_ARG = 'PLEX_RELEASE' @@ -128,6 +130,9 @@ pipeline { steps { script{ env.IMAGE = env.DOCKERHUB_IMAGE + env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME + env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/' + env.CONTAINER_NAME + env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER } else { @@ -146,6 +151,9 @@ pipeline { steps { script{ env.IMAGE = env.DEV_DOCKERHUB_IMAGE + env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME + env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME + env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA } else { @@ -164,6 +172,9 @@ pipeline { steps { script{ env.IMAGE = env.PR_DOCKERHUB_IMAGE + env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME + env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME + env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST } else { @@ -271,6 +282,26 @@ pipeline { } } } + /* ####################### + GitLab Mirroring + ####################### */ + // Ping into Gitlab to mirror this repo and have a registry endpoint + stage("GitLab Mirror"){ + when { + environment name: 'EXIT_STATUS', value: '' + } + steps{ + sh '''curl -H "Content-Type: application/json" -H "Private-Token: ${GITLAB_TOKEN}" -X POST https://gitlab.com/api/v4/projects \ + -d '{"namespace_id":'${GITLAB_NAMESPACE}',\ + "name":"'${LS_REPO}'", + "mirror":true,\ + "import_url":"https://github.com/linuxserver/'${LS_REPO}'.git",\ + "issues_access_level":"disabled",\ + "merge_requests_access_level":"disabled",\ + "repository_access_level":"enabled",\ + "visibility":"public"}' ''' + } + } /* ############### Build Container ############### */ @@ -502,19 +533,32 @@ pipeline { credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', usernameVariable: 'DOCKERUSER', passwordVariable: 'DOCKERPASS' + ], + [ + $class: 'UsernamePasswordMultiBinding', + credentialsId: 'Quay.io-Robot', + usernameVariable: 'QUAYUSER', + passwordVariable: 'QUAYPASS' ] ]) { - echo 'Logging into DockerHub' sh '''#! /bin/bash - echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin + set -e + echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin + echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin + echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin + echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin + for PUSHIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do + docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG} + docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest + docker push ${PUSHIMAGE}:latest + docker push ${PUSHIMAGE}:${META_TAG} + done + for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do + docker rmi \ + ${DELETEIMAGE}:${META_TAG} \ + ${DELETEIMAGE}:latest || : + done ''' - sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:latest" - sh "docker push ${IMAGE}:latest" - sh "docker push ${IMAGE}:${META_TAG}" - sh '''docker rmi \ - ${IMAGE}:${META_TAG} \ - ${IMAGE}:latest || :''' - } } } @@ -531,46 +575,81 @@ pipeline { credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', usernameVariable: 'DOCKERUSER', passwordVariable: 'DOCKERPASS' + ], + [ + $class: 'UsernamePasswordMultiBinding', + credentialsId: 'Quay.io-Robot', + usernameVariable: 'QUAYUSER', + passwordVariable: 'QUAYPASS' ] ]) { sh '''#! /bin/bash - echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin - ''' - sh '''#! /bin/bash + set -e + echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin + echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin + echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin + echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin if [ "${CI}" == "false" ]; then docker pull lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} docker pull lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} docker tag lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG} docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} - fi''' - sh "docker tag ${IMAGE}:amd64-${META_TAG} ${IMAGE}:amd64-latest" - sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ${IMAGE}:arm32v7-latest" - sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ${IMAGE}:arm64v8-latest" - sh "docker push ${IMAGE}:amd64-${META_TAG}" - sh "docker push ${IMAGE}:arm32v7-${META_TAG}" - sh "docker push ${IMAGE}:arm64v8-${META_TAG}" - sh "docker push ${IMAGE}:amd64-latest" - sh "docker push ${IMAGE}:arm32v7-latest" - sh "docker push ${IMAGE}:arm64v8-latest" - sh "docker manifest push --purge ${IMAGE}:latest || :" - sh "docker manifest create ${IMAGE}:latest ${IMAGE}:amd64-latest ${IMAGE}:arm32v7-latest ${IMAGE}:arm64v8-latest" - sh "docker manifest annotate ${IMAGE}:latest ${IMAGE}:arm32v7-latest --os linux --arch arm" - sh "docker manifest annotate ${IMAGE}:latest ${IMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8" - sh "docker manifest push --purge ${IMAGE}:${META_TAG} || :" - sh "docker manifest create ${IMAGE}:${META_TAG} ${IMAGE}:amd64-${META_TAG} ${IMAGE}:arm32v7-${META_TAG} ${IMAGE}:arm64v8-${META_TAG}" - sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm32v7-${META_TAG} --os linux --arch arm" - sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8" - sh "docker manifest push --purge ${IMAGE}:latest" - sh "docker manifest push --purge ${IMAGE}:${META_TAG}" - sh '''docker rmi \ - ${IMAGE}:amd64-${META_TAG} \ - ${IMAGE}:amd64-latest \ - ${IMAGE}:arm32v7-${META_TAG} \ - ${IMAGE}:arm32v7-latest \ - ${IMAGE}:arm64v8-${META_TAG} \ - ${IMAGE}:arm64v8-latest \ + fi + for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}"; do + docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} + docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} + docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} + docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-latest + docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-latest + docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest + docker push ${MANIFESTIMAGE}:amd64-${META_TAG} + docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG} + docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} + docker push ${MANIFESTIMAGE}:amd64-latest + docker push ${MANIFESTIMAGE}:arm32v7-latest + docker push ${MANIFESTIMAGE}:arm64v8-latest + docker manifest push --purge ${MANIFESTIMAGE}:latest || : + docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest + docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm + docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8 + docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || : + docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} + docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm + docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8 + docker manifest push --purge ${MANIFESTIMAGE}:latest + docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} + done + for LEGACYIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}"; do + docker tag ${IMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:amd64-${META_TAG} + docker tag ${IMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-${META_TAG} + docker tag ${IMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-${META_TAG} + docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:latest + docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:${META_TAG} + docker tag ${LEGACYIMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-latest + docker tag ${LEGACYIMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-latest + docker push ${LEGACYIMAGE}:amd64-${META_TAG} + docker push ${LEGACYIMAGE}:arm32v7-${META_TAG} + docker push ${LEGACYIMAGE}:arm64v8-${META_TAG} + docker push ${LEGACYIMAGE}:latest + docker push ${LEGACYIMAGE}:${META_TAG} + docker push ${LEGACYIMAGE}:arm32v7-latest + docker push ${LEGACYIMAGE}:arm64v8-latest + done + ''' + sh '''#! /bin/bash + for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do + docker rmi \ + ${DELETEIMAGE}:amd64-${META_TAG} \ + ${DELETEIMAGE}:amd64-latest \ + ${DELETEIMAGE}:arm32v7-${META_TAG} \ + ${DELETEIMAGE}:arm32v7-latest \ + ${DELETEIMAGE}:arm64v8-${META_TAG} \ + ${DELETEIMAGE}:arm64v8-latest || : + done + docker rmi \ lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \ - lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :''' + lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || : + ''' } } } @@ -665,5 +744,8 @@ pipeline { } } } + cleanup { + cleanWs() + } } } diff --git a/README.md b/README.md index d27a122..e6bfc57 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,9 @@ [![Discord](https://img.shields.io/discord/354974912613449730.svg?style=flat-square&color=E68523&label=Discord&logo=discord&logoColor=FFFFFF)](https://discord.gg/YWrKVTn "realtime support / chat with the community and the team.") [![Discourse](https://img.shields.io/discourse/https/discourse.linuxserver.io/topics.svg?style=flat-square&color=E68523&logo=discourse&logoColor=FFFFFF)](https://discourse.linuxserver.io "post on our community forum.") [![Fleet](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Fleet)](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.") +[![GitHub](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitHub&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver "view the source for all of our repositories.") [![Podcast](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Podcast)](https://anchor.fm/linuxserverio "on hiatus. Coming back soon (late 2018).") -[![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?style=flat-square&color=E68523&label=Open%20Collective%20Supporters)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget") +[![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?style=flat-square&color=E68523&label=Supporters&logo=open%20collective&logoColor=FFFFFF)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget") The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring :- @@ -20,15 +21,20 @@ Find us at: * [Discord](https://discord.gg/YWrKVTn) - realtime support / chat with the community and the team. * [Discourse](https://discourse.linuxserver.io) - post on our community forum. * [Fleet](https://fleet.linuxserver.io) - an online web interface which displays all of our maintained images. +* [GitHub](https://github.com/linuxserver) - view the source for all of our repositories. * [Podcast](https://anchor.fm/linuxserverio) - on hiatus. Coming back soon (late 2018). * [Open Collective](https://opencollective.com/linuxserver) - please consider helping us by either donating or contributing to our budget # [linuxserver/plex](https://github.com/linuxserver/docker-plex) -[![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-plex.svg?style=flat-square&color=E68523)](https://github.com/linuxserver/docker-plex/releases) + +[![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-plex.svg?style=flat-square&color=E68523&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-plex) +[![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-plex.svg?style=flat-square&color=E68523&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-plex/releases) +[![GitHub Package Repository](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitHub%20Package&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-plex/packages) +[![GitLab Container Registry](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab&logoColor=FFFFFF)](https://gitlab.com/Linuxserver.io/docker-plex/container_registry) +[![Quay.io](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Quay.io)](https://quay.io/repository/linuxserver.io/plex) [![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/plex.svg?style=flat-square&color=E68523)](https://microbadger.com/images/linuxserver/plex "Get your own version badge on microbadger.com") -[![MicroBadger Size](https://img.shields.io/microbadger/image-size/linuxserver/plex.svg?style=flat-square&color=E68523)](https://microbadger.com/images/linuxserver/plex "Get your own version badge on microbadger.com") -[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/plex.svg?style=flat-square&color=E68523)](https://hub.docker.com/r/linuxserver/plex) -[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/plex.svg?style=flat-square&color=E68523)](https://hub.docker.com/r/linuxserver/plex) +[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/plex.svg?style=flat-square&color=E68523&label=pulls&logo=docker&logoColor=FFFFFF)](https://hub.docker.com/r/linuxserver/plex) +[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/plex.svg?style=flat-square&color=E68523&label=stars&logo=docker&logoColor=FFFFFF)](https://hub.docker.com/r/linuxserver/plex) [![Build Status](https://ci.linuxserver.io/view/all/job/Docker-Pipeline-Builders/job/docker-plex/job/master/badge/icon?style=flat-square)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-plex/job/master/) [![](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/plex/latest/badge.svg)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/plex/latest/index.html) From d325fbe69036bacc488654ff62e308549724fef3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 31 Oct 2019 01:50:02 -0400 Subject: [PATCH 029/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 2c2ec5b..8eaa709 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -56,7 +56,7 @@ libheimbase1-heimdal7.5.0+dfsg-1 libheimntlm0-heimdal7.5.0+dfsg-1 libhogweed43.4-1 libhx509-5-heimdal7.5.0+dfsg-1 -libidn2-02.0.4-1.1build2 +libidn2-02.0.4-1.1ubuntu0.2 libjq11.5+dfsg-2 libk5crypto31.16-2ubuntu0.1 libkeyutils11.5.9-9.2ubuntu2 From 29afebbdd381e28bc9a113cf6cd80e844fb2cfce Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 11 Nov 2019 17:59:16 +0000 Subject: [PATCH 030/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 8eaa709..9b442d3 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -115,7 +115,7 @@ ncurses-bin6.1-1ubuntu1.18.04 openssl1.1.1-1ubuntu2.1~18.04.4 passwd1:4.5-1ubuntu2 perl-base5.26.1-6ubuntu0.3 -plexmediaserver1.18.1.1973-0f4abfbcc +plexmediaserver1.18.1.2019-c186313fe procps2:3.3.12-3ubuntu1.2 publicsuffix20180223.1310-1 sed4.4-2 From 2d75708ff6c218604264b395f62c771438e0b556 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 11 Nov 2019 19:59:13 +0000 Subject: [PATCH 031/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 9b442d3..8eaa709 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -115,7 +115,7 @@ ncurses-bin6.1-1ubuntu1.18.04 openssl1.1.1-1ubuntu2.1~18.04.4 passwd1:4.5-1ubuntu2 perl-base5.26.1-6ubuntu0.3 -plexmediaserver1.18.1.2019-c186313fe +plexmediaserver1.18.1.1973-0f4abfbcc procps2:3.3.12-3ubuntu1.2 publicsuffix20180223.1310-1 sed4.4-2 From 3edae9f62616f8fbd05112c41e04e8d7daa737ac Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 11 Nov 2019 20:58:33 +0000 Subject: [PATCH 032/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 8eaa709..9b442d3 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -115,7 +115,7 @@ ncurses-bin6.1-1ubuntu1.18.04 openssl1.1.1-1ubuntu2.1~18.04.4 passwd1:4.5-1ubuntu2 perl-base5.26.1-6ubuntu0.3 -plexmediaserver1.18.1.1973-0f4abfbcc +plexmediaserver1.18.1.2019-c186313fe procps2:3.3.12-3ubuntu1.2 publicsuffix20180223.1310-1 sed4.4-2 From 1ee4cad9e60408bb0194c6056ac6cc56d4273015 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 14 Nov 2019 15:00:24 +0000 Subject: [PATCH 033/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 9b442d3..5771af4 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -115,7 +115,7 @@ ncurses-bin6.1-1ubuntu1.18.04 openssl1.1.1-1ubuntu2.1~18.04.4 passwd1:4.5-1ubuntu2 perl-base5.26.1-6ubuntu0.3 -plexmediaserver1.18.1.2019-c186313fe +plexmediaserver1.18.2.2029-36236cc4c procps2:3.3.12-3ubuntu1.2 publicsuffix20180223.1310-1 sed4.4-2 From f71f00228c56478457aa98265aa5e7a0b79154a7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 20 Nov 2019 19:02:53 +0000 Subject: [PATCH 034/514] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 5771af4..f836424 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -95,7 +95,7 @@ libsepol12.7-1 libsmartcols12.31.1-0.4ubuntu3.4 libsqlite3-03.22.0-1ubuntu0.1 libss21.44.1-1ubuntu1.2 -libssl1.11.1.1-1ubuntu2.1~18.04.4 +libssl1.11.1.1-1ubuntu2.1~18.04.5 libstdc++68.3.0-6ubuntu1~18.04.1 libsystemd0237-3ubuntu10.31 libtasn1-64.13-2 @@ -112,10 +112,10 @@ mawk1.3.3-17ubuntu3 mount2.31.1-0.4ubuntu3.4 ncurses-base6.1-1ubuntu1.18.04 ncurses-bin6.1-1ubuntu1.18.04 -openssl1.1.1-1ubuntu2.1~18.04.4 +openssl1.1.1-1ubuntu2.1~18.04.5 passwd1:4.5-1ubuntu2 perl-base5.26.1-6ubuntu0.3 -plexmediaserver1.18.2.2029-36236cc4c +plexmediaserver1.18.2.2041-3d469cb32 procps2:3.3.12-3ubuntu1.2 publicsuffix20180223.1310-1 sed4.4-2 From 819819bc6bab277a1143ed58567c5161f02bc806 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 22 Nov 2019 17:59:58 +0100 Subject: [PATCH 035/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index f836424..281c035 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -115,7 +115,7 @@ ncurses-bin6.1-1ubuntu1.18.04 openssl1.1.1-1ubuntu2.1~18.04.5 passwd1:4.5-1ubuntu2 perl-base5.26.1-6ubuntu0.3 -plexmediaserver1.18.2.2041-3d469cb32 +plexmediaserver1.18.2.2058-e67a4e892 procps2:3.3.12-3ubuntu1.2 publicsuffix20180223.1310-1 sed4.4-2 From c8a5a96f75f3d9250a0bfefff000d4cef6f24ab3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 28 Nov 2019 05:46:15 +0000 Subject: [PATCH 036/514] Bot Updating Templated Files --- Jenkinsfile | 6 +++--- README.md | 14 ++++++++++++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ad76149..3620dfd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -619,7 +619,7 @@ pipeline { docker manifest push --purge ${MANIFESTIMAGE}:latest docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} done - for LEGACYIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}"; do + for LEGACYIMAGE in "${GITHUBIMAGE}" "${QUAYIMAGE}"; do docker tag ${IMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:amd64-${META_TAG} docker tag ${IMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-${META_TAG} docker tag ${IMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-${META_TAG} @@ -733,12 +733,12 @@ pipeline { sh 'echo "build aborted"' } else if (currentBuild.currentResult == "SUCCESS"){ - sh ''' curl -X POST --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 1681177,\ + sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 1681177,\ "description": "**Build:** '${BUILD_NUMBER}'\\n**CI Results:** '${CI_URL}'\\n**ShellCheck Results:** '${SHELLCHECK_URL}'\\n**Status:** Success\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\ "username": "Jenkins"}' ${BUILDS_DISCORD} ''' } else { - sh ''' curl -X POST --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 16711680,\ + sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 16711680,\ "description": "**Build:** '${BUILD_NUMBER}'\\n**CI Results:** '${CI_URL}'\\n**ShellCheck Results:** '${SHELLCHECK_URL}'\\n**Status:** failure\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\ "username": "Jenkins"}' ${BUILDS_DISCORD} ''' } diff --git a/README.md b/README.md index e6bfc57..4141bc5 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,6 @@ [![Discourse](https://img.shields.io/discourse/https/discourse.linuxserver.io/topics.svg?style=flat-square&color=E68523&logo=discourse&logoColor=FFFFFF)](https://discourse.linuxserver.io "post on our community forum.") [![Fleet](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Fleet)](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.") [![GitHub](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitHub&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver "view the source for all of our repositories.") -[![Podcast](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Podcast)](https://anchor.fm/linuxserverio "on hiatus. Coming back soon (late 2018).") [![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?style=flat-square&color=E68523&label=Supporters&logo=open%20collective&logoColor=FFFFFF)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget") The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring :- @@ -22,7 +21,6 @@ Find us at: * [Discourse](https://discourse.linuxserver.io) - post on our community forum. * [Fleet](https://fleet.linuxserver.io) - an online web interface which displays all of our maintained images. * [GitHub](https://github.com/linuxserver) - view the source for all of our repositories. -* [Podcast](https://anchor.fm/linuxserverio) - on hiatus. Coming back soon (late 2018). * [Open Collective](https://opencollective.com/linuxserver) - please consider helping us by either donating or contributing to our budget # [linuxserver/plex](https://github.com/linuxserver/docker-plex) @@ -121,6 +119,18 @@ Container images are configured using parameters passed at runtime (such as thos | `-v /movies` | Media goes here. Add as many as needed e.g. `/movies`, `/tv`, etc. | | `-v /transcode` | Path for transcoding folder, *optional*. | +## Environment variables from files (Docker secrets) + +You can set any environment variable from a file by using a special prepend `FILE__`. + +As an example: + +``` +-e FILE__PASSWORD=/run/secrets/mysecretpassword +``` + +Will set the environment variable `PASSWORD` based on the contents of the `/run/secrets/mysecretpassword` file. + ## Optional Parameters *Special note* - If you'd like to run Plex without requiring `--net=host` (`NOT recommended`) then you will need the following ports in your `docker create` command: From 89784e128a1722f1bf68de3bc09f70932b45762c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 28 Nov 2019 00:51:10 -0500 Subject: [PATCH 037/514] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 281c035..55bdddb 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -100,7 +100,7 @@ libstdc++68.3.0-6ubuntu1~18.04.1 libsystemd0237-3ubuntu10.31 libtasn1-64.13-2 libtinfo56.1-1ubuntu1.18.04 -libudev1237-3ubuntu10.31 +libudev1237-3ubuntu10.33 libunistring20.9.9-0ubuntu2 libuuid12.31.1-0.4ubuntu3.4 libwind0-heimdal7.5.0+dfsg-1 @@ -124,7 +124,7 @@ sysvinit-utils2.88dsf-59.10ubuntu1 tar1.29b-2ubuntu0.1 tzdata2019c-0ubuntu0.18.04 ubuntu-keyring2018.09.18.1~18.04.0 -udev237-3ubuntu10.31 +udev237-3ubuntu10.33 unrar1:5.5.8-1 util-linux2.31.1-0.4ubuntu3.4 wget1.19.4-1ubuntu2.2 From e01485d8314b21a6937a1779258c11581a32b8f3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 5 Dec 2019 06:51:07 +0100 Subject: [PATCH 038/514] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 55bdddb..59e5b5e 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -93,11 +93,11 @@ libsemanage12.7-2build2 libsemanage-common2.7-2build2 libsepol12.7-1 libsmartcols12.31.1-0.4ubuntu3.4 -libsqlite3-03.22.0-1ubuntu0.1 +libsqlite3-03.22.0-1ubuntu0.2 libss21.44.1-1ubuntu1.2 libssl1.11.1.1-1ubuntu2.1~18.04.5 libstdc++68.3.0-6ubuntu1~18.04.1 -libsystemd0237-3ubuntu10.31 +libsystemd0237-3ubuntu10.33 libtasn1-64.13-2 libtinfo56.1-1ubuntu1.18.04 libudev1237-3ubuntu10.33 From e8cd4d7e894351b268b3df8b80e7c62dd901eed6 Mon Sep 17 00:00:00 2001 From: aptalca Date: Wed, 4 Dec 2019 11:41:45 -0500 Subject: [PATCH 039/514] Add support for PLEX_CLAIM --- README.md | 6 ++++- readme-vars.yml | 4 ++- root/etc/cont-init.d/45-plex-claim | 43 ++++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 root/etc/cont-init.d/45-plex-claim diff --git a/README.md b/README.md index 4141bc5..6672404 100644 --- a/README.md +++ b/README.md @@ -69,6 +69,7 @@ docker create \ -e PGID=1000 \ -e VERSION=docker \ -e UMASK_SET=022 `#optional` \ + -e PLEX_CLAIM= `#optional` \ -v :/config \ -v :/tv \ -v :/movies \ @@ -95,6 +96,7 @@ services: - PGID=1000 - VERSION=docker - UMASK_SET=022 #optional + - PLEX_CLAIM= #optional volumes: - :/config - :/tv @@ -114,6 +116,7 @@ Container images are configured using parameters passed at runtime (such as thos | `-e PGID=1000` | for GroupID - see below for explanation | | `-e VERSION=docker` | Set whether to update plex or not - see Application Setup section. | | `-e UMASK_SET=022` | control permissions of files and directories created by Plex | +| `-e PLEX_CLAIM=` | Optionally you can obtain a claim token from https://plex.tv/claim and input here. Keep in mind that the claim tokens expire within 4 minutes. | | `-v /config` | Plex library location. *This can grow very large, 50gb+ is likely for a large collection.* | | `-v /tv` | Media goes here. Add as many as needed e.g. `/movies`, `/tv`, etc. | | `-v /movies` | Media goes here. Add as many as needed e.g. `/movies`, `/tv`, etc. | @@ -133,7 +136,7 @@ Will set the environment variable `PASSWORD` based on the contents of the `/run/ ## Optional Parameters -*Special note* - If you'd like to run Plex without requiring `--net=host` (`NOT recommended`) then you will need the following ports in your `docker create` command: +*Special note* - If you'd like to run Plex without requiring `--net=host` (`NOT recommended`) then you will need the following ports in your `docker create` command (you need to set PLEX_CLAIM to claim a server set up with bridge networking): ``` -p 32400:32400 \ @@ -262,6 +265,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **04.12.19:** - Add variable for setting PLEX_CLAIM. * **06.08.19:** - Add variable for setting UMASK. * **10.07.19:** - Fix permissions for tuner (/dev/dvb) devices. * **20.05.19:** - Bugfix do not allow Root group for Intel QuickSync ownership rules. diff --git a/readme-vars.yml b/readme-vars.yml index 2391000..0b16320 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -34,9 +34,10 @@ param_env_vars: opt_param_usage_include_env: true opt_param_env_vars: - { env_var: "UMASK_SET", env_value: "022", desc: "control permissions of files and directories created by Plex"} + - { env_var: "PLEX_CLAIM", env_value: "", desc: "Optionally you can obtain a claim token from https://plex.tv/claim and input here. Keep in mind that the claim tokens expire within 4 minutes."} optional_parameters: | - *Special note* - If you'd like to run Plex without requiring `--net=host` (`NOT recommended`) then you will need the following ports in your `docker create` command: + *Special note* - If you'd like to run Plex without requiring `--net=host` (`NOT recommended`) then you will need the following ports in your `docker create` command (you need to set PLEX_CLAIM to claim a server set up with bridge networking): ``` -p 32400:32400 \ @@ -86,6 +87,7 @@ app_setup_block: | # changelog changelogs: + - { date: "04.12.19:", desc: "Add variable for setting PLEX_CLAIM." } - { date: "06.08.19:", desc: "Add variable for setting UMASK." } - { date: "10.07.19:", desc: "Fix permissions for tuner (/dev/dvb) devices." } - { date: "20.05.19:", desc: "Bugfix do not allow Root group for Intel QuickSync ownership rules." } diff --git a/root/etc/cont-init.d/45-plex-claim b/root/etc/cont-init.d/45-plex-claim new file mode 100644 index 0000000..4997067 --- /dev/null +++ b/root/etc/cont-init.d/45-plex-claim @@ -0,0 +1,43 @@ +#!/usr/bin/with-contenv bash + +if grep -qs "PlexOnlineToken" "/config/Library/Application Support/Plex Media Server/Preferences.xml" || [ -z "$PLEX_CLAIM" ]; then + exit 0 +fi + +if [ ! -f "/config/Library/Application Support/Plex Media Server/Preferences.xml" ]; then + UMASK_SET=${UMASK_SET:-022} + umask "$UMASK_SET" + echo "Temporarily starting Plex Media Server." + export PLEX_MEDIA_SERVER_INFO_MODEL=$(uname -m) + export PLEX_MEDIA_SERVER_INFO_PLATFORM_VERSION=$(uname -r) + s6-setuidgid abc /bin/bash -c \ + 'LD_LIBRARY_PATH=/usr/lib/plexmediaserver:/usr/lib/plexmediaserver/lib /usr/lib/plexmediaserver/Plex\ Media\ Server' & + echo "Waiting for Plex to generate its config" + until grep -qs "ProcessedMachineIdentifier" "/config/Library/Application Support/Plex Media Server/Preferences.xml"; do + sleep 1 + done + echo "Stopping Plex to claim server" + kill $(cat "/config/Library/Application Support/Plex Media Server/plexmediaserver.pid") + wait + echo "Plex stopped" +fi + +ProcessedMachineIdentifier=$(sed -n "s/^.*ProcessedMachineIdentifier=\"\([^\"]*\)\".*$/\1/p" "/config/Library/Application Support/Plex Media Server/Preferences.xml") +PlexOnlineToken="$(curl -X POST \ + -H 'X-Plex-Client-Identifier: '"${ProcessedMachineIdentifier}" \ + -H 'X-Plex-Product: Plex Media Server'\ + -H 'X-Plex-Version: 1.1' \ + -H 'X-Plex-Provides: server' \ + -H 'X-Plex-Platform: Linux' \ + -H 'X-Plex-Platform-Version: 1.0' \ + -H 'X-Plex-Device-Name: PlexMediaServer' \ + -H 'X-Plex-Device: Linux' \ + "https://plex.tv/api/claim/exchange?token=${PLEX_CLAIM}" \ + | sed -n 's/.*\(.*\)<\/authentication-token>.*/\1/p')" + +if [ -n "$PlexOnlineToken" ]; then + echo "Server claimed successfully, navigate to http://serverip:32400/web to complete plex setup." + sed -i "s/\/>/ PlexOnlineToken=\"${PlexOnlineToken}\"\/>/g" "/config/Library/Application Support/Plex Media Server/Preferences.xml" +else + echo "Unable to claim Plex server. Either manually claim by connecting to http://serverip:32400/web from the same network subnet, or recreate container with a new claim token." +fi \ No newline at end of file From 25f33c7775845e972b2a945749818a6c29fc9dfe Mon Sep 17 00:00:00 2001 From: aptalca Date: Wed, 4 Dec 2019 12:00:03 -0500 Subject: [PATCH 040/514] update maintainers --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7610c3a..202b0b9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_DATE ARG VERSION ARG PLEX_RELEASE LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" -LABEL maintainer="sparklyballs, thelamer" +LABEL maintainer="thelamer" #Add needed nvidia environment variables for https://github.com/NVIDIA/nvidia-docker ENV NVIDIA_DRIVER_CAPABILITIES="compute,video,utility" diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index a9d1305..08ea5e3 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -5,7 +5,7 @@ ARG BUILD_DATE ARG VERSION ARG PLEX_RELEASE LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" -LABEL maintainer="sparklyballs, thelamer" +LABEL maintainer="thelamer" # global environment settings ENV DEBIAN_FRONTEND="noninteractive" \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index eae127e..7e8ce7a 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -5,7 +5,7 @@ ARG BUILD_DATE ARG VERSION ARG PLEX_RELEASE LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" -LABEL maintainer="sparklyballs, thelamer" +LABEL maintainer="thelamer" # global environment settings ENV DEBIAN_FRONTEND="noninteractive" \ From 9949d6056b2dfd7949bdba9082e32c772e3ae1d9 Mon Sep 17 00:00:00 2001 From: aptalca Date: Wed, 4 Dec 2019 12:54:10 -0500 Subject: [PATCH 041/514] Remove /transcode volume mapping --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- README.md | 7 ++----- readme-vars.yml | 5 ++--- 5 files changed, 7 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 202b0b9..a2abbd2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -58,4 +58,4 @@ COPY root/ / # ports and volumes EXPOSE 32400/tcp 3005/tcp 8324/tcp 32469/tcp 1900/udp 32410/udp 32412/udp 32413/udp 32414/udp -VOLUME /config /transcode +VOLUME /config diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 08ea5e3..c616315 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -55,4 +55,4 @@ COPY root/ / # ports and volumes EXPOSE 32400/tcp 3005/tcp 8324/tcp 32469/tcp 1900/udp 32410/udp 32412/udp 32413/udp 32414/udp -VOLUME /config /transcode +VOLUME /config diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 7e8ce7a..a67b05b 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -55,4 +55,4 @@ COPY root/ / # ports and volumes EXPOSE 32400/tcp 3005/tcp 8324/tcp 32469/tcp 1900/udp 32410/udp 32412/udp 32413/udp 32414/udp -VOLUME /config /transcode +VOLUME /config diff --git a/README.md b/README.md index 6672404..d4dd59d 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,6 @@ docker create \ -v :/config \ -v :/tv \ -v :/movies \ - -v :/transcode \ --restart unless-stopped \ linuxserver/plex ``` @@ -101,7 +100,6 @@ services: - :/config - :/tv - :/movies - - :/transcode restart: unless-stopped ``` @@ -120,7 +118,6 @@ Container images are configured using parameters passed at runtime (such as thos | `-v /config` | Plex library location. *This can grow very large, 50gb+ is likely for a large collection.* | | `-v /tv` | Media goes here. Add as many as needed e.g. `/movies`, `/tv`, etc. | | `-v /movies` | Media goes here. Add as many as needed e.g. `/movies`, `/tv`, etc. | -| `-v /transcode` | Path for transcoding folder, *optional*. | ## Environment variables from files (Docker secrets) @@ -151,8 +148,8 @@ The application accepts a series of environment variables to further customize i | Parameter | Function | | :---: | --- | -| `-v /transcode` | Path for transcoding folder| | `--device=/dev/dri:/dev/dri` | Add this option to your run command if you plan on using Quicksync hardware acceleration - see Application Setup section.| +| `--device=/dev/dvb:/dev/dvb` | Add this option to your run command if you plan on using dvb devices.| ## User / Group Identifiers @@ -265,7 +262,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions -* **04.12.19:** - Add variable for setting PLEX_CLAIM. +* **04.12.19:** - Add variable for setting PLEX_CLAIM. Remove `/transcode` volume mapping as it is now set via plex gui and defaults to a location under `/config`. * **06.08.19:** - Add variable for setting UMASK. * **10.07.19:** - Fix permissions for tuner (/dev/dvb) devices. * **20.05.19:** - Bugfix do not allow Root group for Intel QuickSync ownership rules. diff --git a/readme-vars.yml b/readme-vars.yml index 0b16320..4a1da14 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -22,7 +22,6 @@ param_volumes: - { vol_path: "/config", vol_host_path: "", desc: "Plex library location. *This can grow very large, 50gb+ is likely for a large collection.*" } - { vol_path: "/tv", vol_host_path: "", desc: "Media goes here. Add as many as needed e.g. `/movies`, `/tv`, etc." } - { vol_path: "/movies", vol_host_path: "", desc: "Media goes here. Add as many as needed e.g. `/movies`, `/tv`, etc." } - - { vol_path: "/transcode", vol_host_path: "", desc: "Path for transcoding folder, *optional*." } param_usage_include_ports: false param_usage_include_net: true param_net: "host" @@ -52,8 +51,8 @@ optional_parameters: | | Parameter | Function | | :---: | --- | - | `-v /transcode` | Path for transcoding folder| | `--device=/dev/dri:/dev/dri` | Add this option to your run command if you plan on using Quicksync hardware acceleration - see Application Setup section.| + | `--device=/dev/dvb:/dev/dvb` | Add this option to your run command if you plan on using dvb devices.| # application setup block app_setup_block_enabled: true @@ -87,7 +86,7 @@ app_setup_block: | # changelog changelogs: - - { date: "04.12.19:", desc: "Add variable for setting PLEX_CLAIM." } + - { date: "04.12.19:", desc: "Add variable for setting PLEX_CLAIM. Remove `/transcode` volume mapping as it is now set via plex gui and defaults to a location under `/config`." } - { date: "06.08.19:", desc: "Add variable for setting UMASK." } - { date: "10.07.19:", desc: "Fix permissions for tuner (/dev/dvb) devices." } - { date: "20.05.19:", desc: "Bugfix do not allow Root group for Intel QuickSync ownership rules." } From f5c6d1c9b098c485161a2789cf806dd7f518ace9 Mon Sep 17 00:00:00 2001 From: aptalca Date: Wed, 4 Dec 2019 12:56:26 -0500 Subject: [PATCH 042/514] fix typo --- root/etc/cont-init.d/60-plex-update | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/cont-init.d/60-plex-update b/root/etc/cont-init.d/60-plex-update index f7087b6..8df3bb5 100755 --- a/root/etc/cont-init.d/60-plex-update +++ b/root/etc/cont-init.d/60-plex-update @@ -2,7 +2,7 @@ # If docker manages versioning exit if [ "${VERSION}" ] && [ "${VERSION}" == 'docker' ]; then - echo "Docker is used for verisoning skip update check" + echo "Docker is used for versioning skip update check" exit 0 fi From a8a9c2f51db62274a48d4581428a43ffafba3afc Mon Sep 17 00:00:00 2001 From: aptalca Date: Thu, 5 Dec 2019 17:52:39 -0500 Subject: [PATCH 043/514] let plex complete database and pref file creation --- root/etc/cont-init.d/45-plex-claim | 54 +++++++++++++++++++++++++----- 1 file changed, 45 insertions(+), 9 deletions(-) diff --git a/root/etc/cont-init.d/45-plex-claim b/root/etc/cont-init.d/45-plex-claim index 4997067..6c546bf 100644 --- a/root/etc/cont-init.d/45-plex-claim +++ b/root/etc/cont-init.d/45-plex-claim @@ -3,26 +3,62 @@ if grep -qs "PlexOnlineToken" "/config/Library/Application Support/Plex Media Server/Preferences.xml" || [ -z "$PLEX_CLAIM" ]; then exit 0 fi - -if [ ! -f "/config/Library/Application Support/Plex Media Server/Preferences.xml" ]; then - UMASK_SET=${UMASK_SET:-022} +PREFNAME="/config/Library/Application Support/Plex Media Server/Preferences.xml" +if [ ! -f "${PREFNAME}" ]; then + UMASK_SET="${UMASK_SET:-022}" umask "$UMASK_SET" echo "Temporarily starting Plex Media Server." export PLEX_MEDIA_SERVER_INFO_MODEL=$(uname -m) export PLEX_MEDIA_SERVER_INFO_PLATFORM_VERSION=$(uname -r) s6-setuidgid abc /bin/bash -c \ - 'LD_LIBRARY_PATH=/usr/lib/plexmediaserver:/usr/lib/plexmediaserver/lib /usr/lib/plexmediaserver/Plex\ Media\ Server' & + 'LD_LIBRARY_PATH=/usr/lib/plexmediaserver:/usr/lib/plexmediaserver/lib /usr/lib/plexmediaserver/Plex\ Media\ Server' & PID=$! echo "Waiting for Plex to generate its config" - until grep -qs "ProcessedMachineIdentifier" "/config/Library/Application Support/Plex Media Server/Preferences.xml"; do + DBNAME="/config/Library/Application Support/Plex Media Server/Plug-in Support/Databases/com.plexapp.plugins.library.db-wal" + until [ -f "${DBNAME}" ]; do sleep 1 done + while true; do + echo "Waiting for database creation to complete..." + if [ -z "${COMPARE_MD5+x}" ]; then + COMPARE_MD5=$(md5sum "${DBNAME}"| cut -c1-8) + sleep 3 + else + sleep 3 + CURRENT_MD5=$(md5sum "${DBNAME}"| cut -c1-8) + if [ "${CURRENT_MD5}" == "${COMPARE_MD5}" ]; then + break + else + COMPARE_MD5=$(md5sum "${DBNAME}"| cut -c1-8) + fi + fi + done + until grep -qs "ProcessedMachineIdentifier" "${PREFNAME}"; do + sleep 1 + done + while true; do + echo "Waiting for pref file creation to complete..." + if [ -z "${PREF_COMPARE_MD5+x}" ]; then + PREF_COMPARE_MD5=$(md5sum "${PREFNAME}"| cut -c1-8) + sleep 3 + else + sleep 3 + PREF_CURRENT_MD5=$(md5sum "${PREFNAME}"| cut -c1-8) + if [ "${PREF_CURRENT_MD5}" == "${PREF_COMPARE_MD5}" ]; then + break + else + PREF_COMPARE_MD5=$(md5sum "${PREFNAME}"| cut -c1-8) + fi + fi + done echo "Stopping Plex to claim server" - kill $(cat "/config/Library/Application Support/Plex Media Server/plexmediaserver.pid") - wait + while ps -p $PID > /dev/null; do + kill $PID + sleep 1 + done echo "Plex stopped" fi -ProcessedMachineIdentifier=$(sed -n "s/^.*ProcessedMachineIdentifier=\"\([^\"]*\)\".*$/\1/p" "/config/Library/Application Support/Plex Media Server/Preferences.xml") +ProcessedMachineIdentifier=$(sed -n "s/^.*ProcessedMachineIdentifier=\"\([^\"]*\)\".*$/\1/p" "${PREFNAME}") PlexOnlineToken="$(curl -X POST \ -H 'X-Plex-Client-Identifier: '"${ProcessedMachineIdentifier}" \ -H 'X-Plex-Product: Plex Media Server'\ @@ -37,7 +73,7 @@ PlexOnlineToken="$(curl -X POST \ if [ -n "$PlexOnlineToken" ]; then echo "Server claimed successfully, navigate to http://serverip:32400/web to complete plex setup." - sed -i "s/\/>/ PlexOnlineToken=\"${PlexOnlineToken}\"\/>/g" "/config/Library/Application Support/Plex Media Server/Preferences.xml" + sed -i "s/\/>/ PlexOnlineToken=\"${PlexOnlineToken}\"\/>/g" "${PREFNAME}" else echo "Unable to claim Plex server. Either manually claim by connecting to http://serverip:32400/web from the same network subnet, or recreate container with a new claim token." fi \ No newline at end of file From c312e57b1eeb0bb6bfda859183e61694700dfa2d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 17 Dec 2019 19:00:21 +0000 Subject: [PATCH 044/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 59e5b5e..ed36241 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -115,7 +115,7 @@ ncurses-bin6.1-1ubuntu1.18.04 openssl1.1.1-1ubuntu2.1~18.04.5 passwd1:4.5-1ubuntu2 perl-base5.26.1-6ubuntu0.3 -plexmediaserver1.18.2.2058-e67a4e892 +plexmediaserver1.18.3.2156-349e9837e procps2:3.3.12-3ubuntu1.2 publicsuffix20180223.1310-1 sed4.4-2 From ec3c95d28c2ea1df6774a33c0afad4d5cbe12ea8 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 6 Jan 2020 23:02:20 +0100 Subject: [PATCH 045/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index ed36241..20b7bf1 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -115,7 +115,7 @@ ncurses-bin6.1-1ubuntu1.18.04 openssl1.1.1-1ubuntu2.1~18.04.5 passwd1:4.5-1ubuntu2 perl-base5.26.1-6ubuntu0.3 -plexmediaserver1.18.3.2156-349e9837e +plexmediaserver1.18.4.2171-ac2afe5f8 procps2:3.3.12-3ubuntu1.2 publicsuffix20180223.1310-1 sed4.4-2 From 994f16cfd77ee3e2aa67bfffe969f6e762b4557c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 16 Jan 2020 05:52:41 +0000 Subject: [PATCH 046/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 20b7bf1..676ef5b 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -47,7 +47,7 @@ libffi63.2.1-8 libgcc11:8.3.0-6ubuntu1~18.04.1 libgcrypt201.8.1-4ubuntu1.1 libgmp102:6.1.2+dfsg-2 -libgnutls303.5.18-1ubuntu1.1 +libgnutls303.5.18-1ubuntu1.2 libgpg-error01.27-6 libgssapi3-heimdal7.5.0+dfsg-1 libgssapi-krb5-21.16-2ubuntu0.1 From 21ad04103cb15ebde0a34171a88d99c95e050bb4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 23 Jan 2020 00:52:45 -0500 Subject: [PATCH 047/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 676ef5b..2b01034 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -45,7 +45,7 @@ libext2fs21.44.1-1ubuntu1.2 libfdisk12.31.1-0.4ubuntu3.4 libffi63.2.1-8 libgcc11:8.3.0-6ubuntu1~18.04.1 -libgcrypt201.8.1-4ubuntu1.1 +libgcrypt201.8.1-4ubuntu1.2 libgmp102:6.1.2+dfsg-2 libgnutls303.5.18-1ubuntu1.2 libgpg-error01.27-6 From aa32cc09b0a8c44881ae0f5573f544f810262ce6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 10 Feb 2020 18:04:48 +0000 Subject: [PATCH 048/514] Bot Updating Package Versions --- package_versions.txt | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 2b01034..9a276c9 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,10 +1,10 @@ adduser3.116ubuntu1 apt1.6.12 apt-utils1.6.12 -base-files10.1ubuntu2.7 +base-files10.1ubuntu2.8 base-passwd3.5.44 bash4.4.18-2ubuntu1.2 -bsdutils1:2.31.1-0.4ubuntu3.4 +bsdutils1:2.31.1-0.4ubuntu3.5 bzip21.0.6-8.1ubuntu0.2 ca-certificates20180409 coreutils8.28-1ubuntu1 @@ -14,8 +14,8 @@ debconf1.5.66ubuntu1 debianutils4.8.4 diffutils1:3.6-1 dpkg1.19.0.5ubuntu2.3 -e2fsprogs1.44.1-1ubuntu1.2 -fdisk2.31.1-0.4ubuntu3.4 +e2fsprogs1.44.1-1ubuntu1.3 +fdisk2.31.1-0.4ubuntu3.5 findutils4.6.0+git+20170828-2 gcc-8-base8.3.0-6ubuntu1~18.04.1 gpgv2.2.4-1ubuntu1.2 @@ -32,22 +32,22 @@ libasn1-8-heimdal7.5.0+dfsg-1 libattr11:2.4.47-2build1 libaudit11:2.8.2-1ubuntu1 libaudit-common1:2.8.2-1ubuntu1 -libblkid12.31.1-0.4ubuntu3.4 +libblkid12.31.1-0.4ubuntu3.5 libbz2-1.01.0.6-8.1ubuntu0.2 libc62.27-3ubuntu1 libcap-ng00.7.7-3.1 libc-bin2.27-3ubuntu1 -libcom-err21.44.1-1ubuntu1.2 +libcom-err21.44.1-1ubuntu1.3 libcurl47.58.0-2ubuntu3.8 libdb5.35.3.28-13.1ubuntu1.1 libdebconfclient00.213ubuntu1 -libext2fs21.44.1-1ubuntu1.2 -libfdisk12.31.1-0.4ubuntu3.4 +libext2fs21.44.1-1ubuntu1.3 +libfdisk12.31.1-0.4ubuntu3.5 libffi63.2.1-8 libgcc11:8.3.0-6ubuntu1~18.04.1 libgcrypt201.8.1-4ubuntu1.2 libgmp102:6.1.2+dfsg-2 -libgnutls303.5.18-1ubuntu1.2 +libgnutls303.5.18-1ubuntu1.3 libgpg-error01.27-6 libgssapi3-heimdal7.5.0+dfsg-1 libgssapi-krb5-21.16-2ubuntu0.1 @@ -68,7 +68,7 @@ libldap-2.4-22.4.45+dfsg-1ubuntu1.4 libldap-common2.4.45+dfsg-1ubuntu1.4 liblz4-10.0~r131-2ubuntu3 liblzma55.2.2-1.3 -libmount12.31.1-0.4ubuntu3.4 +libmount12.31.1-0.4ubuntu3.5 libncurses56.1-1ubuntu1.18.04 libncursesw56.1-1ubuntu1.18.04 libnettle63.4-1 @@ -84,38 +84,38 @@ libprocps62:3.3.12-3ubuntu1.2 libpsl50.19.1-5build1 libroken18-heimdal7.5.0+dfsg-1 librtmp12.4+20151223.gitfa8646d.1-1 -libsasl2-22.1.27~101-g0780600+dfsg-3ubuntu2 -libsasl2-modules2.1.27~101-g0780600+dfsg-3ubuntu2 -libsasl2-modules-db2.1.27~101-g0780600+dfsg-3ubuntu2 +libsasl2-22.1.27~101-g0780600+dfsg-3ubuntu2.1 +libsasl2-modules2.1.27~101-g0780600+dfsg-3ubuntu2.1 +libsasl2-modules-db2.1.27~101-g0780600+dfsg-3ubuntu2.1 libseccomp22.4.1-0ubuntu0.18.04.2 libselinux12.7-2build2 libsemanage12.7-2build2 libsemanage-common2.7-2build2 libsepol12.7-1 -libsmartcols12.31.1-0.4ubuntu3.4 +libsmartcols12.31.1-0.4ubuntu3.5 libsqlite3-03.22.0-1ubuntu0.2 -libss21.44.1-1ubuntu1.2 +libss21.44.1-1ubuntu1.3 libssl1.11.1.1-1ubuntu2.1~18.04.5 libstdc++68.3.0-6ubuntu1~18.04.1 libsystemd0237-3ubuntu10.33 libtasn1-64.13-2 libtinfo56.1-1ubuntu1.18.04 -libudev1237-3ubuntu10.33 +libudev1237-3ubuntu10.38 libunistring20.9.9-0ubuntu2 -libuuid12.31.1-0.4ubuntu3.4 +libuuid12.31.1-0.4ubuntu3.5 libwind0-heimdal7.5.0+dfsg-1 libzstd11.3.3+dfsg-2ubuntu1.1 locales2.27-3ubuntu1 login1:4.5-1ubuntu2 lsb-base9.20170808ubuntu1 mawk1.3.3-17ubuntu3 -mount2.31.1-0.4ubuntu3.4 +mount2.31.1-0.4ubuntu3.5 ncurses-base6.1-1ubuntu1.18.04 ncurses-bin6.1-1ubuntu1.18.04 openssl1.1.1-1ubuntu2.1~18.04.5 passwd1:4.5-1ubuntu2 perl-base5.26.1-6ubuntu0.3 -plexmediaserver1.18.4.2171-ac2afe5f8 +plexmediaserver1.18.6.2368-97add474d procps2:3.3.12-3ubuntu1.2 publicsuffix20180223.1310-1 sed4.4-2 @@ -124,8 +124,8 @@ sysvinit-utils2.88dsf-59.10ubuntu1 tar1.29b-2ubuntu0.1 tzdata2019c-0ubuntu0.18.04 ubuntu-keyring2018.09.18.1~18.04.0 -udev237-3ubuntu10.33 +udev237-3ubuntu10.38 unrar1:5.5.8-1 -util-linux2.31.1-0.4ubuntu3.4 +util-linux2.31.1-0.4ubuntu3.5 wget1.19.4-1ubuntu2.2 zlib1g1:1.2.11.dfsg-0ubuntu2 From a9007379f4c5e0009cfa6ac5576bff31ece1c977 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 13 Feb 2020 00:51:41 -0500 Subject: [PATCH 049/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 9a276c9..0e350f5 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -97,7 +97,7 @@ libsqlite3-03.22.0-1ubuntu0.2 libss21.44.1-1ubuntu1.3 libssl1.11.1.1-1ubuntu2.1~18.04.5 libstdc++68.3.0-6ubuntu1~18.04.1 -libsystemd0237-3ubuntu10.33 +libsystemd0237-3ubuntu10.38 libtasn1-64.13-2 libtinfo56.1-1ubuntu1.18.04 libudev1237-3ubuntu10.38 From 3100f3cbf62bdc1ca053da87da7aab34f1274281 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 20 Feb 2020 00:52:48 -0500 Subject: [PATCH 050/514] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 0e350f5..3c8f64b 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -97,10 +97,10 @@ libsqlite3-03.22.0-1ubuntu0.2 libss21.44.1-1ubuntu1.3 libssl1.11.1.1-1ubuntu2.1~18.04.5 libstdc++68.3.0-6ubuntu1~18.04.1 -libsystemd0237-3ubuntu10.38 +libsystemd0237-3ubuntu10.39 libtasn1-64.13-2 libtinfo56.1-1ubuntu1.18.04 -libudev1237-3ubuntu10.38 +libudev1237-3ubuntu10.39 libunistring20.9.9-0ubuntu2 libuuid12.31.1-0.4ubuntu3.5 libwind0-heimdal7.5.0+dfsg-1 @@ -124,7 +124,7 @@ sysvinit-utils2.88dsf-59.10ubuntu1 tar1.29b-2ubuntu0.1 tzdata2019c-0ubuntu0.18.04 ubuntu-keyring2018.09.18.1~18.04.0 -udev237-3ubuntu10.38 +udev237-3ubuntu10.39 unrar1:5.5.8-1 util-linux2.31.1-0.4ubuntu3.5 wget1.19.4-1ubuntu2.2 From 665720768fa27a2aadf34d3c93a5715b09690dd2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 20 Feb 2020 15:02:57 -0500 Subject: [PATCH 051/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 3c8f64b..8108508 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -115,7 +115,7 @@ ncurses-bin6.1-1ubuntu1.18.04 openssl1.1.1-1ubuntu2.1~18.04.5 passwd1:4.5-1ubuntu2 perl-base5.26.1-6ubuntu0.3 -plexmediaserver1.18.6.2368-97add474d +plexmediaserver1.18.7.2438-f342a5a43 procps2:3.3.12-3ubuntu1.2 publicsuffix20180223.1310-1 sed4.4-2 From 474bc4448c51797e3538ee1f42c04d6f4a961d32 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 24 Feb 2020 16:58:44 +0000 Subject: [PATCH 052/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 8108508..fa0f40d 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -115,7 +115,7 @@ ncurses-bin6.1-1ubuntu1.18.04 openssl1.1.1-1ubuntu2.1~18.04.5 passwd1:4.5-1ubuntu2 perl-base5.26.1-6ubuntu0.3 -plexmediaserver1.18.7.2438-f342a5a43 +plexmediaserver1.18.7.2457-77cb9455c procps2:3.3.12-3ubuntu1.2 publicsuffix20180223.1310-1 sed4.4-2 From f850240d7fcc0e2ee2d8403fe31c2562d5d4114d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 12 Mar 2020 05:48:54 +0000 Subject: [PATCH 053/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index fa0f40d..17a0729 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -93,7 +93,7 @@ libsemanage12.7-2build2 libsemanage-common2.7-2build2 libsepol12.7-1 libsmartcols12.31.1-0.4ubuntu3.5 -libsqlite3-03.22.0-1ubuntu0.2 +libsqlite3-03.22.0-1ubuntu0.3 libss21.44.1-1ubuntu1.3 libssl1.11.1.1-1ubuntu2.1~18.04.5 libstdc++68.3.0-6ubuntu1~18.04.1 From f9d476f730b66aa0afe2a5291036d971e16355ac Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 16 Mar 2020 16:59:04 +0100 Subject: [PATCH 054/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 17a0729..17a2544 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -115,7 +115,7 @@ ncurses-bin6.1-1ubuntu1.18.04 openssl1.1.1-1ubuntu2.1~18.04.5 passwd1:4.5-1ubuntu2 perl-base5.26.1-6ubuntu0.3 -plexmediaserver1.18.7.2457-77cb9455c +plexmediaserver1.18.8.2527-740d4c206 procps2:3.3.12-3ubuntu1.2 publicsuffix20180223.1310-1 sed4.4-2 From 50c61370e05387467574172616833146e2e5824b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 19 Mar 2020 05:59:10 +0000 Subject: [PATCH 055/514] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 17a2544..f0032c4 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -17,7 +17,7 @@ dpkg1.19.0.5ubuntu2.3 e2fsprogs1.44.1-1ubuntu1.3 fdisk2.31.1-0.4ubuntu3.5 findutils4.6.0+git+20170828-2 -gcc-8-base8.3.0-6ubuntu1~18.04.1 +gcc-8-base8.3.0-26ubuntu1~18.04 gpgv2.2.4-1ubuntu1.2 grep3.1-2build1 gzip1.6-5ubuntu1 @@ -44,7 +44,7 @@ libdebconfclient00.213ubuntu1 libext2fs21.44.1-1ubuntu1.3 libfdisk12.31.1-0.4ubuntu3.5 libffi63.2.1-8 -libgcc11:8.3.0-6ubuntu1~18.04.1 +libgcc11:8.3.0-26ubuntu1~18.04 libgcrypt201.8.1-4ubuntu1.2 libgmp102:6.1.2+dfsg-2 libgnutls303.5.18-1ubuntu1.3 @@ -96,7 +96,7 @@ libsmartcols12.31.1-0.4ubuntu3.5 libsqlite3-03.22.0-1ubuntu0.3 libss21.44.1-1ubuntu1.3 libssl1.11.1.1-1ubuntu2.1~18.04.5 -libstdc++68.3.0-6ubuntu1~18.04.1 +libstdc++68.3.0-26ubuntu1~18.04 libsystemd0237-3ubuntu10.39 libtasn1-64.13-2 libtinfo56.1-1ubuntu1.18.04 From 53b49652af2f4c84f34dd00131b0cb48ff90adaa Mon Sep 17 00:00:00 2001 From: aptalca Date: Mon, 23 Mar 2020 11:15:40 -0400 Subject: [PATCH 056/514] remove udev hack (no longer needed) --- Dockerfile | 9 ++------- Dockerfile.aarch64 | 9 ++------- Dockerfile.armhf | 9 ++------- readme-vars.yml | 13 ++++++++++--- 4 files changed, 16 insertions(+), 24 deletions(-) diff --git a/Dockerfile b/Dockerfile index a2abbd2..0a03b3b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,14 +25,10 @@ RUN \ echo "**** install runtime packages ****" && \ apt-get update && \ apt-get install -y \ + jq \ udev \ unrar \ - wget \ - jq && \ - echo "**** Udevadm hack ****" && \ - mv /sbin/udevadm /sbin/udevadm.bak && \ - echo "exit 0" > /sbin/udevadm && \ - chmod +x /sbin/udevadm && \ + wget && \ echo "**** install plex ****" && \ if [ -z ${PLEX_RELEASE+x} ]; then \ PLEX_RELEASE=$(curl -sX GET 'https://plex.tv/api/downloads/5.json' \ @@ -42,7 +38,6 @@ RUN \ /tmp/plexmediaserver.deb -L \ "${PLEX_DOWNLOAD}/${PLEX_RELEASE}/debian/plexmediaserver_${PLEX_RELEASE}_${PLEX_ARCH}.deb" && \ dpkg -i /tmp/plexmediaserver.deb && \ - mv /sbin/udevadm.bak /sbin/udevadm && \ echo "**** ensure abc user's home folder is /app ****" && \ usermod -d /app abc && \ echo "**** cleanup ****" && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index c616315..58d2010 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -22,14 +22,10 @@ RUN \ echo "**** install runtime packages ****" && \ apt-get update && \ apt-get install -y \ + jq \ udev \ unrar \ - wget \ - jq && \ - echo "**** Udevadm hack ****" && \ - mv /sbin/udevadm /sbin/udevadm.bak && \ - echo "exit 0" > /sbin/udevadm && \ - chmod +x /sbin/udevadm && \ + wget && \ echo "**** install plex ****" && \ if [ -z ${PLEX_RELEASE+x} ]; then \ PLEX_RELEASE=$(curl -sX GET 'https://plex.tv/api/downloads/5.json' \ @@ -39,7 +35,6 @@ RUN \ /tmp/plexmediaserver.deb -L \ "${PLEX_DOWNLOAD}/${PLEX_RELEASE}/debian/plexmediaserver_${PLEX_RELEASE}_${PLEX_ARCH}.deb" && \ dpkg -i /tmp/plexmediaserver.deb && \ - mv /sbin/udevadm.bak /sbin/udevadm && \ echo "**** ensure abc user's home folder is /app ****" && \ usermod -d /app abc && \ echo "**** cleanup ****" && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index a67b05b..5bd94e5 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -22,14 +22,10 @@ RUN \ echo "**** install runtime packages ****" && \ apt-get update && \ apt-get install -y \ + jq \ udev \ unrar \ - wget \ - jq && \ - echo "**** Udevadm hack ****" && \ - mv /sbin/udevadm /sbin/udevadm.bak && \ - echo "exit 0" > /sbin/udevadm && \ - chmod +x /sbin/udevadm && \ + wget && \ echo "**** install plex ****" && \ if [ -z ${PLEX_RELEASE+x} ]; then \ PLEX_RELEASE=$(curl -sX GET 'https://plex.tv/api/downloads/5.json' \ @@ -39,7 +35,6 @@ RUN \ /tmp/plexmediaserver.deb -L \ "${PLEX_DOWNLOAD}/${PLEX_RELEASE}/debian/plexmediaserver_${PLEX_RELEASE}_${PLEX_ARCH}.deb" && \ dpkg -i /tmp/plexmediaserver.deb && \ - mv /sbin/udevadm.bak /sbin/udevadm && \ echo "**** ensure abc user's home folder is /app ****" && \ usermod -d /app abc && \ echo "**** cleanup ****" && \ diff --git a/readme-vars.yml b/readme-vars.yml index 4a1da14..5868762 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -19,9 +19,9 @@ 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: "", desc: "Plex library location. *This can grow very large, 50gb+ is likely for a large collection.*" } - - { vol_path: "/tv", vol_host_path: "", desc: "Media goes here. Add as many as needed e.g. `/movies`, `/tv`, etc." } - - { vol_path: "/movies", vol_host_path: "", desc: "Media goes here. Add as many as needed e.g. `/movies`, `/tv`, etc." } + - { 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: "/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" @@ -72,12 +72,18 @@ app_setup_block: | + **`public`**: will update plexpass users to the latest public version, useful for plexpass users that don't want to be on the bleeding edge but still want the latest public updates. + **``**: will select a specific version (eg 0.9.12.4.1192-9a47d21) of plex to install, note you cannot use this to access plexpass versions if you do not have plexpass. + ## Hardware Acceleration + + ### Intel + Hardware acceleration users for Intel Quicksync will need to mount their /dev/dri video device inside of the container by passing the following command when running or creating the container: ```--device=/dev/dri:/dev/dri``` We will automatically ensure the abc user inside of the container has the proper permissions to access this device. + ### Nvidia + Hardware acceleration users for Nvidia will need to install the container runtime provided by Nvidia on their host, instructions can be found here: https://github.com/NVIDIA/nvidia-docker @@ -86,6 +92,7 @@ app_setup_block: | # changelog changelogs: + - { date: "23.03.20:", desc: "Remove udev hack (no longer needed), suppress uuid error in log during first start." } - { date: "04.12.19:", desc: "Add variable for setting PLEX_CLAIM. Remove `/transcode` volume mapping as it is now set via plex gui and defaults to a location under `/config`." } - { date: "06.08.19:", desc: "Add variable for setting UMASK." } - { date: "10.07.19:", desc: "Fix permissions for tuner (/dev/dvb) devices." } From ddb910db23f44b89966c2d454a0efadfbb0deb98 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 23 Mar 2020 21:46:09 +0000 Subject: [PATCH 057/514] Bot Updating Templated Files --- README.md | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index d4dd59d..f9126c5 100644 --- a/README.md +++ b/README.md @@ -70,9 +70,9 @@ docker create \ -e VERSION=docker \ -e UMASK_SET=022 `#optional` \ -e PLEX_CLAIM= `#optional` \ - -v :/config \ - -v :/tv \ - -v :/movies \ + -v /path/to/library:/config \ + -v /path/to/tvseries:/tv \ + -v /path/to/movies:/movies \ --restart unless-stopped \ linuxserver/plex ``` @@ -97,9 +97,9 @@ services: - UMASK_SET=022 #optional - PLEX_CLAIM= #optional volumes: - - :/config - - :/tv - - :/movies + - /path/to/library:/config + - /path/to/tvseries:/tv + - /path/to/movies:/movies restart: unless-stopped ``` @@ -184,12 +184,18 @@ Valid settings for VERSION are:- + **`public`**: will update plexpass users to the latest public version, useful for plexpass users that don't want to be on the bleeding edge but still want the latest public updates. + **``**: will select a specific version (eg 0.9.12.4.1192-9a47d21) of plex to install, note you cannot use this to access plexpass versions if you do not have plexpass. +## Hardware Acceleration + +### Intel + Hardware acceleration users for Intel Quicksync will need to mount their /dev/dri video device inside of the container by passing the following command when running or creating the container: ```--device=/dev/dri:/dev/dri``` We will automatically ensure the abc user inside of the container has the proper permissions to access this device. +### Nvidia + Hardware acceleration users for Nvidia will need to install the container runtime provided by Nvidia on their host, instructions can be found here: https://github.com/NVIDIA/nvidia-docker @@ -262,6 +268,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **23.03.20:** - Remove udev hack (no longer needed), suppress uuid error in log during first start. * **04.12.19:** - Add variable for setting PLEX_CLAIM. Remove `/transcode` volume mapping as it is now set via plex gui and defaults to a location under `/config`. * **06.08.19:** - Add variable for setting UMASK. * **10.07.19:** - Fix permissions for tuner (/dev/dvb) devices. From 993dbefe36d7f714acec2b8cc036241c9352c466 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 25 Mar 2020 18:01:37 +0100 Subject: [PATCH 058/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index f0032c4..12d1928 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -115,7 +115,7 @@ ncurses-bin6.1-1ubuntu1.18.04 openssl1.1.1-1ubuntu2.1~18.04.5 passwd1:4.5-1ubuntu2 perl-base5.26.1-6ubuntu0.3 -plexmediaserver1.18.8.2527-740d4c206 +plexmediaserver1.18.9.2571-e106a8a91 procps2:3.3.12-3ubuntu1.2 publicsuffix20180223.1310-1 sed4.4-2 From 60c4f1f85eb82c5d2f4594da186f6278fcd171cd Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 26 Mar 2020 06:48:36 +0100 Subject: [PATCH 059/514] Bot Updating Package Versions --- package_versions.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 12d1928..939548a 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -4,7 +4,7 @@ apt-utils1.6.12 base-files10.1ubuntu2.8 base-passwd3.5.44 bash4.4.18-2ubuntu1.2 -bsdutils1:2.31.1-0.4ubuntu3.5 +bsdutils1:2.31.1-0.4ubuntu3.6 bzip21.0.6-8.1ubuntu0.2 ca-certificates20180409 coreutils8.28-1ubuntu1 @@ -15,7 +15,7 @@ debianutils4.8.4 diffutils1:3.6-1 dpkg1.19.0.5ubuntu2.3 e2fsprogs1.44.1-1ubuntu1.3 -fdisk2.31.1-0.4ubuntu3.5 +fdisk2.31.1-0.4ubuntu3.6 findutils4.6.0+git+20170828-2 gcc-8-base8.3.0-26ubuntu1~18.04 gpgv2.2.4-1ubuntu1.2 @@ -32,7 +32,7 @@ libasn1-8-heimdal7.5.0+dfsg-1 libattr11:2.4.47-2build1 libaudit11:2.8.2-1ubuntu1 libaudit-common1:2.8.2-1ubuntu1 -libblkid12.31.1-0.4ubuntu3.5 +libblkid12.31.1-0.4ubuntu3.6 libbz2-1.01.0.6-8.1ubuntu0.2 libc62.27-3ubuntu1 libcap-ng00.7.7-3.1 @@ -42,7 +42,7 @@ libcurl47.58.0-2ubuntu3.8 libdb5.35.3.28-13.1ubuntu1.1 libdebconfclient00.213ubuntu1 libext2fs21.44.1-1ubuntu1.3 -libfdisk12.31.1-0.4ubuntu3.5 +libfdisk12.31.1-0.4ubuntu3.6 libffi63.2.1-8 libgcc11:8.3.0-26ubuntu1~18.04 libgcrypt201.8.1-4ubuntu1.2 @@ -68,7 +68,7 @@ libldap-2.4-22.4.45+dfsg-1ubuntu1.4 libldap-common2.4.45+dfsg-1ubuntu1.4 liblz4-10.0~r131-2ubuntu3 liblzma55.2.2-1.3 -libmount12.31.1-0.4ubuntu3.5 +libmount12.31.1-0.4ubuntu3.6 libncurses56.1-1ubuntu1.18.04 libncursesw56.1-1ubuntu1.18.04 libnettle63.4-1 @@ -92,7 +92,7 @@ libselinux12.7-2build2 libsemanage12.7-2build2 libsemanage-common2.7-2build2 libsepol12.7-1 -libsmartcols12.31.1-0.4ubuntu3.5 +libsmartcols12.31.1-0.4ubuntu3.6 libsqlite3-03.22.0-1ubuntu0.3 libss21.44.1-1ubuntu1.3 libssl1.11.1.1-1ubuntu2.1~18.04.5 @@ -102,14 +102,14 @@ libtasn1-64.13-2 libtinfo56.1-1ubuntu1.18.04 libudev1237-3ubuntu10.39 libunistring20.9.9-0ubuntu2 -libuuid12.31.1-0.4ubuntu3.5 +libuuid12.31.1-0.4ubuntu3.6 libwind0-heimdal7.5.0+dfsg-1 libzstd11.3.3+dfsg-2ubuntu1.1 locales2.27-3ubuntu1 login1:4.5-1ubuntu2 lsb-base9.20170808ubuntu1 mawk1.3.3-17ubuntu3 -mount2.31.1-0.4ubuntu3.5 +mount2.31.1-0.4ubuntu3.6 ncurses-base6.1-1ubuntu1.18.04 ncurses-bin6.1-1ubuntu1.18.04 openssl1.1.1-1ubuntu2.1~18.04.5 @@ -126,6 +126,6 @@ tzdata2019c-0ubuntu0.18.04 ubuntu-keyring2018.09.18.1~18.04.0 udev237-3ubuntu10.39 unrar1:5.5.8-1 -util-linux2.31.1-0.4ubuntu3.5 +util-linux2.31.1-0.4ubuntu3.6 wget1.19.4-1ubuntu2.2 zlib1g1:1.2.11.dfsg-0ubuntu2 From 0328c6cc505215b7de13f8bb7a8d1e5e5013e85e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 30 Mar 2020 15:06:16 -0400 Subject: [PATCH 060/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 939548a..28b770f 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -115,7 +115,7 @@ ncurses-bin6.1-1ubuntu1.18.04 openssl1.1.1-1ubuntu2.1~18.04.5 passwd1:4.5-1ubuntu2 perl-base5.26.1-6ubuntu0.3 -plexmediaserver1.18.9.2571-e106a8a91 +plexmediaserver1.18.9.2578-513b381af procps2:3.3.12-3ubuntu1.2 publicsuffix20180223.1310-1 sed4.4-2 From fd2168754d4e9cfccff90d38a931e6b78a2f8d0b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 8 Apr 2020 02:55:53 +0200 Subject: [PATCH 061/514] Bot Updating Templated Files --- README.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f9126c5..717d442 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ [![GitHub](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitHub&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver "view the source for all of our repositories.") [![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?style=flat-square&color=E68523&label=Supporters&logo=open%20collective&logoColor=FFFFFF)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget") -The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring :- +The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring: * regular and timely application updates * easy user mappings (PGID, PUID) @@ -84,7 +84,7 @@ Compatible with docker-compose v2 schemas. ``` --- -version: "2" +version: "2.1" services: plex: image: linuxserver/plex @@ -203,6 +203,11 @@ https://github.com/NVIDIA/nvidia-docker We automatically add the necessary environment variable that will utilise all the features available on a GPU on the host. Once nvidia-docker is installed on your host you will need to re/create the docker container with the nvidia container runtime `--runtime=nvidia` and add an environment variable `-e NVIDIA_VISIBLE_DEVICES=all` (can also be set to a specific gpu's UUID, this can be discovered by running `nvidia-smi --query-gpu=gpu_name,gpu_uuid --format=csv` ). NVIDIA automatically mounts the GPU and drivers from your host into the plex docker. +## Docker Mods +[![Docker Mods](https://img.shields.io/badge/dynamic/yaml?style=for-the-badge&color=E68523&label=mods&query=%24.mods%5B%27plex%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=plex "view available mods for this container.") + +We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to enable additional functionality within the containers. The list of Mods available for this image (if any) can be accessed via the dynamic badge above. + ## Support Info From a138d3a6b708a51da45ae729fb8bb93b2487f503 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 8 Apr 2020 01:02:45 +0000 Subject: [PATCH 062/514] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 28b770f..595d7c4 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -17,7 +17,7 @@ dpkg1.19.0.5ubuntu2.3 e2fsprogs1.44.1-1ubuntu1.3 fdisk2.31.1-0.4ubuntu3.6 findutils4.6.0+git+20170828-2 -gcc-8-base8.3.0-26ubuntu1~18.04 +gcc-8-base8.4.0-1ubuntu1~18.04 gpgv2.2.4-1ubuntu1.2 grep3.1-2build1 gzip1.6-5ubuntu1 @@ -44,7 +44,7 @@ libdebconfclient00.213ubuntu1 libext2fs21.44.1-1ubuntu1.3 libfdisk12.31.1-0.4ubuntu3.6 libffi63.2.1-8 -libgcc11:8.3.0-26ubuntu1~18.04 +libgcc11:8.4.0-1ubuntu1~18.04 libgcrypt201.8.1-4ubuntu1.2 libgmp102:6.1.2+dfsg-2 libgnutls303.5.18-1ubuntu1.3 @@ -96,7 +96,7 @@ libsmartcols12.31.1-0.4ubuntu3.6 libsqlite3-03.22.0-1ubuntu0.3 libss21.44.1-1ubuntu1.3 libssl1.11.1.1-1ubuntu2.1~18.04.5 -libstdc++68.3.0-26ubuntu1~18.04 +libstdc++68.4.0-1ubuntu1~18.04 libsystemd0237-3ubuntu10.39 libtasn1-64.13-2 libtinfo56.1-1ubuntu1.18.04 @@ -115,7 +115,7 @@ ncurses-bin6.1-1ubuntu1.18.04 openssl1.1.1-1ubuntu2.1~18.04.5 passwd1:4.5-1ubuntu2 perl-base5.26.1-6ubuntu0.3 -plexmediaserver1.18.9.2578-513b381af +plexmediaserver1.19.1.2630-72c16a276 procps2:3.3.12-3ubuntu1.2 publicsuffix20180223.1310-1 sed4.4-2 From 6c2eee99e7b78ab75e295404bc2ed3b50640220b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 9 Apr 2020 15:01:33 +0000 Subject: [PATCH 063/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 595d7c4..e75f7d5 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -115,7 +115,7 @@ ncurses-bin6.1-1ubuntu1.18.04 openssl1.1.1-1ubuntu2.1~18.04.5 passwd1:4.5-1ubuntu2 perl-base5.26.1-6ubuntu0.3 -plexmediaserver1.19.1.2630-72c16a276 +plexmediaserver1.19.1.2645-ccb6eb67e procps2:3.3.12-3ubuntu1.2 publicsuffix20180223.1310-1 sed4.4-2 From 53178924d46db51970e069fd25d3d0adbd9789db Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 23 Apr 2020 18:59:23 -0400 Subject: [PATCH 064/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index e75f7d5..63d8ad3 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -115,7 +115,7 @@ ncurses-bin6.1-1ubuntu1.18.04 openssl1.1.1-1ubuntu2.1~18.04.5 passwd1:4.5-1ubuntu2 perl-base5.26.1-6ubuntu0.3 -plexmediaserver1.19.1.2645-ccb6eb67e +plexmediaserver1.19.1.2701-6327e27bf procps2:3.3.12-3ubuntu1.2 publicsuffix20180223.1310-1 sed4.4-2 From 0b4e42ae4d9530cc8362a4a7b7954a903240a804 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 29 Apr 2020 17:55:58 +0200 Subject: [PATCH 065/514] Bot Updating Templated Files --- .github/FUNDING.yml | 1 + Jenkinsfile | 142 ++++++++++++++++++++++++-------------------- 2 files changed, 77 insertions(+), 66 deletions(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 7972213..7eaac77 100755 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1 +1,2 @@ +github: linuxserver open_collective: linuxserver diff --git a/Jenkinsfile b/Jenkinsfile index 3620dfd..f505e12 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -349,7 +349,9 @@ pipeline { sh "docker build --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh "docker tag ${IMAGE}:arm32v7-${META_TAG} lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" - sh "docker push lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" + retry(5) { + sh "docker push lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" + } sh '''docker rmi \ ${IMAGE}:arm32v7-${META_TAG} \ lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} || :''' @@ -376,7 +378,9 @@ pipeline { sh "docker build --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh "docker tag ${IMAGE}:arm64v8-${META_TAG} lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" - sh "docker push lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" + retry(5) { + sh "docker push lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" + } sh '''docker rmi \ ${IMAGE}:arm64v8-${META_TAG} \ lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :''' @@ -541,18 +545,22 @@ pipeline { passwordVariable: 'QUAYPASS' ] ]) { + retry(5) { + sh '''#! /bin/bash + set -e + echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin + echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin + echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin + echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin + for PUSHIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do + docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG} + docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest + docker push ${PUSHIMAGE}:latest + docker push ${PUSHIMAGE}:${META_TAG} + done + ''' + } sh '''#! /bin/bash - set -e - echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin - echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin - echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin - echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin - for PUSHIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do - docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG} - docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest - docker push ${PUSHIMAGE}:latest - docker push ${PUSHIMAGE}:${META_TAG} - done for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do docker rmi \ ${DELETEIMAGE}:${META_TAG} \ @@ -583,59 +591,61 @@ pipeline { passwordVariable: 'QUAYPASS' ] ]) { - sh '''#! /bin/bash - set -e - echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin - echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin - echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin - echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin - if [ "${CI}" == "false" ]; then - docker pull lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} - docker pull lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} - docker tag lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG} - docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} - fi - for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}"; do - docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} - docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} - docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} - docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-latest - docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-latest - docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest - docker push ${MANIFESTIMAGE}:amd64-${META_TAG} - docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG} - docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} - docker push ${MANIFESTIMAGE}:amd64-latest - docker push ${MANIFESTIMAGE}:arm32v7-latest - docker push ${MANIFESTIMAGE}:arm64v8-latest - docker manifest push --purge ${MANIFESTIMAGE}:latest || : - docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest - docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm - docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8 - docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || : - docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} - docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm - docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8 - docker manifest push --purge ${MANIFESTIMAGE}:latest - docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} - done - for LEGACYIMAGE in "${GITHUBIMAGE}" "${QUAYIMAGE}"; do - docker tag ${IMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:amd64-${META_TAG} - docker tag ${IMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-${META_TAG} - docker tag ${IMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-${META_TAG} - docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:latest - docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:${META_TAG} - docker tag ${LEGACYIMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-latest - docker tag ${LEGACYIMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-latest - docker push ${LEGACYIMAGE}:amd64-${META_TAG} - docker push ${LEGACYIMAGE}:arm32v7-${META_TAG} - docker push ${LEGACYIMAGE}:arm64v8-${META_TAG} - docker push ${LEGACYIMAGE}:latest - docker push ${LEGACYIMAGE}:${META_TAG} - docker push ${LEGACYIMAGE}:arm32v7-latest - docker push ${LEGACYIMAGE}:arm64v8-latest - done - ''' + retry(5) { + sh '''#! /bin/bash + set -e + echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin + echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin + echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin + echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin + if [ "${CI}" == "false" ]; then + docker pull lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} + docker pull lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} + docker tag lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG} + docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} + fi + for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}"; do + docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} + docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} + docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} + docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-latest + docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-latest + docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest + docker push ${MANIFESTIMAGE}:amd64-${META_TAG} + docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG} + docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} + docker push ${MANIFESTIMAGE}:amd64-latest + docker push ${MANIFESTIMAGE}:arm32v7-latest + docker push ${MANIFESTIMAGE}:arm64v8-latest + docker manifest push --purge ${MANIFESTIMAGE}:latest || : + docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest + docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm + docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8 + docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || : + docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} + docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm + docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8 + docker manifest push --purge ${MANIFESTIMAGE}:latest + docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} + done + for LEGACYIMAGE in "${GITHUBIMAGE}" "${QUAYIMAGE}"; do + docker tag ${IMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:amd64-${META_TAG} + docker tag ${IMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-${META_TAG} + docker tag ${IMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-${META_TAG} + docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:latest + docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:${META_TAG} + docker tag ${LEGACYIMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-latest + docker tag ${LEGACYIMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-latest + docker push ${LEGACYIMAGE}:amd64-${META_TAG} + docker push ${LEGACYIMAGE}:arm32v7-${META_TAG} + docker push ${LEGACYIMAGE}:arm64v8-${META_TAG} + docker push ${LEGACYIMAGE}:latest + docker push ${LEGACYIMAGE}:${META_TAG} + docker push ${LEGACYIMAGE}:arm32v7-latest + docker push ${LEGACYIMAGE}:arm64v8-latest + done + ''' + } sh '''#! /bin/bash for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do docker rmi \ From f41d4d3b9772561bec30da410dc91ad13566b7ce Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 29 Apr 2020 12:02:55 -0400 Subject: [PATCH 066/514] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 63d8ad3..042afc4 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -60,7 +60,7 @@ libidn2-02.0.4-1.1ubuntu0.2 libjq11.5+dfsg-2 libk5crypto31.16-2ubuntu0.1 libkeyutils11.5.9-9.2ubuntu2 -libkmod224-1ubuntu3.2 +libkmod224-1ubuntu3.3 libkrb5-26-heimdal7.5.0+dfsg-1 libkrb5-31.16-2ubuntu0.1 libkrb5support01.16-2ubuntu0.1 @@ -115,7 +115,7 @@ ncurses-bin6.1-1ubuntu1.18.04 openssl1.1.1-1ubuntu2.1~18.04.5 passwd1:4.5-1ubuntu2 perl-base5.26.1-6ubuntu0.3 -plexmediaserver1.19.1.2701-6327e27bf +plexmediaserver1.19.2.2737-b69929dab procps2:3.3.12-3ubuntu1.2 publicsuffix20180223.1310-1 sed4.4-2 From 12a4dcfc243541ac984509908137a11fb75e74dd Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Sun, 3 May 2020 14:12:13 -0500 Subject: [PATCH 067/514] EXPOSE all documented ports https://support.plex.tv/articles/201543147-what-network-ports-do-i-need-to-allow-through-my-firewall/ Update docs for new port info --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- README.md | 14 ++++++++++---- readme-vars.yml | 14 ++++++++++---- 5 files changed, 23 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0a03b3b..f06bbaf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -52,5 +52,5 @@ RUN \ COPY root/ / # ports and volumes -EXPOSE 32400/tcp 3005/tcp 8324/tcp 32469/tcp 1900/udp 32410/udp 32412/udp 32413/udp 32414/udp +EXPOSE 32400/tcp 1900/udp 3005/tcp 5353/udp 8324/tcp 32410/udp 32412/udp 32413/udp 32414/udp 32469/tcp VOLUME /config diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 58d2010..6590bad 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -49,5 +49,5 @@ RUN \ COPY root/ / # ports and volumes -EXPOSE 32400/tcp 3005/tcp 8324/tcp 32469/tcp 1900/udp 32410/udp 32412/udp 32413/udp 32414/udp +EXPOSE 32400/tcp 1900/udp 3005/tcp 5353/udp 8324/tcp 32410/udp 32412/udp 32413/udp 32414/udp 32469/tcp VOLUME /config diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 5bd94e5..471eb25 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -49,5 +49,5 @@ RUN \ COPY root/ / # ports and volumes -EXPOSE 32400/tcp 3005/tcp 8324/tcp 32469/tcp 1900/udp 32410/udp 32412/udp 32413/udp 32414/udp +EXPOSE 32400/tcp 1900/udp 3005/tcp 5353/udp 8324/tcp 32410/udp 32412/udp 32413/udp 32414/udp 32469/tcp VOLUME /config diff --git a/README.md b/README.md index 717d442..dedf4b0 100644 --- a/README.md +++ b/README.md @@ -137,11 +137,16 @@ Will set the environment variable `PASSWORD` based on the contents of the `/run/ ``` -p 32400:32400 \ - -p 32400:32400/udp \ - -p 32469:32469 \ - -p 32469:32469/udp \ + -p 1900:1900/udp \ + -p 3005:3005 \ -p 5353:5353/udp \ - -p 1900:1900/udp + -p 8324:8324 \ + -p 32410:32410/udp \ + -p 32412:32412/udp \ + -p 32413:32413/udp \ + -p 32414:32414/udp \ + -p 32469:32469 + ``` The application accepts a series of environment variables to further customize itself on boot: @@ -273,6 +278,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **03.05.20:** - Update exposed ports and example docs for bridge mode. * **23.03.20:** - Remove udev hack (no longer needed), suppress uuid error in log during first start. * **04.12.19:** - Add variable for setting PLEX_CLAIM. Remove `/transcode` volume mapping as it is now set via plex gui and defaults to a location under `/config`. * **06.08.19:** - Add variable for setting UMASK. diff --git a/readme-vars.yml b/readme-vars.yml index 5868762..034f1bd 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -40,11 +40,16 @@ optional_parameters: | ``` -p 32400:32400 \ - -p 32400:32400/udp \ - -p 32469:32469 \ - -p 32469:32469/udp \ + -p 1900:1900/udp \ + -p 3005:3005 \ -p 5353:5353/udp \ - -p 1900:1900/udp + -p 8324:8324 \ + -p 32410:32410/udp \ + -p 32412:32412/udp \ + -p 32413:32413/udp \ + -p 32414:32414/udp \ + -p 32469:32469 + ``` The application accepts a series of environment variables to further customize itself on boot: @@ -92,6 +97,7 @@ app_setup_block: | # changelog changelogs: + - { date: "03.05.20:", desc: "Update exposed ports and example docs for bridge mode." } - { date: "23.03.20:", desc: "Remove udev hack (no longer needed), suppress uuid error in log during first start." } - { date: "04.12.19:", desc: "Add variable for setting PLEX_CLAIM. Remove `/transcode` volume mapping as it is now set via plex gui and defaults to a location under `/config`." } - { date: "06.08.19:", desc: "Add variable for setting UMASK." } From 105474ec817fbbc228729859280b4522c2d10e35 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 7 May 2020 16:03:26 +0200 Subject: [PATCH 068/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 042afc4..c506ee5 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -115,7 +115,7 @@ ncurses-bin6.1-1ubuntu1.18.04 openssl1.1.1-1ubuntu2.1~18.04.5 passwd1:4.5-1ubuntu2 perl-base5.26.1-6ubuntu0.3 -plexmediaserver1.19.2.2737-b69929dab +plexmediaserver1.19.3.2764-ef515a800 procps2:3.3.12-3ubuntu1.2 publicsuffix20180223.1310-1 sed4.4-2 From 7fd3743bd8359a06984a12f43edd8471249161b2 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Sat, 9 May 2020 11:54:39 -0500 Subject: [PATCH 069/514] Update readme --- README.md | 5 ++++- readme-vars.yml | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index dedf4b0..5e70c94 100644 --- a/README.md +++ b/README.md @@ -133,7 +133,10 @@ Will set the environment variable `PASSWORD` based on the contents of the `/run/ ## Optional Parameters -*Special note* - If you'd like to run Plex without requiring `--net=host` (`NOT recommended`) then you will need the following ports in your `docker create` command (you need to set PLEX_CLAIM to claim a server set up with bridge networking): +If you want to run the container in bridge network mode (instead of the recommended host network mode) you will need to specify ports. +The [official documentation for ports](https://support.plex.tv/articles/201543147-what-network-ports-do-i-need-to-allow-through-my-firewall/) lists 32400 as the only required port. +The rest of the ports are optionally used for specific purposes listed in the documentation. +If you have not already claimed your server (first time setup) you need to set `PLEX_CLAIM` to claim a server set up with bridge networking. ``` -p 32400:32400 \ diff --git a/readme-vars.yml b/readme-vars.yml index 034f1bd..f4f31bc 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -36,7 +36,10 @@ opt_param_env_vars: - { env_var: "PLEX_CLAIM", env_value: "", desc: "Optionally you can obtain a claim token from https://plex.tv/claim and input here. Keep in mind that the claim tokens expire within 4 minutes."} optional_parameters: | - *Special note* - If you'd like to run Plex without requiring `--net=host` (`NOT recommended`) then you will need the following ports in your `docker create` command (you need to set PLEX_CLAIM to claim a server set up with bridge networking): + If you want to run the container in bridge network mode (instead of the recommended host network mode) you will need to specify ports. + The [official documentation for ports](https://support.plex.tv/articles/201543147-what-network-ports-do-i-need-to-allow-through-my-firewall/) lists 32400 as the only required port. + The rest of the ports are optionally used for specific purposes listed in the documentation. + If you have not already claimed your server (first time setup) you need to set `PLEX_CLAIM` to claim a server set up with bridge networking. ``` -p 32400:32400 \ From a768b5d6149f845731039abd1671378530e22ff3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 14 May 2020 00:54:43 -0400 Subject: [PATCH 070/514] Bot Updating Package Versions --- package_versions.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index c506ee5..91b18a4 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -64,8 +64,8 @@ libkmod224-1ubuntu3.3 libkrb5-26-heimdal7.5.0+dfsg-1 libkrb5-31.16-2ubuntu0.1 libkrb5support01.16-2ubuntu0.1 -libldap-2.4-22.4.45+dfsg-1ubuntu1.4 -libldap-common2.4.45+dfsg-1ubuntu1.4 +libldap-2.4-22.4.45+dfsg-1ubuntu1.5 +libldap-common2.4.45+dfsg-1ubuntu1.5 liblz4-10.0~r131-2ubuntu3 liblzma55.2.2-1.3 libmount12.31.1-0.4ubuntu3.6 @@ -97,10 +97,10 @@ libsqlite3-03.22.0-1ubuntu0.3 libss21.44.1-1ubuntu1.3 libssl1.11.1.1-1ubuntu2.1~18.04.5 libstdc++68.4.0-1ubuntu1~18.04 -libsystemd0237-3ubuntu10.39 +libsystemd0237-3ubuntu10.40 libtasn1-64.13-2 libtinfo56.1-1ubuntu1.18.04 -libudev1237-3ubuntu10.39 +libudev1237-3ubuntu10.40 libunistring20.9.9-0ubuntu2 libuuid12.31.1-0.4ubuntu3.6 libwind0-heimdal7.5.0+dfsg-1 @@ -124,7 +124,7 @@ sysvinit-utils2.88dsf-59.10ubuntu1 tar1.29b-2ubuntu0.1 tzdata2019c-0ubuntu0.18.04 ubuntu-keyring2018.09.18.1~18.04.0 -udev237-3ubuntu10.39 +udev237-3ubuntu10.40 unrar1:5.5.8-1 util-linux2.31.1-0.4ubuntu3.6 wget1.19.4-1ubuntu2.2 From b4fe97ad156a50637e2c4f771ed06cea3a6341d6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 19 May 2020 14:07:50 -0400 Subject: [PATCH 071/514] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 91b18a4..c4f78f1 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -60,7 +60,7 @@ libidn2-02.0.4-1.1ubuntu0.2 libjq11.5+dfsg-2 libk5crypto31.16-2ubuntu0.1 libkeyutils11.5.9-9.2ubuntu2 -libkmod224-1ubuntu3.3 +libkmod224-1ubuntu3.4 libkrb5-26-heimdal7.5.0+dfsg-1 libkrb5-31.16-2ubuntu0.1 libkrb5support01.16-2ubuntu0.1 @@ -115,7 +115,7 @@ ncurses-bin6.1-1ubuntu1.18.04 openssl1.1.1-1ubuntu2.1~18.04.5 passwd1:4.5-1ubuntu2 perl-base5.26.1-6ubuntu0.3 -plexmediaserver1.19.3.2764-ef515a800 +plexmediaserver1.19.3.2831-181d9145d procps2:3.3.12-3ubuntu1.2 publicsuffix20180223.1310-1 sed4.4-2 From 4d6cfa47ece2c9112bec8edc8624bb5a5153844b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 21 May 2020 04:49:17 +0000 Subject: [PATCH 072/514] Bot Updating Package Versions --- package_versions.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index c4f78f1..8ea216c 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,6 +1,6 @@ adduser3.116ubuntu1 -apt1.6.12 -apt-utils1.6.12 +apt1.6.12ubuntu0.1 +apt-utils1.6.12ubuntu0.1 base-files10.1ubuntu2.8 base-passwd3.5.44 bash4.4.18-2ubuntu1.2 @@ -26,8 +26,8 @@ init-system-helpers1.51 jq1.5+dfsg-2 krb5-locales1.16-2ubuntu0.1 libacl12.2.52-3build1 -libapt-inst2.01.6.12 -libapt-pkg5.01.6.12 +libapt-inst2.01.6.12ubuntu0.1 +libapt-pkg5.01.6.12ubuntu0.1 libasn1-8-heimdal7.5.0+dfsg-1 libattr11:2.4.47-2build1 libaudit11:2.8.2-1ubuntu1 @@ -122,7 +122,7 @@ sed4.4-2 sensible-utils0.0.12 sysvinit-utils2.88dsf-59.10ubuntu1 tar1.29b-2ubuntu0.1 -tzdata2019c-0ubuntu0.18.04 +tzdata2020a-0ubuntu0.18.04 ubuntu-keyring2018.09.18.1~18.04.0 udev237-3ubuntu10.40 unrar1:5.5.8-1 From 6eb0fe6bce0186c3d63a7723aca4695913718385 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 21 May 2020 09:59:04 -0400 Subject: [PATCH 073/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 8ea216c..a6763b8 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -115,7 +115,7 @@ ncurses-bin6.1-1ubuntu1.18.04 openssl1.1.1-1ubuntu2.1~18.04.5 passwd1:4.5-1ubuntu2 perl-base5.26.1-6ubuntu0.3 -plexmediaserver1.19.3.2831-181d9145d +plexmediaserver1.19.3.2843-e3c1f7bcd procps2:3.3.12-3ubuntu1.2 publicsuffix20180223.1310-1 sed4.4-2 From 73e090af24140e1e844f303d5d6f3f3e169502f3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 25 May 2020 18:58:38 +0200 Subject: [PATCH 074/514] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index a6763b8..cc6eb33 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -100,7 +100,7 @@ libstdc++68.4.0-1ubuntu1~18.04 libsystemd0237-3ubuntu10.40 libtasn1-64.13-2 libtinfo56.1-1ubuntu1.18.04 -libudev1237-3ubuntu10.40 +libudev1237-3ubuntu10.41 libunistring20.9.9-0ubuntu2 libuuid12.31.1-0.4ubuntu3.6 libwind0-heimdal7.5.0+dfsg-1 @@ -115,7 +115,7 @@ ncurses-bin6.1-1ubuntu1.18.04 openssl1.1.1-1ubuntu2.1~18.04.5 passwd1:4.5-1ubuntu2 perl-base5.26.1-6ubuntu0.3 -plexmediaserver1.19.3.2843-e3c1f7bcd +plexmediaserver1.19.3.2852-219a9974e procps2:3.3.12-3ubuntu1.2 publicsuffix20180223.1310-1 sed4.4-2 @@ -124,7 +124,7 @@ sysvinit-utils2.88dsf-59.10ubuntu1 tar1.29b-2ubuntu0.1 tzdata2020a-0ubuntu0.18.04 ubuntu-keyring2018.09.18.1~18.04.0 -udev237-3ubuntu10.40 +udev237-3ubuntu10.41 unrar1:5.5.8-1 util-linux2.31.1-0.4ubuntu3.6 wget1.19.4-1ubuntu2.2 From effa443e355ece56c32f59650ab089f6aa0be204 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 28 May 2020 04:49:35 +0000 Subject: [PATCH 075/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index cc6eb33..13e162f 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -97,7 +97,7 @@ libsqlite3-03.22.0-1ubuntu0.3 libss21.44.1-1ubuntu1.3 libssl1.11.1.1-1ubuntu2.1~18.04.5 libstdc++68.4.0-1ubuntu1~18.04 -libsystemd0237-3ubuntu10.40 +libsystemd0237-3ubuntu10.41 libtasn1-64.13-2 libtinfo56.1-1ubuntu1.18.04 libudev1237-3ubuntu10.41 From fa3ed96129c4677d9be1913476ae831333919672 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 2 Jun 2020 23:56:34 +0000 Subject: [PATCH 076/514] Bot Updating Templated Files --- Jenkinsfile | 53 +++++++++++++++++------------------------------------ README.md | 40 ++++++++++++++++++++++------------------ 2 files changed, 39 insertions(+), 54 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f505e12..d260026 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -130,7 +130,6 @@ pipeline { steps { script{ env.IMAGE = env.DOCKERHUB_IMAGE - env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/' + env.CONTAINER_NAME env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { @@ -151,7 +150,6 @@ pipeline { steps { script{ env.IMAGE = env.DEV_DOCKERHUB_IMAGE - env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { @@ -172,7 +170,6 @@ pipeline { steps { script{ env.IMAGE = env.PR_DOCKERHUB_IMAGE - env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { @@ -537,22 +534,15 @@ pipeline { credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', usernameVariable: 'DOCKERUSER', passwordVariable: 'DOCKERPASS' - ], - [ - $class: 'UsernamePasswordMultiBinding', - credentialsId: 'Quay.io-Robot', - usernameVariable: 'QUAYUSER', - passwordVariable: 'QUAYPASS' ] ]) { retry(5) { sh '''#! /bin/bash set -e - echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin - for PUSHIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do + for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG} docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest docker push ${PUSHIMAGE}:latest @@ -561,7 +551,7 @@ pipeline { ''' } sh '''#! /bin/bash - for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do + for DELETEIMAGE in "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do docker rmi \ ${DELETEIMAGE}:${META_TAG} \ ${DELETEIMAGE}:latest || : @@ -583,18 +573,11 @@ pipeline { credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', usernameVariable: 'DOCKERUSER', passwordVariable: 'DOCKERPASS' - ], - [ - $class: 'UsernamePasswordMultiBinding', - credentialsId: 'Quay.io-Robot', - usernameVariable: 'QUAYUSER', - passwordVariable: 'QUAYPASS' ] ]) { retry(5) { sh '''#! /bin/bash set -e - echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin @@ -628,26 +611,24 @@ pipeline { docker manifest push --purge ${MANIFESTIMAGE}:latest docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} done - for LEGACYIMAGE in "${GITHUBIMAGE}" "${QUAYIMAGE}"; do - docker tag ${IMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:amd64-${META_TAG} - docker tag ${IMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-${META_TAG} - docker tag ${IMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-${META_TAG} - docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:latest - docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:${META_TAG} - docker tag ${LEGACYIMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-latest - docker tag ${LEGACYIMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-latest - docker push ${LEGACYIMAGE}:amd64-${META_TAG} - docker push ${LEGACYIMAGE}:arm32v7-${META_TAG} - docker push ${LEGACYIMAGE}:arm64v8-${META_TAG} - docker push ${LEGACYIMAGE}:latest - docker push ${LEGACYIMAGE}:${META_TAG} - docker push ${LEGACYIMAGE}:arm32v7-latest - docker push ${LEGACYIMAGE}:arm64v8-latest - done + docker tag ${IMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:amd64-${META_TAG} + docker tag ${IMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-${META_TAG} + docker tag ${IMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-${META_TAG} + docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:latest + docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:${META_TAG} + docker tag ${GITHUBIMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-latest + docker tag ${GITHUBIMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-latest + docker push ${GITHUBIMAGE}:amd64-${META_TAG} + docker push ${GITHUBIMAGE}:arm32v7-${META_TAG} + docker push ${GITHUBIMAGE}:arm64v8-${META_TAG} + docker push ${GITHUBIMAGE}:latest + docker push ${GITHUBIMAGE}:${META_TAG} + docker push ${GITHUBIMAGE}:arm32v7-latest + docker push ${GITHUBIMAGE}:arm64v8-latest ''' } sh '''#! /bin/bash - for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do + for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do docker rmi \ ${DELETEIMAGE}:amd64-${META_TAG} \ ${DELETEIMAGE}:amd64-latest \ diff --git a/README.md b/README.md index 5e70c94..e7a6daf 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io) -[![Blog](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!") -[![Discord](https://img.shields.io/discord/354974912613449730.svg?style=flat-square&color=E68523&label=Discord&logo=discord&logoColor=FFFFFF)](https://discord.gg/YWrKVTn "realtime support / chat with the community and the team.") -[![Discourse](https://img.shields.io/discourse/https/discourse.linuxserver.io/topics.svg?style=flat-square&color=E68523&logo=discourse&logoColor=FFFFFF)](https://discourse.linuxserver.io "post on our community forum.") -[![Fleet](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Fleet)](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.") -[![GitHub](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitHub&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver "view the source for all of our repositories.") -[![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?style=flat-square&color=E68523&label=Supporters&logo=open%20collective&logoColor=FFFFFF)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget") +[![Blog](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!") +[![Discord](https://img.shields.io/discord/354974912613449730.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=Discord&logo=discord)](https://discord.gg/YWrKVTn "realtime support / chat with the community and the team.") +[![Discourse](https://img.shields.io/discourse/https/discourse.linuxserver.io/topics.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=discourse)](https://discourse.linuxserver.io "post on our community forum.") +[![Fleet](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Fleet)](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.") +[![GitHub](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub&logo=github)](https://github.com/linuxserver "view the source for all of our repositories.") +[![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=Supporters&logo=open%20collective)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget") The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring: @@ -25,16 +25,15 @@ Find us at: # [linuxserver/plex](https://github.com/linuxserver/docker-plex) -[![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-plex.svg?style=flat-square&color=E68523&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-plex) -[![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-plex.svg?style=flat-square&color=E68523&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-plex/releases) -[![GitHub Package Repository](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitHub%20Package&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-plex/packages) -[![GitLab Container Registry](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab&logoColor=FFFFFF)](https://gitlab.com/Linuxserver.io/docker-plex/container_registry) -[![Quay.io](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Quay.io)](https://quay.io/repository/linuxserver.io/plex) -[![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/plex.svg?style=flat-square&color=E68523)](https://microbadger.com/images/linuxserver/plex "Get your own version badge on microbadger.com") -[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/plex.svg?style=flat-square&color=E68523&label=pulls&logo=docker&logoColor=FFFFFF)](https://hub.docker.com/r/linuxserver/plex) -[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/plex.svg?style=flat-square&color=E68523&label=stars&logo=docker&logoColor=FFFFFF)](https://hub.docker.com/r/linuxserver/plex) -[![Build Status](https://ci.linuxserver.io/view/all/job/Docker-Pipeline-Builders/job/docker-plex/job/master/badge/icon?style=flat-square)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-plex/job/master/) -[![](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/plex/latest/badge.svg)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/plex/latest/index.html) +[![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-plex.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-plex) +[![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-plex.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-plex/releases) +[![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-plex/packages) +[![GitLab Container Registry](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab)](https://gitlab.com/Linuxserver.io/docker-plex/container_registry) +[![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/plex.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge)](https://microbadger.com/images/linuxserver/plex "Get your own version badge on microbadger.com") +[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/plex.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/plex) +[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/plex.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/plex) +[![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-plex%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-plex/job/master/) +[![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Flsio-ci.ams3.digitaloceanspaces.com%2Flspipepr%2Fplex%2Flatest%2Fci-status.yml)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/plex/latest/index.html) [Plex](https://plex.tv) organizes video, music and photos from personal media libraries and streams them to smart TVs, streaming boxes and mobile devices. This container is packaged as a standalone Plex Media Server. has always been a top priority. Straightforward design and bulk actions mean getting things done faster. @@ -121,7 +120,7 @@ Container images are configured using parameters passed at runtime (such as thos ## Environment variables from files (Docker secrets) -You can set any environment variable from a file by using a special prepend `FILE__`. +You can set any environment variable from a file by using a special prepend `FILE__`. As an example: @@ -131,6 +130,11 @@ As an example: Will set the environment variable `PASSWORD` based on the contents of the `/run/secrets/mysecretpassword` file. +## Umask for running applications + +For all of our images we provide the ability to override the default umask settings for services started within the containers using the optional `-e UMASK=022` setting. +Keep in mind umask is not chmod it subtracts from permissions based on it's value it does not add. Please read up [here](https://en.wikipedia.org/wiki/Umask) before asking for support. + ## Optional Parameters If you want to run the container in bridge network mode (instead of the recommended host network mode) you will need to specify ports. @@ -212,7 +216,7 @@ We automatically add the necessary environment variable that will utilise all th ## Docker Mods -[![Docker Mods](https://img.shields.io/badge/dynamic/yaml?style=for-the-badge&color=E68523&label=mods&query=%24.mods%5B%27plex%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=plex "view available mods for this container.") +[![Docker Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=mods&query=%24.mods%5B%27plex%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=plex "view available mods for this container.") We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to enable additional functionality within the containers. The list of Mods available for this image (if any) can be accessed via the dynamic badge above. From 9a1efdcaf12f5ca4b56e60874580ea64a9006e68 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 3 Jun 2020 02:01:28 +0200 Subject: [PATCH 077/514] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 13e162f..7939d2b 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -95,7 +95,7 @@ libsepol12.7-1 libsmartcols12.31.1-0.4ubuntu3.6 libsqlite3-03.22.0-1ubuntu0.3 libss21.44.1-1ubuntu1.3 -libssl1.11.1.1-1ubuntu2.1~18.04.5 +libssl1.11.1.1-1ubuntu2.1~18.04.6 libstdc++68.4.0-1ubuntu1~18.04 libsystemd0237-3ubuntu10.41 libtasn1-64.13-2 @@ -112,10 +112,10 @@ mawk1.3.3-17ubuntu3 mount2.31.1-0.4ubuntu3.6 ncurses-base6.1-1ubuntu1.18.04 ncurses-bin6.1-1ubuntu1.18.04 -openssl1.1.1-1ubuntu2.1~18.04.5 +openssl1.1.1-1ubuntu2.1~18.04.6 passwd1:4.5-1ubuntu2 perl-base5.26.1-6ubuntu0.3 -plexmediaserver1.19.3.2852-219a9974e +plexmediaserver1.19.4.2902-69560ce1e procps2:3.3.12-3ubuntu1.2 publicsuffix20180223.1310-1 sed4.4-2 From e03cad9580ab336706a1c0ec71442c40088ac233 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 4 Jun 2020 04:45:53 +0000 Subject: [PATCH 078/514] Bot Updating Templated Files --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e7a6daf..b2c239e 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ Find us at: [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/plex.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/plex) [![Docker Stars](https://img.shields.io/docker/stars/linuxserver/plex.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/plex) [![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-plex%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-plex/job/master/) -[![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Flsio-ci.ams3.digitaloceanspaces.com%2Flspipepr%2Fplex%2Flatest%2Fci-status.yml)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/plex/latest/index.html) +[![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Flsio-ci.ams3.digitaloceanspaces.com%2Flinuxserver%2Fplex%2Flatest%2Fci-status.yml)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/plex/latest/index.html) [Plex](https://plex.tv) organizes video, music and photos from personal media libraries and streams them to smart TVs, streaming boxes and mobile devices. This container is packaged as a standalone Plex Media Server. has always been a top priority. Straightforward design and bulk actions mean getting things done faster. From 6e23d6f07c2435ebf87edbddc135920854f74d18 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 4 Jun 2020 00:54:36 -0400 Subject: [PATCH 079/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 7939d2b..6ead830 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -6,7 +6,7 @@ base-passwd3.5.44 bash4.4.18-2ubuntu1.2 bsdutils1:2.31.1-0.4ubuntu3.6 bzip21.0.6-8.1ubuntu0.2 -ca-certificates20180409 +ca-certificates20190110~18.04.1 coreutils8.28-1ubuntu1 curl7.58.0-2ubuntu3.8 dash0.5.8-2.10 From f7c5e0f277ec7b6613dcecd5776e2c6e72fd3dfe Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 11 Jun 2020 00:48:59 -0400 Subject: [PATCH 080/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 6ead830..f4f9d6d 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -93,7 +93,7 @@ libsemanage12.7-2build2 libsemanage-common2.7-2build2 libsepol12.7-1 libsmartcols12.31.1-0.4ubuntu3.6 -libsqlite3-03.22.0-1ubuntu0.3 +libsqlite3-03.22.0-1ubuntu0.4 libss21.44.1-1ubuntu1.3 libssl1.11.1.1-1ubuntu2.1~18.04.6 libstdc++68.4.0-1ubuntu1~18.04 From 390e359abbe6083a599d0e8c6adbe25ae90a63cc Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 11 Jun 2020 16:01:49 +0000 Subject: [PATCH 081/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index f4f9d6d..fe7c1a1 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -115,7 +115,7 @@ ncurses-bin6.1-1ubuntu1.18.04 openssl1.1.1-1ubuntu2.1~18.04.6 passwd1:4.5-1ubuntu2 perl-base5.26.1-6ubuntu0.3 -plexmediaserver1.19.4.2902-69560ce1e +plexmediaserver1.19.4.2935-79e214ead procps2:3.3.12-3ubuntu1.2 publicsuffix20180223.1310-1 sed4.4-2 From 29482520fc04d85d442c3bca3f031396f2ed9576 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 25 Jun 2020 04:49:17 +0000 Subject: [PATCH 082/514] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index fe7c1a1..bfd2e08 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -8,7 +8,7 @@ bsdutils1:2.31.1-0.4ubuntu3.6 bzip21.0.6-8.1ubuntu0.2 ca-certificates20190110~18.04.1 coreutils8.28-1ubuntu1 -curl7.58.0-2ubuntu3.8 +curl7.58.0-2ubuntu3.9 dash0.5.8-2.10 debconf1.5.66ubuntu1 debianutils4.8.4 @@ -38,7 +38,7 @@ libc62.27-3ubuntu1 libcap-ng00.7.7-3.1 libc-bin2.27-3ubuntu1 libcom-err21.44.1-1ubuntu1.3 -libcurl47.58.0-2ubuntu3.8 +libcurl47.58.0-2ubuntu3.9 libdb5.35.3.28-13.1ubuntu1.1 libdebconfclient00.213ubuntu1 libext2fs21.44.1-1ubuntu1.3 From 8f4abb2931f341aef887f143b40d4eb963174a2d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 2 Jul 2020 04:49:12 +0000 Subject: [PATCH 083/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index bfd2e08..a1b5d96 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -87,7 +87,7 @@ librtmp12.4+20151223.gitfa8646d.1-1 libsasl2-22.1.27~101-g0780600+dfsg-3ubuntu2.1 libsasl2-modules2.1.27~101-g0780600+dfsg-3ubuntu2.1 libsasl2-modules-db2.1.27~101-g0780600+dfsg-3ubuntu2.1 -libseccomp22.4.1-0ubuntu0.18.04.2 +libseccomp22.4.3-1ubuntu3.18.04.2 libselinux12.7-2build2 libsemanage12.7-2build2 libsemanage-common2.7-2build2 From 314cc5245439774949fee26a1015cbf5d70a6f63 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 9 Jul 2020 00:49:29 -0400 Subject: [PATCH 084/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index a1b5d96..f3cc7c7 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -105,7 +105,7 @@ libunistring20.9.9-0ubuntu2 libuuid12.31.1-0.4ubuntu3.6 libwind0-heimdal7.5.0+dfsg-1 libzstd11.3.3+dfsg-2ubuntu1.1 -locales2.27-3ubuntu1 +locales2.27-3ubuntu1.2 login1:4.5-1ubuntu2 lsb-base9.20170808ubuntu1 mawk1.3.3-17ubuntu3 From 8696791631113054f9f8e519d8f038adbfc1c9a9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 16 Jul 2020 04:49:21 +0000 Subject: [PATCH 085/514] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index f3cc7c7..1ba4dce 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -34,9 +34,9 @@ libaudit11:2.8.2-1ubuntu1 libaudit-common1:2.8.2-1ubuntu1 libblkid12.31.1-0.4ubuntu3.6 libbz2-1.01.0.6-8.1ubuntu0.2 -libc62.27-3ubuntu1 +libc62.27-3ubuntu1.2 libcap-ng00.7.7-3.1 -libc-bin2.27-3ubuntu1 +libc-bin2.27-3ubuntu1.2 libcom-err21.44.1-1ubuntu1.3 libcurl47.58.0-2ubuntu3.9 libdb5.35.3.28-13.1ubuntu1.1 @@ -47,7 +47,7 @@ libffi63.2.1-8 libgcc11:8.4.0-1ubuntu1~18.04 libgcrypt201.8.1-4ubuntu1.2 libgmp102:6.1.2+dfsg-2 -libgnutls303.5.18-1ubuntu1.3 +libgnutls303.5.18-1ubuntu1.4 libgpg-error01.27-6 libgssapi3-heimdal7.5.0+dfsg-1 libgssapi-krb5-21.16-2ubuntu0.1 From 21b0557fa69c2c0b7c6fcb37644d293b3548c9a0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 22 Jul 2020 08:59:10 +0000 Subject: [PATCH 086/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 1ba4dce..d6c4ec3 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -115,7 +115,7 @@ ncurses-bin6.1-1ubuntu1.18.04 openssl1.1.1-1ubuntu2.1~18.04.6 passwd1:4.5-1ubuntu2 perl-base5.26.1-6ubuntu0.3 -plexmediaserver1.19.4.2935-79e214ead +plexmediaserver1.19.5.3112-b23ab3896 procps2:3.3.12-3ubuntu1.2 publicsuffix20180223.1310-1 sed4.4-2 From 680c7bd898ed2d9e496739659fb835ad54656385 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 23 Jul 2020 04:49:18 +0000 Subject: [PATCH 087/514] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index d6c4ec3..b2338b9 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -64,8 +64,8 @@ libkmod224-1ubuntu3.4 libkrb5-26-heimdal7.5.0+dfsg-1 libkrb5-31.16-2ubuntu0.1 libkrb5support01.16-2ubuntu0.1 -libldap-2.4-22.4.45+dfsg-1ubuntu1.5 -libldap-common2.4.45+dfsg-1ubuntu1.5 +libldap-2.4-22.4.45+dfsg-1ubuntu1.6 +libldap-common2.4.45+dfsg-1ubuntu1.6 liblz4-10.0~r131-2ubuntu3 liblzma55.2.2-1.3 libmount12.31.1-0.4ubuntu3.6 From bd4531d6e8ed0571ec7ef7ca96fc576f33b7eb08 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 30 Jul 2020 04:49:28 +0000 Subject: [PATCH 088/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index b2338b9..2031dee 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -87,7 +87,7 @@ librtmp12.4+20151223.gitfa8646d.1-1 libsasl2-22.1.27~101-g0780600+dfsg-3ubuntu2.1 libsasl2-modules2.1.27~101-g0780600+dfsg-3ubuntu2.1 libsasl2-modules-db2.1.27~101-g0780600+dfsg-3ubuntu2.1 -libseccomp22.4.3-1ubuntu3.18.04.2 +libseccomp22.4.3-1ubuntu3.18.04.3 libselinux12.7-2build2 libsemanage12.7-2build2 libsemanage-common2.7-2build2 From be697e8f323b18840e6a0ec213cdbd9893955a74 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 6 Aug 2020 00:46:24 -0400 Subject: [PATCH 089/514] Bot Updating Templated Files --- Jenkinsfile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d260026..0083135 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -57,7 +57,7 @@ pipeline { env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/' env.PULL_REQUEST = env.CHANGE_ID - env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE.md ./.github/PULL_REQUEST_TEMPLATE.md' + env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/greetings.yml ./.github/workflows/stale.yml' } script{ env.LS_RELEASE_NUMBER = sh( @@ -236,7 +236,7 @@ pipeline { cd ${TEMPDIR}/repo/${LS_REPO} git checkout -f master cd ${TEMPDIR}/docker-${CONTAINER_NAME} - mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github + mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ cd ${TEMPDIR}/repo/${LS_REPO}/ git add ${TEMPLATED_FILES} @@ -690,6 +690,10 @@ pipeline { ] ]) { sh '''#! /bin/bash + set -e + TEMPDIR=$(mktemp -d) + docker pull linuxserver/jenkins-builder:latest + docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest docker pull lsiodev/readme-sync docker run --rm=true \ -e DOCKERHUB_USERNAME=$DOCKERUSER \ @@ -697,7 +701,9 @@ pipeline { -e GIT_REPOSITORY=${LS_USER}/${LS_REPO} \ -e DOCKER_REPOSITORY=${IMAGE} \ -e GIT_BRANCH=master \ - lsiodev/readme-sync bash -c 'node sync' ''' + -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/mnt \ + lsiodev/readme-sync bash -c 'node sync' + rm -Rf ${TEMPDIR} ''' } } } From ff87890c9552c0d553bb95921a32d1e2ea03c7aa Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 6 Aug 2020 04:47:55 +0000 Subject: [PATCH 090/514] Bot Updating Templated Files --- .github/workflows/greetings.yml | 13 +++++++++++++ .github/workflows/stale.yml | 23 +++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100755 .github/workflows/greetings.yml create mode 100755 .github/workflows/stale.yml diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml new file mode 100755 index 0000000..063b88e --- /dev/null +++ b/.github/workflows/greetings.yml @@ -0,0 +1,13 @@ +name: Greetings + +on: [pull_request, issues] + +jobs: + greeting: + runs-on: ubuntu-latest + steps: + - uses: actions/first-interaction@v1 + with: + issue-message: 'Thanks for opening your first issue here! Be sure to follow the [issue template](https://github.com/linuxserver/docker-plex/.github/ISSUE_TEMPLATE.md)!' + pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-plex/.github/PULL_REQUEST_TEMPLATE.md)!' + repo-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml new file mode 100755 index 0000000..1806420 --- /dev/null +++ b/.github/workflows/stale.yml @@ -0,0 +1,23 @@ +name: Mark stale issues and pull requests + +on: + schedule: + - cron: "30 1 * * *" + +jobs: + stale: + + runs-on: ubuntu-latest + + steps: + - uses: actions/stale@v1 + with: + stale-issue-message: "This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions." + stale-pr-message: "This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions." + stale-issue-label: 'no-issue-activity' + stale-pr-label: 'no-pr-activity' + days-before-stale: 30 + days-before-close: 365 + exempt-issue-labels: 'awaiting-approval,work-in-progress' + exempt-pr-labels: 'awaiting-approval,work-in-progress' + repo-token: ${{ secrets.GITHUB_TOKEN }} From 455bde46593f9299999e1f33ce259eadce982134 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 6 Aug 2020 04:51:38 +0000 Subject: [PATCH 091/514] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 2031dee..7579dbf 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -60,7 +60,7 @@ libidn2-02.0.4-1.1ubuntu0.2 libjq11.5+dfsg-2 libk5crypto31.16-2ubuntu0.1 libkeyutils11.5.9-9.2ubuntu2 -libkmod224-1ubuntu3.4 +libkmod224-1ubuntu3.5 libkrb5-26-heimdal7.5.0+dfsg-1 libkrb5-31.16-2ubuntu0.1 libkrb5support01.16-2ubuntu0.1 @@ -100,7 +100,7 @@ libstdc++68.4.0-1ubuntu1~18.04 libsystemd0237-3ubuntu10.41 libtasn1-64.13-2 libtinfo56.1-1ubuntu1.18.04 -libudev1237-3ubuntu10.41 +libudev1237-3ubuntu10.42 libunistring20.9.9-0ubuntu2 libuuid12.31.1-0.4ubuntu3.6 libwind0-heimdal7.5.0+dfsg-1 @@ -124,7 +124,7 @@ sysvinit-utils2.88dsf-59.10ubuntu1 tar1.29b-2ubuntu0.1 tzdata2020a-0ubuntu0.18.04 ubuntu-keyring2018.09.18.1~18.04.0 -udev237-3ubuntu10.41 +udev237-3ubuntu10.42 unrar1:5.5.8-1 util-linux2.31.1-0.4ubuntu3.6 wget1.19.4-1ubuntu2.2 From 776421365454a5c983dea75f176cfcaaeb230e67 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 13 Aug 2020 00:48:52 -0400 Subject: [PATCH 092/514] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 7579dbf..366e4ce 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,7 +1,7 @@ adduser3.116ubuntu1 apt1.6.12ubuntu0.1 apt-utils1.6.12ubuntu0.1 -base-files10.1ubuntu2.8 +base-files10.1ubuntu2.9 base-passwd3.5.44 bash4.4.18-2ubuntu1.2 bsdutils1:2.31.1-0.4ubuntu3.6 @@ -97,7 +97,7 @@ libsqlite3-03.22.0-1ubuntu0.4 libss21.44.1-1ubuntu1.3 libssl1.11.1.1-1ubuntu2.1~18.04.6 libstdc++68.4.0-1ubuntu1~18.04 -libsystemd0237-3ubuntu10.41 +libsystemd0237-3ubuntu10.42 libtasn1-64.13-2 libtinfo56.1-1ubuntu1.18.04 libudev1237-3ubuntu10.42 From 850f49bd62af58c8a3681eaf76c2006a4a6f5694 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 20 Aug 2020 04:46:10 +0000 Subject: [PATCH 093/514] Bot Updating Templated Files --- .github/workflows/greetings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml index 063b88e..5d7ee9c 100755 --- a/.github/workflows/greetings.yml +++ b/.github/workflows/greetings.yml @@ -1,6 +1,6 @@ name: Greetings -on: [pull_request, issues] +on: [pull_request_target, issues] jobs: greeting: From 75fe34bfd4545e892bafc05c5449a796e7179ed9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 20 Aug 2020 04:50:20 +0000 Subject: [PATCH 094/514] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 366e4ce..d5a8fa0 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -8,7 +8,7 @@ bsdutils1:2.31.1-0.4ubuntu3.6 bzip21.0.6-8.1ubuntu0.2 ca-certificates20190110~18.04.1 coreutils8.28-1ubuntu1 -curl7.58.0-2ubuntu3.9 +curl7.58.0-2ubuntu3.10 dash0.5.8-2.10 debconf1.5.66ubuntu1 debianutils4.8.4 @@ -38,7 +38,7 @@ libc62.27-3ubuntu1.2 libcap-ng00.7.7-3.1 libc-bin2.27-3ubuntu1.2 libcom-err21.44.1-1ubuntu1.3 -libcurl47.58.0-2ubuntu3.9 +libcurl47.58.0-2ubuntu3.10 libdb5.35.3.28-13.1ubuntu1.1 libdebconfclient00.213ubuntu1 libext2fs21.44.1-1ubuntu1.3 From 3491f0ba955b43dce090460941fdce4c041cac64 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 27 Aug 2020 11:58:46 -0400 Subject: [PATCH 095/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index d5a8fa0..838b4a6 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -115,7 +115,7 @@ ncurses-bin6.1-1ubuntu1.18.04 openssl1.1.1-1ubuntu2.1~18.04.6 passwd1:4.5-1ubuntu2 perl-base5.26.1-6ubuntu0.3 -plexmediaserver1.19.5.3112-b23ab3896 +plexmediaserver1.20.1.3252-a78fef9a9 procps2:3.3.12-3ubuntu1.2 publicsuffix20180223.1310-1 sed4.4-2 From 39f39cdaf3d43a49e1bba1454eb272459cb12cf0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 10 Sep 2020 05:47:57 +0100 Subject: [PATCH 096/514] Bot Updating Package Versions --- package_versions.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 838b4a6..50dd80c 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,7 +1,7 @@ adduser3.116ubuntu1 apt1.6.12ubuntu0.1 apt-utils1.6.12ubuntu0.1 -base-files10.1ubuntu2.9 +base-files10.1ubuntu2.10 base-passwd3.5.44 bash4.4.18-2ubuntu1.2 bsdutils1:2.31.1-0.4ubuntu3.6 @@ -75,10 +75,10 @@ libnettle63.4-1 libnghttp2-141.30.0-1ubuntu1 libonig46.7.0-1 libp11-kit00.23.9-2 -libpam0g1.1.8-3.6ubuntu2.18.04.1 -libpam-modules1.1.8-3.6ubuntu2.18.04.1 -libpam-modules-bin1.1.8-3.6ubuntu2.18.04.1 -libpam-runtime1.1.8-3.6ubuntu2.18.04.1 +libpam0g1.1.8-3.6ubuntu2.18.04.2 +libpam-modules1.1.8-3.6ubuntu2.18.04.2 +libpam-modules-bin1.1.8-3.6ubuntu2.18.04.2 +libpam-runtime1.1.8-3.6ubuntu2.18.04.2 libpcre32:8.39-9 libprocps62:3.3.12-3ubuntu1.2 libpsl50.19.1-5build1 From 8dd440c850890fe59556cde802785e4f841d4879 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 24 Sep 2020 00:48:56 -0400 Subject: [PATCH 097/514] Bot Updating Package Versions --- package_versions.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 50dd80c..a972b65 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -4,7 +4,7 @@ apt-utils1.6.12ubuntu0.1 base-files10.1ubuntu2.10 base-passwd3.5.44 bash4.4.18-2ubuntu1.2 -bsdutils1:2.31.1-0.4ubuntu3.6 +bsdutils1:2.31.1-0.4ubuntu3.7 bzip21.0.6-8.1ubuntu0.2 ca-certificates20190110~18.04.1 coreutils8.28-1ubuntu1 @@ -15,10 +15,10 @@ debianutils4.8.4 diffutils1:3.6-1 dpkg1.19.0.5ubuntu2.3 e2fsprogs1.44.1-1ubuntu1.3 -fdisk2.31.1-0.4ubuntu3.6 +fdisk2.31.1-0.4ubuntu3.7 findutils4.6.0+git+20170828-2 gcc-8-base8.4.0-1ubuntu1~18.04 -gpgv2.2.4-1ubuntu1.2 +gpgv2.2.4-1ubuntu1.3 grep3.1-2build1 gzip1.6-5ubuntu1 hostname3.20 @@ -32,7 +32,7 @@ libasn1-8-heimdal7.5.0+dfsg-1 libattr11:2.4.47-2build1 libaudit11:2.8.2-1ubuntu1 libaudit-common1:2.8.2-1ubuntu1 -libblkid12.31.1-0.4ubuntu3.6 +libblkid12.31.1-0.4ubuntu3.7 libbz2-1.01.0.6-8.1ubuntu0.2 libc62.27-3ubuntu1.2 libcap-ng00.7.7-3.1 @@ -42,7 +42,7 @@ libcurl47.58.0-2ubuntu3.10 libdb5.35.3.28-13.1ubuntu1.1 libdebconfclient00.213ubuntu1 libext2fs21.44.1-1ubuntu1.3 -libfdisk12.31.1-0.4ubuntu3.6 +libfdisk12.31.1-0.4ubuntu3.7 libffi63.2.1-8 libgcc11:8.4.0-1ubuntu1~18.04 libgcrypt201.8.1-4ubuntu1.2 @@ -68,7 +68,7 @@ libldap-2.4-22.4.45+dfsg-1ubuntu1.6 libldap-common2.4.45+dfsg-1ubuntu1.6 liblz4-10.0~r131-2ubuntu3 liblzma55.2.2-1.3 -libmount12.31.1-0.4ubuntu3.6 +libmount12.31.1-0.4ubuntu3.7 libncurses56.1-1ubuntu1.18.04 libncursesw56.1-1ubuntu1.18.04 libnettle63.4-1 @@ -92,7 +92,7 @@ libselinux12.7-2build2 libsemanage12.7-2build2 libsemanage-common2.7-2build2 libsepol12.7-1 -libsmartcols12.31.1-0.4ubuntu3.6 +libsmartcols12.31.1-0.4ubuntu3.7 libsqlite3-03.22.0-1ubuntu0.4 libss21.44.1-1ubuntu1.3 libssl1.11.1.1-1ubuntu2.1~18.04.6 @@ -102,14 +102,14 @@ libtasn1-64.13-2 libtinfo56.1-1ubuntu1.18.04 libudev1237-3ubuntu10.42 libunistring20.9.9-0ubuntu2 -libuuid12.31.1-0.4ubuntu3.6 +libuuid12.31.1-0.4ubuntu3.7 libwind0-heimdal7.5.0+dfsg-1 libzstd11.3.3+dfsg-2ubuntu1.1 locales2.27-3ubuntu1.2 login1:4.5-1ubuntu2 lsb-base9.20170808ubuntu1 mawk1.3.3-17ubuntu3 -mount2.31.1-0.4ubuntu3.6 +mount2.31.1-0.4ubuntu3.7 ncurses-base6.1-1ubuntu1.18.04 ncurses-bin6.1-1ubuntu1.18.04 openssl1.1.1-1ubuntu2.1~18.04.6 @@ -126,6 +126,6 @@ tzdata2020a-0ubuntu0.18.04 ubuntu-keyring2018.09.18.1~18.04.0 udev237-3ubuntu10.42 unrar1:5.5.8-1 -util-linux2.31.1-0.4ubuntu3.6 +util-linux2.31.1-0.4ubuntu3.7 wget1.19.4-1ubuntu2.2 zlib1g1:1.2.11.dfsg-0ubuntu2 From b01b20502745cc0d156cb2b5fb24cd6f15482dd8 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 5 Oct 2020 23:56:04 -0400 Subject: [PATCH 098/514] Bot Updating Templated Files --- .github/ISSUE_TEMPLATE.md | 12 ++++-- .github/PULL_REQUEST_TEMPLATE.md | 10 +++-- .github/workflows/greetings.yml | 4 +- Jenkinsfile | 28 +++++++++++- README.md | 74 +++++++++++++++++--------------- 5 files changed, 82 insertions(+), 46 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 01a2c15..8c06d53 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,7 +1,10 @@ [linuxserverurl]: https://linuxserver.io [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl] -If you are new to Docker or this application our issue tracker is **ONLY** used for reporting bugs or requesting features. Please use [our discord server](https://discord.gg/YWrKVTn) for general support. + + + + @@ -22,9 +25,10 @@ If you are new to Docker or this application our issue tracker is **ONLY** used 4. ## Environment -**OS:** -**CPU architecture:** x86_64/arm32/arm64 -**How docker service was installed:** +**OS:** +**CPU architecture:** x86_64/arm32/arm64 +**How docker service was installed:** + ## Command used to create docker container (run/create/compose/screenshot) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 26d5031..6507b17 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -2,11 +2,11 @@ [linuxserverurl]: https://linuxserver.io [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl] - + - + @@ -21,7 +21,11 @@ ------------------------------ -We welcome all PR’s though this doesn’t guarantee it will be accepted. + - [ ] I have read the [contributing](https://github.com/linuxserver/docker-plex/blob/master/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications + +------------------------------ + + ## Description: diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml index 5d7ee9c..ba6c69c 100755 --- a/.github/workflows/greetings.yml +++ b/.github/workflows/greetings.yml @@ -8,6 +8,6 @@ jobs: steps: - uses: actions/first-interaction@v1 with: - issue-message: 'Thanks for opening your first issue here! Be sure to follow the [issue template](https://github.com/linuxserver/docker-plex/.github/ISSUE_TEMPLATE.md)!' - pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-plex/.github/PULL_REQUEST_TEMPLATE.md)!' + issue-message: 'Thanks for opening your first issue here! Be sure to follow the [issue template](https://github.com/linuxserver/docker-plex/blob/master/.github/ISSUE_TEMPLATE.md)!' + pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-plex/blob/master/.github/PULL_REQUEST_TEMPLATE.md)!' repo-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/Jenkinsfile b/Jenkinsfile index 0083135..b25dafd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -57,7 +57,7 @@ pipeline { env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/' env.PULL_REQUEST = env.CHANGE_ID - env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/greetings.yml ./.github/workflows/stale.yml' + env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/greetings.yml ./.github/workflows/stale.yml' } script{ env.LS_RELEASE_NUMBER = sh( @@ -138,6 +138,7 @@ pipeline { env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER } env.META_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN } } } @@ -158,6 +159,7 @@ pipeline { env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA } env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/' } } @@ -178,6 +180,7 @@ pipeline { env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST } env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/' } @@ -545,8 +548,10 @@ pipeline { for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG} docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest + docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG} docker push ${PUSHIMAGE}:latest docker push ${PUSHIMAGE}:${META_TAG} + docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG} done ''' } @@ -554,6 +559,7 @@ pipeline { for DELETEIMAGE in "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do docker rmi \ ${DELETEIMAGE}:${META_TAG} \ + ${DELETEIMAGE}:${EXT_RELEASE_TAG} \ ${DELETEIMAGE}:latest || : done ''' @@ -594,12 +600,18 @@ pipeline { docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-latest docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-latest docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest + docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} + docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} + docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} docker push ${MANIFESTIMAGE}:amd64-${META_TAG} docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG} docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} docker push ${MANIFESTIMAGE}:amd64-latest docker push ${MANIFESTIMAGE}:arm32v7-latest docker push ${MANIFESTIMAGE}:arm64v8-latest + docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} + docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} + docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} docker manifest push --purge ${MANIFESTIMAGE}:latest || : docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm @@ -608,8 +620,12 @@ pipeline { docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8 + docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} + docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm + docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8 docker manifest push --purge ${MANIFESTIMAGE}:latest docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} + docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} done docker tag ${IMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:amd64-${META_TAG} docker tag ${IMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-${META_TAG} @@ -618,6 +634,10 @@ pipeline { docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:${META_TAG} docker tag ${GITHUBIMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-latest docker tag ${GITHUBIMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-latest + docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:amd64-${EXT_RELEASE_TAG} + docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:${EXT_RELEASE_TAG} + docker tag ${GITHUBIMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-${EXT_RELEASE_TAG} + docker tag ${GITHUBIMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-${EXT_RELEASE_TAG} docker push ${GITHUBIMAGE}:amd64-${META_TAG} docker push ${GITHUBIMAGE}:arm32v7-${META_TAG} docker push ${GITHUBIMAGE}:arm64v8-${META_TAG} @@ -625,6 +645,10 @@ pipeline { docker push ${GITHUBIMAGE}:${META_TAG} docker push ${GITHUBIMAGE}:arm32v7-latest docker push ${GITHUBIMAGE}:arm64v8-latest + docker push ${GITHUBIMAGE}:${EXT_RELEASE_TAG} + docker push ${GITHUBIMAGE}:amd64-${EXT_RELEASE_TAG} + docker push ${GITHUBIMAGE}:arm32v7-${EXT_RELEASE_TAG} + docker push ${GITHUBIMAGE}:arm64v8-${EXT_RELEASE_TAG} ''' } sh '''#! /bin/bash @@ -693,7 +717,7 @@ pipeline { set -e TEMPDIR=$(mktemp -d) docker pull linuxserver/jenkins-builder:latest - docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest + docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH="${BRANCH_NAME}" -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest docker pull lsiodev/readme-sync docker run --rm=true \ -e DOCKERHUB_USERNAME=$DOCKERUSER \ diff --git a/README.md b/README.md index b2c239e..e5bbf41 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,6 @@ + + + [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io) [![Blog](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!") @@ -58,30 +61,11 @@ The architectures supported by this image are: Here are some example snippets to help you get started creating a container. -### docker - -``` -docker create \ - --name=plex \ - --net=host \ - -e PUID=1000 \ - -e PGID=1000 \ - -e VERSION=docker \ - -e UMASK_SET=022 `#optional` \ - -e PLEX_CLAIM= `#optional` \ - -v /path/to/library:/config \ - -v /path/to/tvseries:/tv \ - -v /path/to/movies:/movies \ - --restart unless-stopped \ - linuxserver/plex -``` - - -### docker-compose +### docker-compose ([recommended](https://docs.linuxserver.io/general/docker-compose)) Compatible with docker-compose v2 schemas. -``` +```yaml --- version: "2.1" services: @@ -102,6 +86,25 @@ services: restart: unless-stopped ``` +### docker cli + +``` +docker run -d \ + --name=plex \ + --net=host \ + -e PUID=1000 \ + -e PGID=1000 \ + -e VERSION=docker \ + -e UMASK_SET=022 `#optional` \ + -e PLEX_CLAIM= `#optional` \ + -v /path/to/library:/config \ + -v /path/to/tvseries:/tv \ + -v /path/to/movies:/movies \ + --restart unless-stopped \ + linuxserver/plex +``` + + ## Parameters Container images are configured using parameters passed at runtime (such as those above). These parameters are separated by a colon and indicate `:` respectively. For example, `-p 8080:80` would expose port `80` from inside the container to be accessible from the host's IP on port `8080` outside the container. @@ -216,9 +219,9 @@ We automatically add the necessary environment variable that will utilise all th ## Docker Mods -[![Docker Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=mods&query=%24.mods%5B%27plex%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=plex "view available mods for this container.") +[![Docker Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=plex&query=%24.mods%5B%27plex%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=plex "view available mods for this container.") [![Docker Universal Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=universal&query=%24.mods%5B%27universal%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=universal "view available universal mods.") -We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to enable additional functionality within the containers. The list of Mods available for this image (if any) can be accessed via the dynamic badge above. +We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to enable additional functionality within the containers. The list of Mods available for this image (if any) as well as universal mods that can be applied to any one of our images can be accessed via the dynamic badges above. ## Support Info @@ -236,14 +239,6 @@ Most of our images are static, versioned, and require an image update and contai Below are the instructions for updating containers: -### Via Docker Run/Create -* Update the image: `docker pull linuxserver/plex` -* Stop the running container: `docker stop plex` -* Delete the container: `docker rm plex` -* Recreate a new container with the same docker create parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved) -* Start the new container: `docker start plex` -* You can also remove the old dangling images: `docker image prune` - ### Via Docker Compose * Update all images: `docker-compose pull` * or update a single image: `docker-compose pull plex` @@ -251,7 +246,14 @@ Below are the instructions for updating containers: * or update a single container: `docker-compose up -d plex` * You can also remove the old dangling images: `docker image prune` -### Via Watchtower auto-updater (especially useful if you don't remember the original parameters) +### Via Docker Run +* Update the image: `docker pull linuxserver/plex` +* Stop the running container: `docker stop plex` +* Delete the container: `docker rm plex` +* Recreate a new container with the same docker run parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved) +* You can also remove the old dangling images: `docker image prune` + +### Via Watchtower auto-updater (only use if you don't remember the original parameters) * Pull the latest image at its tag and replace it with the same env variables in one run: ``` docker run --rm \ @@ -259,11 +261,13 @@ Below are the instructions for updating containers: containrrr/watchtower \ --run-once plex ``` - -**Note:** We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using Docker Compose. - * You can also remove the old dangling images: `docker image prune` +**Note:** We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using [Docker Compose](https://docs.linuxserver.io/general/docker-compose). + +### Image Update Notifications - Diun (Docker Image Update Notifier) +* We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported. + ## Building locally If you want to make local modifications to these images for development purposes or just to customize the logic: From 1dcaae4046343fee0a8d70115e382ece7e05ae1b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 6 Oct 2020 03:57:43 +0000 Subject: [PATCH 099/514] Bot Updating Templated Files --- .github/CONTRIBUTING.md | 122 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) create mode 100755 .github/CONTRIBUTING.md diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md new file mode 100755 index 0000000..e1dd93e --- /dev/null +++ b/.github/CONTRIBUTING.md @@ -0,0 +1,122 @@ +# Contributing to plex + +## Gotchas + +* While contributing make sure to make all your changes before creating a Pull Request, as our pipeline builds each commit after the PR is open. +* Read, and fill the Pull Request template + * If this is a fix for a typo in code or documentation in the README please file an issue + * If the PR is addressing an existing issue include, closes #\, in the body of the PR commit message +* If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://discord.gg/YWrKVTn) + +## Common files + +| File | Use case | +| :----: | --- | +| `Dockerfile` | Dockerfile used to build amd64 images | +| `Dockerfile.aarch64` | Dockerfile used to build 64bit ARM architectures | +| `Dockerfile.armhf` | Dockerfile used to build 32bit ARM architectures | +| `Jenkinsfile` | This file is a product of our builder and should not be edited directly. This is used to build the image | +| `jenkins-vars.yml` | This file is used to generate the `Jenkinsfile` mentioned above, it only affects the build-process | +| `package_versions.txt` | This file is generated as a part of the build-process and should not be edited directly. It lists all the installed packages and their versions | +| `README.md` | This file is a product of our builder and should not be edited directly. This displays the readme for the repository and image registries | +| `readme-vars.yml` | This file is used to generate the `README.md` | + +## Readme + +If you would like to change our readme, please __**do not**__ directly edit the readme, as it is auto-generated on each commit. +Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-plex/edit/master/readme-vars.yml). + +These variables are used in a template for our [Jenkins Builder](https://github.com/linuxserver/docker-jenkins-builder) as part of an ansible play. +Most of these variables are also carried over to [docs.linuxserver.io](https://docs.linuxserver.io/images/docker-plex) + +### Fixing typos or clarify the text in the readme + +There are variables for multiple parts of the readme, the most common ones are: + +| Variable | Description | +| :----: | --- | +| `project_blurb` | This is the short excerpt shown above the project logo. | +| `app_setup_block` | This is the text that shows up under "Application Setup" if enabled | + +### Parameters + +The compose and run examples are also generated from these variables. + +We have a [reference file](https://github.com/linuxserver/docker-jenkins-builder/blob/master/vars/_container-vars-blank) in our Jenkins Builder. + +These are prefixed with `param_` for required parameters, or `opt_param` for optional parameters, except for `cap_add`. +Remember to enable param, if currently disabled. This differs between parameters, and can be seen in the reference file. + +Devices, environment variables, ports and volumes expects its variables in a certain way. + +### Devices + +```yml +param_devices: + - { device_path: "/dev/dri", device_host_path: "/dev/dri", desc: "For hardware transcoding" } +opt_param_devices: + - { device_path: "/dev/dri", device_host_path: "/dev/dri", desc: "For hardware transcoding" } +``` + +### Environment variables + +```yml +param_env_vars: + - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London." } +opt_param_env_vars: + - { env_var: "VERSION", env_value: "latest", desc: "Supported values are LATEST, PLEXPASS or a specific version number." } +``` + +### Ports + +```yml +param_ports: + - { external_port: "80", internal_port: "80", port_desc: "Application WebUI" } +opt_param_ports: + - { external_port: "80", internal_port: "80", port_desc: "Application WebUI" } +``` + +### Volumes + +```yml +param_volumes: + - { vol_path: "/config", vol_host_path: "", desc: "Configuration files." } +opt_param_volumes: + - { vol_path: "/config", vol_host_path: "", desc: "Configuration files." } +``` + +### Testing template changes + +After you make any changes to the templates, you can use our [Jenkins Builder](https://github.com/linuxserver/docker-jenkins-builder) to have the files updated from the modified templates. Please use the command found under `Running Locally` [on this page](https://github.com/linuxserver/docker-jenkins-builder/blob/master/README.md) to generate them prior to submitting a PR. + +## Dockerfiles + +We use multiple Dockerfiles in our repos, this is because sometimes some CPU architectures needs different packages to work. +If you are proposing additional packages to be added, ensure that you added the packages to all the Dockerfiles in alphabetical order. + +### Testing your changes + +``` +git clone https://github.com/linuxserver/docker-plex.git +cd docker-plex +docker build \ + --no-cache \ + --pull \ + -t linuxserver/plex:latest . +``` + +The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static` +``` +docker run --rm --privileged multiarch/qemu-user-static:register --reset +``` + +Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`. + +## Update the chagelog + +If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-plex/tree/master/root), add an entry to the changelog + +```yml +changelogs: + - { date: "DD.MM.YY:", desc: "Added some love to templates" } +``` From 1c899796237a759ea0a2dea09acbc9266fda726c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 6 Oct 2020 04:04:58 +0000 Subject: [PATCH 100/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index a972b65..2deaefe 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -115,7 +115,7 @@ ncurses-bin6.1-1ubuntu1.18.04 openssl1.1.1-1ubuntu2.1~18.04.6 passwd1:4.5-1ubuntu2 perl-base5.26.1-6ubuntu0.3 -plexmediaserver1.20.1.3252-a78fef9a9 +plexmediaserver1.20.2.3402-0fec14d92 procps2:3.3.12-3ubuntu1.2 publicsuffix20180223.1310-1 sed4.4-2 From 85273e0afd28b3bd9a9a31861544b1e967112494 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 15 Oct 2020 13:59:12 +0000 Subject: [PATCH 101/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 2deaefe..21e1989 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -115,7 +115,7 @@ ncurses-bin6.1-1ubuntu1.18.04 openssl1.1.1-1ubuntu2.1~18.04.6 passwd1:4.5-1ubuntu2 perl-base5.26.1-6ubuntu0.3 -plexmediaserver1.20.2.3402-0fec14d92 +plexmediaserver1.20.3.3437-f1f08d65b procps2:3.3.12-3ubuntu1.2 publicsuffix20180223.1310-1 sed4.4-2 From 3b32d93b157792a7e0bc991e34b9dde7f144c866 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 22 Oct 2020 14:59:48 -0400 Subject: [PATCH 102/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 21e1989..c2bc9ff 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -115,7 +115,7 @@ ncurses-bin6.1-1ubuntu1.18.04 openssl1.1.1-1ubuntu2.1~18.04.6 passwd1:4.5-1ubuntu2 perl-base5.26.1-6ubuntu0.3 -plexmediaserver1.20.3.3437-f1f08d65b +plexmediaserver1.20.3.3483-211702a9f procps2:3.3.12-3ubuntu1.2 publicsuffix20180223.1310-1 sed4.4-2 From bd9fcaec25e4933c821ae16670372930a0ca9a1b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 29 Oct 2020 01:51:41 -0400 Subject: [PATCH 103/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index c2bc9ff..63bcfbd 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -6,7 +6,7 @@ base-passwd3.5.44 bash4.4.18-2ubuntu1.2 bsdutils1:2.31.1-0.4ubuntu3.7 bzip21.0.6-8.1ubuntu0.2 -ca-certificates20190110~18.04.1 +ca-certificates20201027ubuntu0.18.04.1 coreutils8.28-1ubuntu1 curl7.58.0-2ubuntu3.10 dash0.5.8-2.10 From 7e8d0a5f998678b08e78902d74c39428a1d9d6e5 Mon Sep 17 00:00:00 2001 From: thelamer Date: Sun, 1 Nov 2020 21:33:28 -0800 Subject: [PATCH 104/514] update baseimages --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index f06bbaf..aab32ad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM lsiobase/ubuntu:bionic +FROM ghcr.io/linuxserver/baseimage-ubuntu:bionic # set version label ARG BUILD_DATE diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 6590bad..c815db0 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM lsiobase/ubuntu:arm64v8-bionic +FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-bionic # set version label ARG BUILD_DATE diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 471eb25..7efa009 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM lsiobase/ubuntu:arm32v7-bionic +FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-bionic # set version label ARG BUILD_DATE From 6981ef7aae08988915725618f88d843fac85d08c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 2 Nov 2020 05:35:06 +0000 Subject: [PATCH 105/514] Bot Updating Templated Files --- Jenkinsfile | 162 ++++++++++++++++++++-------------------------------- README.md | 14 ++--- 2 files changed, 68 insertions(+), 108 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b25dafd..1d0bf03 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -43,7 +43,7 @@ pipeline { script{ env.EXIT_STATUS = '' env.LS_RELEASE = sh( - script: '''docker run --rm alexeiled/skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':latest 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''', + script: '''docker run --rm ghcr.io/linuxserver/alexeiled-skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':latest 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''', returnStdout: true).trim() env.LS_RELEASE_NOTES = sh( script: '''cat readme-vars.yml | awk -F \\" '/date: "[0-9][0-9].[0-9][0-9].[0-9][0-9]:/ {print $4;exit;}' | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''', @@ -130,7 +130,7 @@ pipeline { steps { script{ env.IMAGE = env.DOCKERHUB_IMAGE - env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/' + env.CONTAINER_NAME + env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/' + env.CONTAINER_NAME env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER @@ -151,7 +151,7 @@ pipeline { steps { script{ env.IMAGE = env.DEV_DOCKERHUB_IMAGE - env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME + env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/lsiodev-' + env.CONTAINER_NAME env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA @@ -172,7 +172,7 @@ pipeline { steps { script{ env.IMAGE = env.PR_DOCKERHUB_IMAGE - env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME + env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/lspipepr-' + env.CONTAINER_NAME env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST @@ -193,24 +193,24 @@ pipeline { } steps { withCredentials([ - string(credentialsId: 'spaces-key', variable: 'DO_KEY'), - string(credentialsId: 'spaces-secret', variable: 'DO_SECRET') + string(credentialsId: 'ci-tests-s3-key-id', variable: 'S3_KEY'), + string(credentialsId: 'ci-tests-s3-secret-access-key', variable: 'S3_SECRET') ]) { script{ - env.SHELLCHECK_URL = 'https://lsio-ci.ams3.digitaloceanspaces.com/' + env.IMAGE + '/' + env.META_TAG + '/shellcheck-result.xml' + env.SHELLCHECK_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/shellcheck-result.xml' } sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-shellcheck/master/checkrun.sh | /bin/bash''' sh '''#! /bin/bash set -e - docker pull lsiodev/spaces-file-upload:latest + docker pull ghcr.io/linuxserver/lsiodev-spaces-file-upload:latest docker run --rm \ -e DESTINATION=\"${IMAGE}/${META_TAG}/shellcheck-result.xml\" \ -e FILE_NAME="shellcheck-result.xml" \ -e MIMETYPE="text/xml" \ -v ${WORKSPACE}:/mnt \ - -e SECRET_KEY=\"${DO_SECRET}\" \ - -e ACCESS_KEY=\"${DO_KEY}\" \ - -t lsiodev/spaces-file-upload:latest \ + -e SECRET_KEY=\"${S3_SECRET}\" \ + -e ACCESS_KEY=\"${S3_KEY}\" \ + -t ghcr.io/linuxserver/lsiodev-spaces-file-upload:latest \ python /upload.py''' } } @@ -228,8 +228,8 @@ pipeline { sh '''#! /bin/bash set -e TEMPDIR=$(mktemp -d) - docker pull linuxserver/jenkins-builder:latest - docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest + docker pull ghcr.io/linuxserver/jenkins-builder:latest + docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) cd ${TEMPDIR}/docker-${CONTAINER_NAME} NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) @@ -334,28 +334,19 @@ pipeline { label 'ARMHF' } steps { - withCredentials([ - [ - $class: 'UsernamePasswordMultiBinding', - credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', - usernameVariable: 'DOCKERUSER', - passwordVariable: 'DOCKERPASS' - ] - ]) { - echo 'Logging into DockerHub' - sh '''#! /bin/bash - echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin - ''' - sh "docker build --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." - sh "docker tag ${IMAGE}:arm32v7-${META_TAG} lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" - retry(5) { - sh "docker push lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" - } - sh '''docker rmi \ - ${IMAGE}:arm32v7-${META_TAG} \ - lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} || :''' + echo 'Logging into Github' + sh '''#! /bin/bash + echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin + ''' + sh "docker build --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \ + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" + retry(5) { + sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" } + sh '''docker rmi \ + ${IMAGE}:arm32v7-${META_TAG} \ + ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} || :''' } } stage('Build ARM64') { @@ -363,28 +354,19 @@ pipeline { label 'ARM64' } steps { - withCredentials([ - [ - $class: 'UsernamePasswordMultiBinding', - credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', - usernameVariable: 'DOCKERUSER', - passwordVariable: 'DOCKERPASS' - ] - ]) { - echo 'Logging into DockerHub' - sh '''#! /bin/bash - echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin - ''' - sh "docker build --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." - sh "docker tag ${IMAGE}:arm64v8-${META_TAG} lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" - retry(5) { - sh "docker push lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" - } - sh '''docker rmi \ - ${IMAGE}:arm64v8-${META_TAG} \ - lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :''' + echo 'Logging into Github' + sh '''#! /bin/bash + echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin + ''' + sh "docker build --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \ + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" + retry(5) { + sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" } + sh '''docker rmi \ + ${IMAGE}:arm64v8-${META_TAG} \ + ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :''' } } } @@ -483,20 +465,20 @@ pipeline { } steps { withCredentials([ - string(credentialsId: 'spaces-key', variable: 'DO_KEY'), - string(credentialsId: 'spaces-secret', variable: 'DO_SECRET') + string(credentialsId: 'ci-tests-s3-key-id', variable: 'S3_KEY'), + string(credentialsId: 'ci-tests-s3-secret-access-key ', variable: 'S3_SECRET') ]) { script{ - env.CI_URL = 'https://lsio-ci.ams3.digitaloceanspaces.com/' + env.IMAGE + '/' + env.META_TAG + '/index.html' + env.CI_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/index.html' } sh '''#! /bin/bash set -e - docker pull lsiodev/ci:latest + docker pull ghcr.io/linuxserver/lsiodev-ci:latest if [ "${MULTIARCH}" == "true" ]; then - docker pull lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} - docker pull lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} - docker tag lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG} - docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} + docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} + docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} + docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG} + docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} fi docker run --rm \ --shm-size=1gb \ @@ -508,15 +490,15 @@ pipeline { -e PORT=\"${CI_PORT}\" \ -e SSL=\"${CI_SSL}\" \ -e BASE=\"${DIST_IMAGE}\" \ - -e SECRET_KEY=\"${DO_SECRET}\" \ - -e ACCESS_KEY=\"${DO_KEY}\" \ + -e SECRET_KEY=\"${S3_SECRET}\" \ + -e ACCESS_KEY=\"${S3_KEY}\" \ -e DOCKER_ENV=\"${CI_DOCKERENV}\" \ -e WEB_SCREENSHOT=\"${CI_WEB}\" \ -e WEB_AUTH=\"${CI_AUTH}\" \ -e WEB_PATH=\"${CI_WEBPATH}\" \ -e DO_REGION="ams3" \ -e DO_BUCKET="lsio-ci" \ - -t lsiodev/ci:latest \ + -t ghcr.io/linuxserver/lsiodev-ci:latest \ python /ci/ci.py''' } } @@ -543,7 +525,7 @@ pipeline { sh '''#! /bin/bash set -e echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin - echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin + echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG} @@ -585,15 +567,15 @@ pipeline { sh '''#! /bin/bash set -e echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin - echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin + echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin if [ "${CI}" == "false" ]; then - docker pull lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} - docker pull lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} - docker tag lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG} - docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} + docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} + docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} + docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG} + docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} fi - for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}"; do + for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}"; do docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} @@ -627,28 +609,6 @@ pipeline { docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} done - docker tag ${IMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:amd64-${META_TAG} - docker tag ${IMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-${META_TAG} - docker tag ${IMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-${META_TAG} - docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:latest - docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:${META_TAG} - docker tag ${GITHUBIMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-latest - docker tag ${GITHUBIMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-latest - docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:amd64-${EXT_RELEASE_TAG} - docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:${EXT_RELEASE_TAG} - docker tag ${GITHUBIMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-${EXT_RELEASE_TAG} - docker tag ${GITHUBIMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-${EXT_RELEASE_TAG} - docker push ${GITHUBIMAGE}:amd64-${META_TAG} - docker push ${GITHUBIMAGE}:arm32v7-${META_TAG} - docker push ${GITHUBIMAGE}:arm64v8-${META_TAG} - docker push ${GITHUBIMAGE}:latest - docker push ${GITHUBIMAGE}:${META_TAG} - docker push ${GITHUBIMAGE}:arm32v7-latest - docker push ${GITHUBIMAGE}:arm64v8-latest - docker push ${GITHUBIMAGE}:${EXT_RELEASE_TAG} - docker push ${GITHUBIMAGE}:amd64-${EXT_RELEASE_TAG} - docker push ${GITHUBIMAGE}:arm32v7-${EXT_RELEASE_TAG} - docker push ${GITHUBIMAGE}:arm64v8-${EXT_RELEASE_TAG} ''' } sh '''#! /bin/bash @@ -662,8 +622,8 @@ pipeline { ${DELETEIMAGE}:arm64v8-latest || : done docker rmi \ - lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \ - lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || : + ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \ + ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || : ''' } } @@ -716,9 +676,9 @@ pipeline { sh '''#! /bin/bash set -e TEMPDIR=$(mktemp -d) - docker pull linuxserver/jenkins-builder:latest - docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH="${BRANCH_NAME}" -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest - docker pull lsiodev/readme-sync + docker pull ghcr.io/linuxserver/jenkins-builder:latest + docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH="${BRANCH_NAME}" -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest + docker pull ghcr.io/linuxserver/lsiodev-readme-sync docker run --rm=true \ -e DOCKERHUB_USERNAME=$DOCKERUSER \ -e DOCKERHUB_PASSWORD=$DOCKERPASS \ @@ -726,7 +686,7 @@ pipeline { -e DOCKER_REPOSITORY=${IMAGE} \ -e GIT_BRANCH=master \ -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/mnt \ - lsiodev/readme-sync bash -c 'node sync' + ghcr.io/linuxserver/lsiodev-readme-sync bash -c 'node sync' rm -Rf ${TEMPDIR} ''' } } diff --git a/README.md b/README.md index e5bbf41..a9bcad7 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ Find us at: [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/plex.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/plex) [![Docker Stars](https://img.shields.io/docker/stars/linuxserver/plex.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/plex) [![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-plex%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-plex/job/master/) -[![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Flsio-ci.ams3.digitaloceanspaces.com%2Flinuxserver%2Fplex%2Flatest%2Fci-status.yml)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/plex/latest/index.html) +[![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Fci-tests.linuxserver.io%2Flinuxserver%2Fplex%2Flatest%2Fci-status.yml)](https://ci-tests.linuxserver.io/linuxserver/plex/latest/index.html) [Plex](https://plex.tv) organizes video, music and photos from personal media libraries and streams them to smart TVs, streaming boxes and mobile devices. This container is packaged as a standalone Plex Media Server. has always been a top priority. Straightforward design and bulk actions mean getting things done faster. @@ -46,7 +46,7 @@ Find us at: Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/). -Simply pulling `linuxserver/plex` should retrieve the correct image for your arch, but you can also pull specific arch images via tags. +Simply pulling `ghcr.io/linuxserver/plex` should retrieve the correct image for your arch, but you can also pull specific arch images via tags. The architectures supported by this image are: @@ -70,7 +70,7 @@ Compatible with docker-compose v2 schemas. version: "2.1" services: plex: - image: linuxserver/plex + image: ghcr.io/linuxserver/plex container_name: plex network_mode: host environment: @@ -101,7 +101,7 @@ docker run -d \ -v /path/to/tvseries:/tv \ -v /path/to/movies:/movies \ --restart unless-stopped \ - linuxserver/plex + ghcr.io/linuxserver/plex ``` @@ -231,7 +231,7 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to * container version number * `docker inspect -f '{{ index .Config.Labels "build_version" }}' plex` * image version number - * `docker inspect -f '{{ index .Config.Labels "build_version" }}' linuxserver/plex` + * `docker inspect -f '{{ index .Config.Labels "build_version" }}' ghcr.io/linuxserver/plex` ## Updating Info @@ -247,7 +247,7 @@ Below are the instructions for updating containers: * You can also remove the old dangling images: `docker image prune` ### Via Docker Run -* Update the image: `docker pull linuxserver/plex` +* Update the image: `docker pull ghcr.io/linuxserver/plex` * Stop the running container: `docker stop plex` * Delete the container: `docker rm plex` * Recreate a new container with the same docker run parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved) @@ -277,7 +277,7 @@ cd docker-plex docker build \ --no-cache \ --pull \ - -t linuxserver/plex:latest . + -t ghcr.io/linuxserver/plex:latest . ``` The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static` From 53969141845ec71fa793950de679b7ccb20936ac Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 2 Nov 2020 05:39:25 +0000 Subject: [PATCH 106/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 63bcfbd..f5fa87a 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -122,7 +122,7 @@ sed4.4-2 sensible-utils0.0.12 sysvinit-utils2.88dsf-59.10ubuntu1 tar1.29b-2ubuntu0.1 -tzdata2020a-0ubuntu0.18.04 +tzdata2020d-0ubuntu0.18.04 ubuntu-keyring2018.09.18.1~18.04.0 udev237-3ubuntu10.42 unrar1:5.5.8-1 From eaf648664f95f1fc5ca09acfe6080e31892facb9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 3 Nov 2020 20:00:33 +0000 Subject: [PATCH 107/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index f5fa87a..e8f245e 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -115,7 +115,7 @@ ncurses-bin6.1-1ubuntu1.18.04 openssl1.1.1-1ubuntu2.1~18.04.6 passwd1:4.5-1ubuntu2 perl-base5.26.1-6ubuntu0.3 -plexmediaserver1.20.3.3483-211702a9f +plexmediaserver1.20.4.3517-ab5e1197c procps2:3.3.12-3ubuntu1.2 publicsuffix20180223.1310-1 sed4.4-2 From 8f67ac4b6840969014bedbf037a75362f442c3d9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 5 Nov 2020 05:50:33 +0000 Subject: [PATCH 108/514] Bot Updating Package Versions --- package_versions.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index e8f245e..78d5550 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -34,9 +34,9 @@ libaudit11:2.8.2-1ubuntu1 libaudit-common1:2.8.2-1ubuntu1 libblkid12.31.1-0.4ubuntu3.7 libbz2-1.01.0.6-8.1ubuntu0.2 -libc62.27-3ubuntu1.2 +libc62.27-3ubuntu1.3 libcap-ng00.7.7-3.1 -libc-bin2.27-3ubuntu1.2 +libc-bin2.27-3ubuntu1.3 libcom-err21.44.1-1ubuntu1.3 libcurl47.58.0-2ubuntu3.10 libdb5.35.3.28-13.1ubuntu1.1 @@ -97,15 +97,15 @@ libsqlite3-03.22.0-1ubuntu0.4 libss21.44.1-1ubuntu1.3 libssl1.11.1.1-1ubuntu2.1~18.04.6 libstdc++68.4.0-1ubuntu1~18.04 -libsystemd0237-3ubuntu10.42 +libsystemd0237-3ubuntu10.43 libtasn1-64.13-2 libtinfo56.1-1ubuntu1.18.04 -libudev1237-3ubuntu10.42 +libudev1237-3ubuntu10.43 libunistring20.9.9-0ubuntu2 libuuid12.31.1-0.4ubuntu3.7 libwind0-heimdal7.5.0+dfsg-1 libzstd11.3.3+dfsg-2ubuntu1.1 -locales2.27-3ubuntu1.2 +locales2.27-3ubuntu1.3 login1:4.5-1ubuntu2 lsb-base9.20170808ubuntu1 mawk1.3.3-17ubuntu3 @@ -114,7 +114,7 @@ ncurses-base6.1-1ubuntu1.18.04 ncurses-bin6.1-1ubuntu1.18.04 openssl1.1.1-1ubuntu2.1~18.04.6 passwd1:4.5-1ubuntu2 -perl-base5.26.1-6ubuntu0.3 +perl-base5.26.1-6ubuntu0.5 plexmediaserver1.20.4.3517-ab5e1197c procps2:3.3.12-3ubuntu1.2 publicsuffix20180223.1310-1 @@ -124,7 +124,7 @@ sysvinit-utils2.88dsf-59.10ubuntu1 tar1.29b-2ubuntu0.1 tzdata2020d-0ubuntu0.18.04 ubuntu-keyring2018.09.18.1~18.04.0 -udev237-3ubuntu10.42 +udev237-3ubuntu10.43 unrar1:5.5.8-1 util-linux2.31.1-0.4ubuntu3.7 wget1.19.4-1ubuntu2.2 From 790f0ad703ba3a5d5f317dba12d942e43d70fc84 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 17 Nov 2020 16:39:43 -0500 Subject: [PATCH 109/514] Bot Updating Package Versions --- package_versions.txt | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 78d5550..a644e29 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -24,7 +24,7 @@ gzip1.6-5ubuntu1 hostname3.20 init-system-helpers1.51 jq1.5+dfsg-2 -krb5-locales1.16-2ubuntu0.1 +krb5-locales1.16-2ubuntu0.2 libacl12.2.52-3build1 libapt-inst2.01.6.12ubuntu0.1 libapt-pkg5.01.6.12ubuntu0.1 @@ -34,9 +34,9 @@ libaudit11:2.8.2-1ubuntu1 libaudit-common1:2.8.2-1ubuntu1 libblkid12.31.1-0.4ubuntu3.7 libbz2-1.01.0.6-8.1ubuntu0.2 -libc62.27-3ubuntu1.3 +libc62.27-3ubuntu1.2 libcap-ng00.7.7-3.1 -libc-bin2.27-3ubuntu1.3 +libc-bin2.27-3ubuntu1.2 libcom-err21.44.1-1ubuntu1.3 libcurl47.58.0-2ubuntu3.10 libdb5.35.3.28-13.1ubuntu1.1 @@ -50,7 +50,7 @@ libgmp102:6.1.2+dfsg-2 libgnutls303.5.18-1ubuntu1.4 libgpg-error01.27-6 libgssapi3-heimdal7.5.0+dfsg-1 -libgssapi-krb5-21.16-2ubuntu0.1 +libgssapi-krb5-21.16-2ubuntu0.2 libhcrypto4-heimdal7.5.0+dfsg-1 libheimbase1-heimdal7.5.0+dfsg-1 libheimntlm0-heimdal7.5.0+dfsg-1 @@ -58,14 +58,14 @@ libhogweed43.4-1 libhx509-5-heimdal7.5.0+dfsg-1 libidn2-02.0.4-1.1ubuntu0.2 libjq11.5+dfsg-2 -libk5crypto31.16-2ubuntu0.1 +libk5crypto31.16-2ubuntu0.2 libkeyutils11.5.9-9.2ubuntu2 libkmod224-1ubuntu3.5 libkrb5-26-heimdal7.5.0+dfsg-1 -libkrb5-31.16-2ubuntu0.1 -libkrb5support01.16-2ubuntu0.1 -libldap-2.4-22.4.45+dfsg-1ubuntu1.6 -libldap-common2.4.45+dfsg-1ubuntu1.6 +libkrb5-31.16-2ubuntu0.2 +libkrb5support01.16-2ubuntu0.2 +libldap-2.4-22.4.45+dfsg-1ubuntu1.8 +libldap-common2.4.45+dfsg-1ubuntu1.8 liblz4-10.0~r131-2ubuntu3 liblzma55.2.2-1.3 libmount12.31.1-0.4ubuntu3.7 @@ -97,10 +97,10 @@ libsqlite3-03.22.0-1ubuntu0.4 libss21.44.1-1ubuntu1.3 libssl1.11.1.1-1ubuntu2.1~18.04.6 libstdc++68.4.0-1ubuntu1~18.04 -libsystemd0237-3ubuntu10.43 +libsystemd0237-3ubuntu10.42 libtasn1-64.13-2 libtinfo56.1-1ubuntu1.18.04 -libudev1237-3ubuntu10.43 +libudev1237-3ubuntu10.42 libunistring20.9.9-0ubuntu2 libuuid12.31.1-0.4ubuntu3.7 libwind0-heimdal7.5.0+dfsg-1 @@ -115,7 +115,7 @@ ncurses-bin6.1-1ubuntu1.18.04 openssl1.1.1-1ubuntu2.1~18.04.6 passwd1:4.5-1ubuntu2 perl-base5.26.1-6ubuntu0.5 -plexmediaserver1.20.4.3517-ab5e1197c +plexmediaserver1.20.5.3600-47c0d9038 procps2:3.3.12-3ubuntu1.2 publicsuffix20180223.1310-1 sed4.4-2 @@ -124,7 +124,7 @@ sysvinit-utils2.88dsf-59.10ubuntu1 tar1.29b-2ubuntu0.1 tzdata2020d-0ubuntu0.18.04 ubuntu-keyring2018.09.18.1~18.04.0 -udev237-3ubuntu10.43 +udev237-3ubuntu10.42 unrar1:5.5.8-1 util-linux2.31.1-0.4ubuntu3.7 wget1.19.4-1ubuntu2.2 From 40512389ae08168aa283b523c95f3b3b97654c55 Mon Sep 17 00:00:00 2001 From: thelamer Date: Thu, 19 Nov 2020 11:02:20 -0800 Subject: [PATCH 110/514] prep for 1.21 release --- Dockerfile | 2 ++ Dockerfile.aarch64 | 1 + Dockerfile.armhf | 1 + root/etc/services.d/plex/run | 4 ++-- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index aab32ad..6e6d678 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,7 +25,9 @@ RUN \ echo "**** install runtime packages ****" && \ apt-get update && \ apt-get install -y \ + beignet-opencl-icd \ jq \ + ocl-icd-libopencl1 \ udev \ unrar \ wget && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index c815db0..6ad3008 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -23,6 +23,7 @@ RUN \ apt-get update && \ apt-get install -y \ jq \ + ocl-icd-libopencl1 \ udev \ unrar \ wget && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 7efa009..6cf78db 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -23,6 +23,7 @@ RUN \ apt-get update && \ apt-get install -y \ jq \ + ocl-icd-libopencl1 \ udev \ unrar \ wget && \ diff --git a/root/etc/services.d/plex/run b/root/etc/services.d/plex/run index 6996fcd..29fcf82 100644 --- a/root/etc/services.d/plex/run +++ b/root/etc/services.d/plex/run @@ -9,5 +9,5 @@ echo "Starting Plex Media Server." export PLEX_MEDIA_SERVER_INFO_MODEL=$(uname -m) export PLEX_MEDIA_SERVER_INFO_PLATFORM_VERSION=$(uname -r) exec \ - s6-setuidgid abc /bin/bash -c \ - 'LD_LIBRARY_PATH=/usr/lib/plexmediaserver:/usr/lib/plexmediaserver/lib /usr/lib/plexmediaserver/Plex\ Media\ Server' + s6-setuidgid abc \ + /usr/lib/plexmediaserver/Plex\ Media\ Server From e587e145ae2ee6acff8da14476c02f8492245dda Mon Sep 17 00:00:00 2001 From: aptalca Date: Thu, 19 Nov 2020 14:51:33 -0500 Subject: [PATCH 111/514] add trigger workflows --- .github/workflows/external_trigger.yml | 86 +++++++++++++++++++ .../workflows/external_trigger_scheduler.yml | 43 ++++++++++ .github/workflows/package_trigger.yml | 33 +++++++ .../workflows/package_trigger_scheduler.yml | 44 ++++++++++ 4 files changed, 206 insertions(+) create mode 100644 .github/workflows/external_trigger.yml create mode 100644 .github/workflows/external_trigger_scheduler.yml create mode 100644 .github/workflows/package_trigger.yml create mode 100644 .github/workflows/package_trigger_scheduler.yml diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml new file mode 100644 index 0000000..c3592f2 --- /dev/null +++ b/.github/workflows/external_trigger.yml @@ -0,0 +1,86 @@ +name: External Trigger Main + +on: + workflow_dispatch: + +jobs: + external-trigger-master: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2.3.3 + + - name: External Trigger + if: github.ref == 'refs/heads/master' + run: | + if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_PLEX_MASTER }}" ]; then + echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_PLEX_MASTER is set; skipping trigger. ****" + exit 0 + fi + echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_PLEX_MASTER\". ****" + echo "**** Retrieving external version ****" + EXT_RELEASE=$(curl -s "https://plex.tv/api/downloads/5.json" | jq -r ". | .computer.Linux.version") + if [ -z "${EXT_RELEASE}" ]; then + echo "**** Can't retrieve external version, exiting ****" + FAILURE_REASON="Can't retrieve external version for plex branch master" + curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680, + "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}], + "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} + exit 1 + fi + echo "**** External version: ${EXT_RELEASE} ****" + echo "**** Retrieving last pushed version ****" + image="linuxserver/plex" + tag="latest" + token=$(curl -sX GET \ + "https://ghcr.io/token?scope=repository%3Alinuxserver%2Fplex%3Apull" \ + | jq -r '.token') + multidigest=$(curl -s \ + --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \ + --header "Authorization: Bearer ${token}" \ + "https://ghcr.io/v2/${image}/manifests/${tag}" \ + | jq -r 'first(.manifests[].digest)') + digest=$(curl -s \ + --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \ + --header "Authorization: Bearer ${token}" \ + "https://ghcr.io/v2/${image}/manifests/${multidigest}" \ + | jq -r '.config.digest') + image_info=$(curl -sL \ + --header "Authorization: Bearer ${token}" \ + "https://ghcr.io/v2/${image}/blobs/${digest}" \ + | jq -r '.container_config') + IMAGE_RELEASE=$(echo ${image_info} | jq -r '.Labels.build_version' | awk '{print $3}') + IMAGE_VERSION=$(echo ${IMAGE_RELEASE} | awk -F'-ls' '{print $1}') + if [ -z "${IMAGE_VERSION}" ]; then + echo "**** Can't retrieve last pushed version, exiting ****" + FAILURE_REASON="Can't retrieve last pushed version for plex tag latest" + curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680, + "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}], + "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} + exit 1 + fi + echo "**** Last pushed version: ${IMAGE_VERSION} ****" + if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then + echo "**** Version ${EXT_RELEASE} already pushed, exiting ****" + exit 0 + else + echo "**** New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build ****" + response=$(curl -iX POST \ + https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-plex/job/master/buildWithParameters?PACKAGE_CHECK=false \ + --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") + echo "**** Jenkins job queue url: ${response} ****" + echo "**** Sleeping 10 seconds until job starts ****" + sleep 10 + buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url') + buildurl="${buildurl%$'\r'}" + echo "**** Jenkins job build url: ${buildurl}; attempting to change the job description ****" + curl -iX POST \ + "${buildurl}submitDescription" \ + --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \ + --data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \ + --data-urlencode "Submit=Submit" + echo "**** Notifying Discord ****" + TRIGGER_REASON="A version change was detected for plex tag latest. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}" + curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903, + "description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}], + "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} + fi diff --git a/.github/workflows/external_trigger_scheduler.yml b/.github/workflows/external_trigger_scheduler.yml new file mode 100644 index 0000000..9f6be23 --- /dev/null +++ b/.github/workflows/external_trigger_scheduler.yml @@ -0,0 +1,43 @@ +name: External Trigger Scheduler + +on: + schedule: + - cron: '45 * * * *' + workflow_dispatch: + +jobs: + external-trigger-scheduler: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2.3.3 + with: + fetch-depth: '0' + + - name: External Trigger Scheduler + run: | + echo "**** Branches found: ****" + git for-each-ref --format='%(refname:short)' refs/remotes + echo "**** Pulling the yq docker image ****" + docker pull ghcr.io/linuxserver/yq + for br in $(git for-each-ref --format='%(refname:short)' refs/remotes) + do + br=$(echo "$br" | sed 's|origin/||g') + echo "**** Evaluating branch ${br} ****" + ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-plex/${br}/jenkins-vars.yml \ + | docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch) + if [ "$br" == "$ls_branch" ]; then + echo "**** Branch ${br} appears to be live; checking workflow. ****" + if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-plex/${br}/.github/workflows/external_trigger.yml > /dev/null 2>&1; then + echo "**** Workflow exists. Triggering external trigger workflow for branch ${br} ****." + curl -iX POST \ + -H "Authorization: token ${{ secrets.CR_PAT }}" \ + -H "Accept: application/vnd.github.v3+json" \ + -d "{\"ref\":\"refs/heads/${br}\"}" \ + https://api.github.com/repos/linuxserver/docker-plex/actions/workflows/external_trigger.yml/dispatches + else + echo "**** Workflow doesn't exist; skipping trigger. ****" + fi + else + echo "**** ${br} appears to be a dev branch; skipping trigger. ****" + fi + done diff --git a/.github/workflows/package_trigger.yml b/.github/workflows/package_trigger.yml new file mode 100644 index 0000000..1d29244 --- /dev/null +++ b/.github/workflows/package_trigger.yml @@ -0,0 +1,33 @@ +name: Package Trigger Main + +on: + workflow_dispatch: + +jobs: + package-trigger-master: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2.3.3 + + - name: Package Trigger + if: github.ref == 'refs/heads/master' + run: | + if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_PLEX_MASTER }}" ]; then + echo "**** Github secret PAUSE_PACKAGE_TRIGGER_PLEX_MASTER is set; skipping trigger. ****" + exit 0 + fi + echo "**** Package trigger running off of master branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_PLEX_MASTER\". ****" + response=$(curl -iX POST \ + https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-plex/job/master/buildWithParameters?PACKAGE_CHECK=true \ + --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") + echo "**** Jenkins job queue url: ${response} ****" + echo "**** Sleeping 10 seconds until job starts ****" + sleep 10 + buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url') + buildurl="${buildurl%$'\r'}" + echo "**** Jenkins job build url: ${buildurl}; attempting to change the job description ****" + curl -iX POST \ + "${buildurl}submitDescription" \ + --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \ + --data-urlencode "description=GHA package trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \ + --data-urlencode "Submit=Submit" diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml new file mode 100644 index 0000000..3421aa0 --- /dev/null +++ b/.github/workflows/package_trigger_scheduler.yml @@ -0,0 +1,44 @@ +name: Package Trigger Scheduler + +on: + schedule: + - cron: '51 9 * * 4' + workflow_dispatch: + +jobs: + package-trigger-scheduler: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2.3.3 + with: + fetch-depth: '0' + + - name: Package Trigger Scheduler + run: | + echo "**** Branches found: ****" + git for-each-ref --format='%(refname:short)' refs/remotes + echo "**** Pulling the yq docker image ****" + docker pull ghcr.io/linuxserver/yq + for br in $(git for-each-ref --format='%(refname:short)' refs/remotes) + do + br=$(echo "$br" | sed 's|origin/||g') + echo "**** Evaluating branch ${br} ****" + ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-plex/${br}/jenkins-vars.yml \ + | docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch) + if [ "${br}" == "${ls_branch}" ]; then + echo "**** Branch ${br} appears to be live; checking workflow. ****" + if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-plex/${br}/.github/workflows/package_trigger.yml > /dev/null 2>&1; then + echo "**** Workflow exists. Triggering package trigger workflow for branch ${br}. ****" + curl -iX POST \ + -H "Authorization: token ${{ secrets.CR_PAT }}" \ + -H "Accept: application/vnd.github.v3+json" \ + -d "{\"ref\":\"refs/heads/${br}\"}" \ + https://api.github.com/repos/linuxserver/docker-plex/actions/workflows/package_trigger.yml/dispatches + sleep 30 + else + echo "**** Workflow doesn't exist; skipping trigger. ****" + fi + else + echo "**** ${br} appears to be a dev branch; skipping trigger. ****" + fi + done From 197db67d4c7ea3f3f22b8eb97f6c55fa09c050f9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 19 Nov 2020 20:22:32 +0000 Subject: [PATCH 112/514] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index a644e29..fd24a99 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -100,7 +100,7 @@ libstdc++68.4.0-1ubuntu1~18.04 libsystemd0237-3ubuntu10.42 libtasn1-64.13-2 libtinfo56.1-1ubuntu1.18.04 -libudev1237-3ubuntu10.42 +libudev1237-3ubuntu10.43 libunistring20.9.9-0ubuntu2 libuuid12.31.1-0.4ubuntu3.7 libwind0-heimdal7.5.0+dfsg-1 @@ -124,7 +124,7 @@ sysvinit-utils2.88dsf-59.10ubuntu1 tar1.29b-2ubuntu0.1 tzdata2020d-0ubuntu0.18.04 ubuntu-keyring2018.09.18.1~18.04.0 -udev237-3ubuntu10.42 +udev237-3ubuntu10.43 unrar1:5.5.8-1 util-linux2.31.1-0.4ubuntu3.7 wget1.19.4-1ubuntu2.2 From b34c60b77c247c5bf137d23c1368a18b68602a95 Mon Sep 17 00:00:00 2001 From: thelamer Date: Thu, 19 Nov 2020 12:38:36 -0800 Subject: [PATCH 113/514] remove deps from arm images --- Dockerfile.aarch64 | 1 - Dockerfile.armhf | 1 - 2 files changed, 2 deletions(-) diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 6ad3008..c815db0 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -23,7 +23,6 @@ RUN \ apt-get update && \ apt-get install -y \ jq \ - ocl-icd-libopencl1 \ udev \ unrar \ wget && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 6cf78db..7efa009 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -23,7 +23,6 @@ RUN \ apt-get update && \ apt-get install -y \ jq \ - ocl-icd-libopencl1 \ udev \ unrar \ wget && \ From 48392d4ae22e028889f89256abcafde20f5617fd Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 19 Nov 2020 16:04:04 -0500 Subject: [PATCH 114/514] Bot Updating Package Versions --- package_versions.txt | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/package_versions.txt b/package_versions.txt index fd24a99..e8e5430 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -4,6 +4,7 @@ apt-utils1.6.12ubuntu0.1 base-files10.1ubuntu2.10 base-passwd3.5.44 bash4.4.18-2ubuntu1.2 +beignet-opencl-icd1.3.2-2 bsdutils1:2.31.1-0.4ubuntu3.7 bzip21.0.6-8.1ubuntu0.2 ca-certificates20201027ubuntu0.18.04.1 @@ -33,6 +34,7 @@ libattr11:2.4.47-2build1 libaudit11:2.8.2-1ubuntu1 libaudit-common1:2.8.2-1ubuntu1 libblkid12.31.1-0.4ubuntu3.7 +libbsd00.8.7-1ubuntu0.1 libbz2-1.01.0.6-8.1ubuntu0.2 libc62.27-3ubuntu1.2 libcap-ng00.7.7-3.1 @@ -41,11 +43,29 @@ libcom-err21.44.1-1ubuntu1.3 libcurl47.58.0-2ubuntu3.10 libdb5.35.3.28-13.1ubuntu1.1 libdebconfclient00.213ubuntu1 +libdrm22.4.101-2~18.04.1 +libdrm-amdgpu12.4.101-2~18.04.1 +libdrm-common2.4.101-2~18.04.1 +libdrm-intel12.4.101-2~18.04.1 +libdrm-nouveau22.4.101-2~18.04.1 +libdrm-radeon12.4.101-2~18.04.1 +libedit23.1-20170329-1 +libegl11.0.0-2ubuntu2.3 +libegl-mesa020.0.8-0ubuntu1~18.04.1 +libelf10.170-0.4ubuntu0.1 +libexpat12.2.5-3ubuntu0.2 libext2fs21.44.1-1ubuntu1.3 libfdisk12.31.1-0.4ubuntu3.7 libffi63.2.1-8 +libgbm120.0.8-0ubuntu1~18.04.1 libgcc11:8.4.0-1ubuntu1~18.04 libgcrypt201.8.1-4ubuntu1.2 +libgl11.0.0-2ubuntu2.3 +libgl1-mesa-dri20.0.8-0ubuntu1~18.04.1 +libglapi-mesa20.0.8-0ubuntu1~18.04.1 +libglvnd01.0.0-2ubuntu2.3 +libglx01.0.0-2ubuntu2.3 +libglx-mesa020.0.8-0ubuntu1~18.04.1 libgmp102:6.1.2+dfsg-2 libgnutls303.5.18-1ubuntu1.4 libgpg-error01.27-6 @@ -66,6 +86,7 @@ libkrb5-31.16-2ubuntu0.2 libkrb5support01.16-2ubuntu0.2 libldap-2.4-22.4.45+dfsg-1ubuntu1.8 libldap-common2.4.45+dfsg-1ubuntu1.8 +libllvm101:10.0.0-4ubuntu1~18.04.2 liblz4-10.0~r131-2ubuntu3 liblzma55.2.2-1.3 libmount12.31.1-0.4ubuntu3.7 @@ -79,6 +100,7 @@ libpam0g1.1.8-3.6ubuntu2.18.04.2 libpam-modules1.1.8-3.6ubuntu2.18.04.2 libpam-modules-bin1.1.8-3.6ubuntu2.18.04.2 libpam-runtime1.1.8-3.6ubuntu2.18.04.2 +libpciaccess00.14-1 libpcre32:8.39-9 libprocps62:3.3.12-3ubuntu1.2 libpsl50.19.1-5build1 @@ -91,6 +113,7 @@ libseccomp22.4.3-1ubuntu3.18.04.3 libselinux12.7-2build2 libsemanage12.7-2build2 libsemanage-common2.7-2build2 +libsensors41:3.4.0-4 libsepol12.7-1 libsmartcols12.31.1-0.4ubuntu3.7 libsqlite3-03.22.0-1ubuntu0.4 @@ -103,15 +126,36 @@ libtinfo56.1-1ubuntu1.18.04 libudev1237-3ubuntu10.43 libunistring20.9.9-0ubuntu2 libuuid12.31.1-0.4ubuntu3.7 +libwayland-client01.16.0-1ubuntu1.1~18.04.3 +libwayland-server01.16.0-1ubuntu1.1~18.04.3 libwind0-heimdal7.5.0+dfsg-1 +libx11-62:1.6.4-3ubuntu0.3 +libx11-data2:1.6.4-3ubuntu0.3 +libx11-xcb12:1.6.4-3ubuntu0.3 +libxau61:1.0.8-1ubuntu1 +libxcb11.13-2~ubuntu18.04 +libxcb-dri2-01.13-2~ubuntu18.04 +libxcb-dri3-01.13-2~ubuntu18.04 +libxcb-glx01.13-2~ubuntu18.04 +libxcb-present01.13-2~ubuntu18.04 +libxcb-sync11.13-2~ubuntu18.04 +libxcb-xfixes01.13-2~ubuntu18.04 +libxdamage11:1.1.4-3 +libxdmcp61:1.1.2-3 +libxext62:1.3.3-1 +libxfixes31:5.0.3-1 +libxshmfence11.3-1 +libxxf86vm11:1.1.4-1 libzstd11.3.3+dfsg-2ubuntu1.1 locales2.27-3ubuntu1.3 login1:4.5-1ubuntu2 lsb-base9.20170808ubuntu1 mawk1.3.3-17ubuntu3 mount2.31.1-0.4ubuntu3.7 +multiarch-support2.27-3ubuntu1.3 ncurses-base6.1-1ubuntu1.18.04 ncurses-bin6.1-1ubuntu1.18.04 +ocl-icd-libopencl12.2.11-1ubuntu1 openssl1.1.1-1ubuntu2.1~18.04.6 passwd1:4.5-1ubuntu2 perl-base5.26.1-6ubuntu0.5 From 6603d817f38a9d300581ea5a09cc7b6fd9c14f92 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 23 Nov 2020 10:52:20 +0000 Subject: [PATCH 115/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index e8e5430..465e57e 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -159,7 +159,7 @@ ocl-icd-libopencl12.2.11-1ubuntu1 openssl1.1.1-1ubuntu2.1~18.04.6 passwd1:4.5-1ubuntu2 perl-base5.26.1-6ubuntu0.5 -plexmediaserver1.20.5.3600-47c0d9038 +plexmediaserver1.21.0.3616-d87012962 procps2:3.3.12-3ubuntu1.2 publicsuffix20180223.1310-1 sed4.4-2 From 342c4810c61de374de55aebb1b22a31188d1fee2 Mon Sep 17 00:00:00 2001 From: thelamer Date: Mon, 23 Nov 2020 10:16:41 -0800 Subject: [PATCH 116/514] rebase to focal advertise bionic tag --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- README.md | 9 +++++++++ readme-vars.yml | 7 +++++++ 5 files changed, 19 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6e6d678..bd298e1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:bionic +FROM ghcr.io/linuxserver/baseimage-ubuntu:focal # set version label ARG BUILD_DATE diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index c815db0..1fe09cb 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-bionic +FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-focal # set version label ARG BUILD_DATE diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 7efa009..2c56acb 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-bionic +FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-focal # set version label ARG BUILD_DATE diff --git a/README.md b/README.md index a9bcad7..7211918 100644 --- a/README.md +++ b/README.md @@ -56,6 +56,14 @@ The architectures supported by this image are: | arm64 | arm64v8-latest | | armhf | arm32v7-latest | +## Version Tags + +This image provides various versions that are available via tags. `latest` tag usually provides the latest stable version. Others are considered under development and caution must be exercised when using them. + +| Tag | Description | +| :----: | --- | +| latest | Stable releases with Focal baseimage | +| bionic | Stable releases with Bionic baseimage | ## Usage @@ -289,6 +297,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **23.11.20:** - Add Bionic branch make Focal default. * **03.05.20:** - Update exposed ports and example docs for bridge mode. * **23.03.20:** - Remove udev hack (no longer needed), suppress uuid error in log during first start. * **04.12.19:** - Add variable for setting PLEX_CLAIM. Remove `/transcode` volume mapping as it is now set via plex gui and defaults to a location under `/config`. diff --git a/readme-vars.yml b/readme-vars.yml index f4f31bc..c23b34d 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -14,6 +14,12 @@ available_architectures: - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"} - { arch: "{{ arch_armhf }}", tag: "arm32v7-latest"} +# development version +development_versions: true +development_versions_items: + - { tag: "latest", desc: "Stable releases with Focal baseimage" } + - { tag: "bionic", desc: "Stable releases with Bionic baseimage" } + # container parameters common_param_env_vars_enabled: true #PGID, PUID, etc param_container_name: "{{ project_name }}" @@ -100,6 +106,7 @@ app_setup_block: | # changelog changelogs: + - { date: "23.11.20:", desc: "Add Bionic branch make Focal default." } - { date: "03.05.20:", desc: "Update exposed ports and example docs for bridge mode." } - { date: "23.03.20:", desc: "Remove udev hack (no longer needed), suppress uuid error in log during first start." } - { date: "04.12.19:", desc: "Add variable for setting PLEX_CLAIM. Remove `/transcode` volume mapping as it is now set via plex gui and defaults to a location under `/config`." } From 249a8543f53eb7124ed7ace69eb2fb79b05952f0 Mon Sep 17 00:00:00 2001 From: aptalca Date: Mon, 23 Nov 2020 14:40:57 -0500 Subject: [PATCH 117/514] update trigger workflows --- .github/workflows/external_trigger.yml | 10 +++++++--- .github/workflows/package_trigger.yml | 9 +++++++-- .github/workflows/package_trigger_scheduler.yml | 6 ++++++ 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index c3592f2..f43ad8b 100644 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -19,7 +19,7 @@ jobs: echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_PLEX_MASTER\". ****" echo "**** Retrieving external version ****" EXT_RELEASE=$(curl -s "https://plex.tv/api/downloads/5.json" | jq -r ". | .computer.Linux.version") - if [ -z "${EXT_RELEASE}" ]; then + if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then echo "**** Can't retrieve external version, exiting ****" FAILURE_REASON="Can't retrieve external version for plex branch master" curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680, @@ -62,17 +62,21 @@ jobs: if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then echo "**** Version ${EXT_RELEASE} already pushed, exiting ****" exit 0 + elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-plex/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then + echo "**** New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting ****" + exit 0 else echo "**** New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build ****" response=$(curl -iX POST \ https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-plex/job/master/buildWithParameters?PACKAGE_CHECK=false \ --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") - echo "**** Jenkins job queue url: ${response} ****" + echo "**** Jenkins job queue url: ${response%$'\r'} ****" echo "**** Sleeping 10 seconds until job starts ****" sleep 10 buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url') buildurl="${buildurl%$'\r'}" - echo "**** Jenkins job build url: ${buildurl}; attempting to change the job description ****" + echo "**** Jenkins job build url: ${buildurl} ****" + echo "**** Attempting to change the Jenkins job description ****" curl -iX POST \ "${buildurl}submitDescription" \ --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \ diff --git a/.github/workflows/package_trigger.yml b/.github/workflows/package_trigger.yml index 1d29244..41b039b 100644 --- a/.github/workflows/package_trigger.yml +++ b/.github/workflows/package_trigger.yml @@ -16,16 +16,21 @@ jobs: echo "**** Github secret PAUSE_PACKAGE_TRIGGER_PLEX_MASTER is set; skipping trigger. ****" exit 0 fi + if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-plex/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then + echo "**** There already seems to be an active build on Jenkins; skipping package trigger ****" + exit 0 + fi echo "**** Package trigger running off of master branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_PLEX_MASTER\". ****" response=$(curl -iX POST \ https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-plex/job/master/buildWithParameters?PACKAGE_CHECK=true \ --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") - echo "**** Jenkins job queue url: ${response} ****" + echo "**** Jenkins job queue url: ${response%$'\r'} ****" echo "**** Sleeping 10 seconds until job starts ****" sleep 10 buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url') buildurl="${buildurl%$'\r'}" - echo "**** Jenkins job build url: ${buildurl}; attempting to change the job description ****" + echo "**** Jenkins job build url: ${buildurl} ****" + echo "**** Attempting to change the Jenkins job description ****" curl -iX POST \ "${buildurl}submitDescription" \ --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \ diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml index 3421aa0..57d7a75 100644 --- a/.github/workflows/package_trigger_scheduler.yml +++ b/.github/workflows/package_trigger_scheduler.yml @@ -29,6 +29,7 @@ jobs: echo "**** Branch ${br} appears to be live; checking workflow. ****" if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-plex/${br}/.github/workflows/package_trigger.yml > /dev/null 2>&1; then echo "**** Workflow exists. Triggering package trigger workflow for branch ${br}. ****" + triggered_branches="${triggered_branches}${br} " curl -iX POST \ -H "Authorization: token ${{ secrets.CR_PAT }}" \ -H "Accept: application/vnd.github.v3+json" \ @@ -42,3 +43,8 @@ jobs: echo "**** ${br} appears to be a dev branch; skipping trigger. ****" fi done + echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****" + echo "**** Notifying Discord ****" + curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903, + "description": "**Package Check Build(s) Triggered for plex** \n**Branch(es):** '"${triggered_branches}"' \n**Build URL:** '"https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-plex/activity/"' \n"}], + "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} From d735a74c0529d054888572dee59efb51e49da53d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 23 Nov 2020 21:28:34 +0000 Subject: [PATCH 118/514] Bot Updating Package Versions --- package_versions.txt | 336 +++++++++++++++++++++---------------------- 1 file changed, 163 insertions(+), 173 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 465e57e..14de4ec 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,175 +1,165 @@ -adduser3.116ubuntu1 -apt1.6.12ubuntu0.1 -apt-utils1.6.12ubuntu0.1 -base-files10.1ubuntu2.10 -base-passwd3.5.44 -bash4.4.18-2ubuntu1.2 -beignet-opencl-icd1.3.2-2 -bsdutils1:2.31.1-0.4ubuntu3.7 -bzip21.0.6-8.1ubuntu0.2 -ca-certificates20201027ubuntu0.18.04.1 -coreutils8.28-1ubuntu1 -curl7.58.0-2ubuntu3.10 -dash0.5.8-2.10 -debconf1.5.66ubuntu1 -debianutils4.8.4 -diffutils1:3.6-1 -dpkg1.19.0.5ubuntu2.3 -e2fsprogs1.44.1-1ubuntu1.3 -fdisk2.31.1-0.4ubuntu3.7 -findutils4.6.0+git+20170828-2 -gcc-8-base8.4.0-1ubuntu1~18.04 -gpgv2.2.4-1ubuntu1.3 -grep3.1-2build1 -gzip1.6-5ubuntu1 -hostname3.20 -init-system-helpers1.51 -jq1.5+dfsg-2 -krb5-locales1.16-2ubuntu0.2 -libacl12.2.52-3build1 -libapt-inst2.01.6.12ubuntu0.1 -libapt-pkg5.01.6.12ubuntu0.1 -libasn1-8-heimdal7.5.0+dfsg-1 -libattr11:2.4.47-2build1 -libaudit11:2.8.2-1ubuntu1 -libaudit-common1:2.8.2-1ubuntu1 -libblkid12.31.1-0.4ubuntu3.7 -libbsd00.8.7-1ubuntu0.1 -libbz2-1.01.0.6-8.1ubuntu0.2 -libc62.27-3ubuntu1.2 -libcap-ng00.7.7-3.1 -libc-bin2.27-3ubuntu1.2 -libcom-err21.44.1-1ubuntu1.3 -libcurl47.58.0-2ubuntu3.10 -libdb5.35.3.28-13.1ubuntu1.1 -libdebconfclient00.213ubuntu1 -libdrm22.4.101-2~18.04.1 -libdrm-amdgpu12.4.101-2~18.04.1 -libdrm-common2.4.101-2~18.04.1 -libdrm-intel12.4.101-2~18.04.1 -libdrm-nouveau22.4.101-2~18.04.1 -libdrm-radeon12.4.101-2~18.04.1 -libedit23.1-20170329-1 -libegl11.0.0-2ubuntu2.3 -libegl-mesa020.0.8-0ubuntu1~18.04.1 -libelf10.170-0.4ubuntu0.1 -libexpat12.2.5-3ubuntu0.2 -libext2fs21.44.1-1ubuntu1.3 -libfdisk12.31.1-0.4ubuntu3.7 -libffi63.2.1-8 -libgbm120.0.8-0ubuntu1~18.04.1 -libgcc11:8.4.0-1ubuntu1~18.04 -libgcrypt201.8.1-4ubuntu1.2 -libgl11.0.0-2ubuntu2.3 -libgl1-mesa-dri20.0.8-0ubuntu1~18.04.1 -libglapi-mesa20.0.8-0ubuntu1~18.04.1 -libglvnd01.0.0-2ubuntu2.3 -libglx01.0.0-2ubuntu2.3 -libglx-mesa020.0.8-0ubuntu1~18.04.1 -libgmp102:6.1.2+dfsg-2 -libgnutls303.5.18-1ubuntu1.4 -libgpg-error01.27-6 -libgssapi3-heimdal7.5.0+dfsg-1 -libgssapi-krb5-21.16-2ubuntu0.2 -libhcrypto4-heimdal7.5.0+dfsg-1 -libheimbase1-heimdal7.5.0+dfsg-1 -libheimntlm0-heimdal7.5.0+dfsg-1 -libhogweed43.4-1 -libhx509-5-heimdal7.5.0+dfsg-1 -libidn2-02.0.4-1.1ubuntu0.2 -libjq11.5+dfsg-2 -libk5crypto31.16-2ubuntu0.2 -libkeyutils11.5.9-9.2ubuntu2 -libkmod224-1ubuntu3.5 -libkrb5-26-heimdal7.5.0+dfsg-1 -libkrb5-31.16-2ubuntu0.2 -libkrb5support01.16-2ubuntu0.2 -libldap-2.4-22.4.45+dfsg-1ubuntu1.8 -libldap-common2.4.45+dfsg-1ubuntu1.8 -libllvm101:10.0.0-4ubuntu1~18.04.2 -liblz4-10.0~r131-2ubuntu3 -liblzma55.2.2-1.3 -libmount12.31.1-0.4ubuntu3.7 -libncurses56.1-1ubuntu1.18.04 -libncursesw56.1-1ubuntu1.18.04 -libnettle63.4-1 -libnghttp2-141.30.0-1ubuntu1 -libonig46.7.0-1 -libp11-kit00.23.9-2 -libpam0g1.1.8-3.6ubuntu2.18.04.2 -libpam-modules1.1.8-3.6ubuntu2.18.04.2 -libpam-modules-bin1.1.8-3.6ubuntu2.18.04.2 -libpam-runtime1.1.8-3.6ubuntu2.18.04.2 -libpciaccess00.14-1 -libpcre32:8.39-9 -libprocps62:3.3.12-3ubuntu1.2 -libpsl50.19.1-5build1 -libroken18-heimdal7.5.0+dfsg-1 -librtmp12.4+20151223.gitfa8646d.1-1 -libsasl2-22.1.27~101-g0780600+dfsg-3ubuntu2.1 -libsasl2-modules2.1.27~101-g0780600+dfsg-3ubuntu2.1 -libsasl2-modules-db2.1.27~101-g0780600+dfsg-3ubuntu2.1 -libseccomp22.4.3-1ubuntu3.18.04.3 -libselinux12.7-2build2 -libsemanage12.7-2build2 -libsemanage-common2.7-2build2 -libsensors41:3.4.0-4 -libsepol12.7-1 -libsmartcols12.31.1-0.4ubuntu3.7 -libsqlite3-03.22.0-1ubuntu0.4 -libss21.44.1-1ubuntu1.3 -libssl1.11.1.1-1ubuntu2.1~18.04.6 -libstdc++68.4.0-1ubuntu1~18.04 -libsystemd0237-3ubuntu10.42 -libtasn1-64.13-2 -libtinfo56.1-1ubuntu1.18.04 -libudev1237-3ubuntu10.43 -libunistring20.9.9-0ubuntu2 -libuuid12.31.1-0.4ubuntu3.7 -libwayland-client01.16.0-1ubuntu1.1~18.04.3 -libwayland-server01.16.0-1ubuntu1.1~18.04.3 -libwind0-heimdal7.5.0+dfsg-1 -libx11-62:1.6.4-3ubuntu0.3 -libx11-data2:1.6.4-3ubuntu0.3 -libx11-xcb12:1.6.4-3ubuntu0.3 -libxau61:1.0.8-1ubuntu1 -libxcb11.13-2~ubuntu18.04 -libxcb-dri2-01.13-2~ubuntu18.04 -libxcb-dri3-01.13-2~ubuntu18.04 -libxcb-glx01.13-2~ubuntu18.04 -libxcb-present01.13-2~ubuntu18.04 -libxcb-sync11.13-2~ubuntu18.04 -libxcb-xfixes01.13-2~ubuntu18.04 -libxdamage11:1.1.4-3 -libxdmcp61:1.1.2-3 -libxext62:1.3.3-1 -libxfixes31:5.0.3-1 -libxshmfence11.3-1 -libxxf86vm11:1.1.4-1 -libzstd11.3.3+dfsg-2ubuntu1.1 -locales2.27-3ubuntu1.3 -login1:4.5-1ubuntu2 -lsb-base9.20170808ubuntu1 -mawk1.3.3-17ubuntu3 -mount2.31.1-0.4ubuntu3.7 -multiarch-support2.27-3ubuntu1.3 -ncurses-base6.1-1ubuntu1.18.04 -ncurses-bin6.1-1ubuntu1.18.04 +adduser3.118ubuntu2 +apt2.0.2ubuntu0.1 +apt-utils2.0.2ubuntu0.1 +base-files11ubuntu5.2 +base-passwd3.5.47 +bash5.0-6ubuntu1.1 +beignet-opencl-icd1.3.2-7build1 +bsdutils1:2.34-0.1ubuntu9.1 +bzip21.0.8-2 +ca-certificates20201027ubuntu0.20.04.1 +coreutils8.30-3ubuntu2 +curl7.68.0-1ubuntu2.2 +dash0.5.10.2-6 +debconf1.5.73 +debianutils4.9.1 +diffutils1:3.7-3 +dirmngr2.2.19-3ubuntu2 +dpkg1.19.7ubuntu3 +e2fsprogs1.45.5-2ubuntu1 +fdisk2.34-0.1ubuntu9.1 +findutils4.7.0-1ubuntu1 +gcc-10-base10.2.0-5ubuntu1~20.04 +gnupg2.2.19-3ubuntu2 +gnupg-l10n2.2.19-3ubuntu2 +gnupg-utils2.2.19-3ubuntu2 +gpg2.2.19-3ubuntu2 +gpg-agent2.2.19-3ubuntu2 +gpgconf2.2.19-3ubuntu2 +gpgsm2.2.19-3ubuntu2 +gpgv2.2.19-3ubuntu2 +gpg-wks-client2.2.19-3ubuntu2 +gpg-wks-server2.2.19-3ubuntu2 +grep3.4-1 +gzip1.10-0ubuntu4 +hostname3.23 +init-system-helpers1.57 +jq1.6-1 +krb5-locales1.17-6ubuntu4.1 +libacl12.2.53-6 +libapt-pkg6.02.0.2ubuntu0.1 +libasn1-8-heimdal7.7.0+dfsg-1ubuntu1 +libassuan02.5.3-7ubuntu2 +libattr11:2.4.48-5 +libaudit11:2.8.5-2ubuntu6 +libaudit-common1:2.8.5-2ubuntu6 +libblkid12.34-0.1ubuntu9.1 +libbrotli11.0.7-6ubuntu0.1 +libbsd00.10.0-1 +libbz2-1.01.0.8-2 +libc62.31-0ubuntu9.1 +libcap-ng00.7.9-2.1build1 +libc-bin2.31-0ubuntu9.1 +libcom-err21.45.5-2ubuntu1 +libcrypt11:4.4.10-10ubuntu4 +libcurl47.68.0-1ubuntu2.2 +libdb5.35.3.28+dfsg1-0.6ubuntu2 +libdebconfclient00.251ubuntu1 +libdrm22.4.101-2 +libdrm-common2.4.101-2 +libdrm-intel12.4.101-2 +libext2fs21.45.5-2ubuntu1 +libfdisk12.34-0.1ubuntu9.1 +libffi73.3-4 +libgcc-s110.2.0-5ubuntu1~20.04 +libgcrypt201.8.5-5ubuntu1 +libgmp102:6.2.0+dfsg-4 +libgnutls303.6.13-2ubuntu1.3 +libgpg-error01.37-1 +libgssapi3-heimdal7.7.0+dfsg-1ubuntu1 +libgssapi-krb5-21.17-6ubuntu4.1 +libhcrypto4-heimdal7.7.0+dfsg-1ubuntu1 +libheimbase1-heimdal7.7.0+dfsg-1ubuntu1 +libheimntlm0-heimdal7.7.0+dfsg-1ubuntu1 +libhogweed53.5.1+really3.5.1-2 +libhx509-5-heimdal7.7.0+dfsg-1ubuntu1 +libidn2-02.2.0-2 +libjq11.6-1 +libk5crypto31.17-6ubuntu4.1 +libkeyutils11.6-6ubuntu1 +libkmod227-1ubuntu2 +libkrb5-26-heimdal7.7.0+dfsg-1ubuntu1 +libkrb5-31.17-6ubuntu4.1 +libkrb5support01.17-6ubuntu4.1 +libksba81.3.5-2 +libldap-2.4-22.4.49+dfsg-2ubuntu1.5 +libldap-common2.4.49+dfsg-2ubuntu1.5 +liblz4-11.9.2-2 +liblzma55.2.4-1ubuntu1 +libmount12.34-0.1ubuntu9.1 +libncurses66.2-0ubuntu2 +libncursesw66.2-0ubuntu2 +libnettle73.5.1+really3.5.1-2 +libnghttp2-141.40.0-1build1 +libnpth01.6-1 +libonig56.9.4-1 +libp11-kit00.23.20-1build1 +libpam0g1.3.1-5ubuntu4.1 +libpam-modules1.3.1-5ubuntu4.1 +libpam-modules-bin1.3.1-5ubuntu4.1 +libpam-runtime1.3.1-5ubuntu4.1 +libpciaccess00.16-0ubuntu1 +libpcre2-8-010.34-7 +libpcre32:8.39-12build1 +libprocps82:3.3.16-1ubuntu2 +libpsl50.21.0-1ubuntu1 +libreadline88.0-4 +libroken18-heimdal7.7.0+dfsg-1ubuntu1 +librtmp12.4+20151223.gitfa8646d.1-2build1 +libsasl2-22.1.27+dfsg-2 +libsasl2-modules2.1.27+dfsg-2 +libsasl2-modules-db2.1.27+dfsg-2 +libseccomp22.4.3-1ubuntu3.20.04.3 +libselinux13.0-1build2 +libsemanage13.0-1build2 +libsemanage-common3.0-1build2 +libsepol13.0-1 +libsmartcols12.34-0.1ubuntu9.1 +libsqlite3-03.31.1-4ubuntu0.2 +libss21.45.5-2ubuntu1 +libssh-40.9.3-2ubuntu2.1 +libssl1.11.1.1f-1ubuntu2 +libstdc++610.2.0-5ubuntu1~20.04 +libsystemd0245.4-4ubuntu3.3 +libtasn1-64.16.0-2 +libtinfo66.2-0ubuntu2 +libudev1245.4-4ubuntu3.3 +libunistring20.9.10-2 +libuuid12.34-0.1ubuntu9.1 +libwind0-heimdal7.7.0+dfsg-1ubuntu1 +libx11-62:1.6.9-2ubuntu1.1 +libx11-data2:1.6.9-2ubuntu1.1 +libxau61:1.0.9-0ubuntu1 +libxcb11.14-2 +libxdmcp61:1.1.3-0ubuntu1 +libxext62:1.3.4-0ubuntu1 +libxfixes31:5.0.3-2 +libzstd11.4.4+dfsg-3 +locales2.31-0ubuntu9.1 +login1:4.8.1-1ubuntu5.20.04 +logsave1.45.5-2ubuntu1 +lsb-base11.1.0ubuntu2 +mawk1.3.4.20200120-2 +mount2.34-0.1ubuntu9.1 +ncurses-base6.2-0ubuntu2 +ncurses-bin6.2-0ubuntu2 ocl-icd-libopencl12.2.11-1ubuntu1 -openssl1.1.1-1ubuntu2.1~18.04.6 -passwd1:4.5-1ubuntu2 -perl-base5.26.1-6ubuntu0.5 +openssl1.1.1f-1ubuntu2 +passwd1:4.8.1-1ubuntu5.20.04 +perl-base5.30.0-9ubuntu0.2 +pinentry-curses1.1.0-3build1 plexmediaserver1.21.0.3616-d87012962 -procps2:3.3.12-3ubuntu1.2 -publicsuffix20180223.1310-1 -sed4.4-2 -sensible-utils0.0.12 -sysvinit-utils2.88dsf-59.10ubuntu1 -tar1.29b-2ubuntu0.1 -tzdata2020d-0ubuntu0.18.04 -ubuntu-keyring2018.09.18.1~18.04.0 -udev237-3ubuntu10.43 -unrar1:5.5.8-1 -util-linux2.31.1-0.4ubuntu3.7 -wget1.19.4-1ubuntu2.2 -zlib1g1:1.2.11.dfsg-0ubuntu2 +procps2:3.3.16-1ubuntu2 +publicsuffix20200303.0012-1 +readline-common8.0-4 +sed4.7-1 +sensible-utils0.0.12+nmu1 +sysvinit-utils2.96-2.1ubuntu1 +tar1.30+dfsg-7 +tzdata2020d-0ubuntu0.20.04 +ubuntu-keyring2020.02.11.2 +udev245.4-4ubuntu3.3 +unrar1:5.6.6-2build1 +util-linux2.34-0.1ubuntu9.1 +wget1.20.3-1ubuntu1 +zlib1g1:1.2.11.dfsg-2ubuntu1.2 From 024eeaa2bd95c85df0b2e260e723afe17f87f33c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 1 Dec 2020 23:54:16 +0000 Subject: [PATCH 119/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 14de4ec..0e330e4 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -148,7 +148,7 @@ openssl1.1.1f-1ubuntu2 passwd1:4.8.1-1ubuntu5.20.04 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.21.0.3616-d87012962 +plexmediaserver1.21.0.3711-b509cc236 procps2:3.3.16-1ubuntu2 publicsuffix20200303.0012-1 readline-common8.0-4 From 2fcfbdc597931007f2d7584b80bf3545a8a7ac62 Mon Sep 17 00:00:00 2001 From: aptalca Date: Thu, 10 Dec 2020 15:36:02 -0500 Subject: [PATCH 120/514] add latest intel compute packages for opencl --- Dockerfile | 11 +++++++++++ README.md | 1 + readme-vars.yml | 1 + 3 files changed, 13 insertions(+) diff --git a/Dockerfile b/Dockerfile index bd298e1..5e32433 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,6 +31,17 @@ RUN \ udev \ unrar \ wget && \ + COMP_RT_RELEASE=$(curl -sX GET "https://api.github.com/repos/intel/compute-runtime/releases/latest" | jq -r '.tag_name') && \ + COMP_RT_URLS=$(curl -sX GET "https://api.github.com/repos/intel/compute-runtime/releases/tags/${COMP_RT_RELEASE}" | jq -r '.body' | grep wget | sed 's|wget ||g') && \ + mkdir -p /opencl-intel && \ + for i in ${COMP_RT_URLS}; do \ + i=$(echo ${i} | tr -d '\r'); \ + echo "**** downloading ${i} ****"; \ + curl -o "/opencl-intel/$(basename ${i})" \ + -L "${i}"; \ + done && \ + dpkg -i /opencl-intel/*.deb && \ + rm -rf /opencl-intel && \ echo "**** install plex ****" && \ if [ -z ${PLEX_RELEASE+x} ]; then \ PLEX_RELEASE=$(curl -sX GET 'https://plex.tv/api/downloads/5.json' \ diff --git a/README.md b/README.md index 7211918..4a4c5d4 100644 --- a/README.md +++ b/README.md @@ -297,6 +297,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **10.12.20:** - Add latest Intel Compute packages from github repo for opencl support on latest gen igpu. * **23.11.20:** - Add Bionic branch make Focal default. * **03.05.20:** - Update exposed ports and example docs for bridge mode. * **23.03.20:** - Remove udev hack (no longer needed), suppress uuid error in log during first start. diff --git a/readme-vars.yml b/readme-vars.yml index c23b34d..b02f294 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -106,6 +106,7 @@ app_setup_block: | # changelog changelogs: + - { date: "10.12.20:", desc: "Add latest Intel Compute packages from github repo for opencl support on latest gen igpu." } - { date: "23.11.20:", desc: "Add Bionic branch make Focal default." } - { date: "03.05.20:", desc: "Update exposed ports and example docs for bridge mode." } - { date: "23.03.20:", desc: "Remove udev hack (no longer needed), suppress uuid error in log during first start." } From 4427247a6d2e87f30be85e6f21bfe2eb3d3ce4fb Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 14 Dec 2020 05:57:03 -0500 Subject: [PATCH 121/514] Bot Updating Package Versions --- package_versions.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 0e330e4..f7f30ce 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,6 +1,6 @@ adduser3.118ubuntu2 -apt2.0.2ubuntu0.1 -apt-utils2.0.2ubuntu0.1 +apt2.0.2ubuntu0.2 +apt-utils2.0.2ubuntu0.2 base-files11ubuntu5.2 base-passwd3.5.47 bash5.0-6ubuntu1.1 @@ -9,7 +9,7 @@ bsdutils1:2.34-0.1ubuntu9.1 bzip21.0.8-2 ca-certificates20201027ubuntu0.20.04.1 coreutils8.30-3ubuntu2 -curl7.68.0-1ubuntu2.2 +curl7.68.0-1ubuntu2.4 dash0.5.10.2-6 debconf1.5.73 debianutils4.9.1 @@ -37,7 +37,7 @@ init-system-helpers1.57 jq1.6-1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 -libapt-pkg6.02.0.2ubuntu0.1 +libapt-pkg6.02.0.2ubuntu0.2 libasn1-8-heimdal7.7.0+dfsg-1ubuntu1 libassuan02.5.3-7ubuntu2 libattr11:2.4.48-5 @@ -52,7 +52,7 @@ libcap-ng00.7.9-2.1build1 libc-bin2.31-0ubuntu9.1 libcom-err21.45.5-2ubuntu1 libcrypt11:4.4.10-10ubuntu4 -libcurl47.68.0-1ubuntu2.2 +libcurl47.68.0-1ubuntu2.4 libdb5.35.3.28+dfsg1-0.6ubuntu2 libdebconfclient00.251ubuntu1 libdrm22.4.101-2 @@ -118,7 +118,7 @@ libsmartcols12.34-0.1ubuntu9.1 libsqlite3-03.31.1-4ubuntu0.2 libss21.45.5-2ubuntu1 libssh-40.9.3-2ubuntu2.1 -libssl1.11.1.1f-1ubuntu2 +libssl1.11.1.1f-1ubuntu2.1 libstdc++610.2.0-5ubuntu1~20.04 libsystemd0245.4-4ubuntu3.3 libtasn1-64.16.0-2 @@ -144,11 +144,11 @@ mount2.34-0.1ubuntu9.1 ncurses-base6.2-0ubuntu2 ncurses-bin6.2-0ubuntu2 ocl-icd-libopencl12.2.11-1ubuntu1 -openssl1.1.1f-1ubuntu2 +openssl1.1.1f-1ubuntu2.1 passwd1:4.8.1-1ubuntu5.20.04 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.21.0.3711-b509cc236 +plexmediaserver1.21.1.3766-7e23ef53c procps2:3.3.16-1ubuntu2 publicsuffix20200303.0012-1 readline-common8.0-4 From 09fe4b295daa0d1f19adb9ce8eb8dfa06b668f4d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 15 Dec 2020 17:53:30 +0000 Subject: [PATCH 122/514] Bot Updating Templated Files --- .github/ISSUE_TEMPLATE.md | 37 ------------------------------------- Jenkinsfile | 30 ++++++++++++++++++++++-------- README.md | 2 +- 3 files changed, 23 insertions(+), 46 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 8c06d53..8b13789 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,38 +1 @@ -[linuxserverurl]: https://linuxserver.io -[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl] - - - - - - - ------------------------------- - -## Expected Behavior - - -## Current Behavior - - -## Steps to Reproduce - - -1. -2. -3. -4. - -## Environment -**OS:** -**CPU architecture:** x86_64/arm32/arm64 -**How docker service was installed:** - - - -## Command used to create docker container (run/create/compose/screenshot) - - -## Docker logs - diff --git a/Jenkinsfile b/Jenkinsfile index 1d0bf03..e1c8e27 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -57,7 +57,7 @@ pipeline { env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/' env.PULL_REQUEST = env.CHANGE_ID - env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/greetings.yml ./.github/workflows/stale.yml' + env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.md ./.github/ISSUE_TEMPLATE/issue.feature.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/greetings.yml ./.github/workflows/stale.yml ./.github/workflows/package_trigger.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/external_trigger.yml ./.github/workflows/external_trigger_scheduler.yml' } script{ env.LS_RELEASE_NUMBER = sh( @@ -137,6 +137,7 @@ pipeline { } else { env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER } + env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER env.META_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN } @@ -158,6 +159,7 @@ pipeline { } else { env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA } + env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/' @@ -179,6 +181,7 @@ pipeline { } else { env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST } + env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST @@ -240,9 +243,12 @@ pipeline { git checkout -f master cd ${TEMPDIR}/docker-${CONTAINER_NAME} mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows - cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ + mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE + rm ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE.md + cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || : cd ${TEMPDIR}/repo/${LS_REPO}/ git add ${TEMPLATED_FILES} + git rm .github/ISSUE_TEMPLATE.md git commit -m 'Bot Updating Templated Files' git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} @@ -312,8 +318,9 @@ pipeline { environment name: 'EXIT_STATUS', value: '' } steps { + echo "Running on node: ${NODE_NAME}" sh "docker build --no-cache --pull -t ${IMAGE}:${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." } } // Build MultiArch Docker containers for push to LS Repo @@ -325,8 +332,9 @@ pipeline { parallel { stage('Build X86') { steps { + echo "Running on node: ${NODE_NAME}" sh "docker build --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." } } stage('Build ARMHF') { @@ -334,12 +342,13 @@ pipeline { label 'ARMHF' } steps { + echo "Running on node: ${NODE_NAME}" echo 'Logging into Github' sh '''#! /bin/bash echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin ''' sh "docker build --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" retry(5) { sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" @@ -354,12 +363,13 @@ pipeline { label 'ARM64' } steps { + echo "Running on node: ${NODE_NAME}" echo 'Logging into Github' sh '''#! /bin/bash echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin ''' sh "docker build --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" retry(5) { sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" @@ -602,6 +612,7 @@ pipeline { docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8 + docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} || : docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8 @@ -616,10 +627,13 @@ pipeline { docker rmi \ ${DELETEIMAGE}:amd64-${META_TAG} \ ${DELETEIMAGE}:amd64-latest \ + ${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \ ${DELETEIMAGE}:arm32v7-${META_TAG} \ ${DELETEIMAGE}:arm32v7-latest \ + ${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \ ${DELETEIMAGE}:arm64v8-${META_TAG} \ - ${DELETEIMAGE}:arm64v8-latest || : + ${DELETEIMAGE}:arm64v8-latest \ + ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || : done docker rmi \ ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \ @@ -686,7 +700,7 @@ pipeline { -e DOCKER_REPOSITORY=${IMAGE} \ -e GIT_BRANCH=master \ -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/mnt \ - ghcr.io/linuxserver/lsiodev-readme-sync bash -c 'node sync' + ghcr.io/linuxserver/lsiodev-readme-sync bash -c 'node sync' rm -Rf ${TEMPDIR} ''' } } diff --git a/README.md b/README.md index 7211918..7b5e0b9 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Find us at: [![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-plex.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-plex) [![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-plex.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-plex/releases) [![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-plex/packages) -[![GitLab Container Registry](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab)](https://gitlab.com/Linuxserver.io/docker-plex/container_registry) +[![GitLab Container Registry](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab)](https://gitlab.com/linuxserver.io/docker-plex/container_registry) [![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/plex.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge)](https://microbadger.com/images/linuxserver/plex "Get your own version badge on microbadger.com") [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/plex.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/plex) [![Docker Stars](https://img.shields.io/docker/stars/linuxserver/plex.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/plex) From 3c671749dd8173130cd28e23e9053ad677bce009 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 15 Dec 2020 17:54:56 +0000 Subject: [PATCH 123/514] Bot Updating Templated Files --- .github/ISSUE_TEMPLATE.md | 1 - .github/ISSUE_TEMPLATE/config.yml | 13 ++++++ .github/ISSUE_TEMPLATE/issue.bug.md | 40 +++++++++++++++++++ .github/ISSUE_TEMPLATE/issue.feature.md | 25 ++++++++++++ .../workflows/external_trigger_scheduler.yml | 2 +- .../workflows/package_trigger_scheduler.yml | 2 +- 6 files changed, 80 insertions(+), 3 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE.md create mode 100755 .github/ISSUE_TEMPLATE/config.yml create mode 100755 .github/ISSUE_TEMPLATE/issue.bug.md create mode 100755 .github/ISSUE_TEMPLATE/issue.feature.md diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md deleted file mode 100644 index 8b13789..0000000 --- a/.github/ISSUE_TEMPLATE.md +++ /dev/null @@ -1 +0,0 @@ - diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100755 index 0000000..404ea59 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,13 @@ +blank_issues_enabled: false +contact_links: + - name: Discord chat support + url: https://discord.gg/YWrKVTn + about: Realtime support / chat with the community and the team. + + - name: Discourse discussion forum + url: https://discourse.linuxserver.io + about: Post on our community forum. + + - name: Documentation + url: https://docs.linuxserver.io/images/docker-plex + about: Documentation - information about all of our containers. diff --git a/.github/ISSUE_TEMPLATE/issue.bug.md b/.github/ISSUE_TEMPLATE/issue.bug.md new file mode 100755 index 0000000..0130f86 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/issue.bug.md @@ -0,0 +1,40 @@ +--- +name: Bug report +about: Create a report to help us improve + +--- +[linuxserverurl]: https://linuxserver.io +[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl] + + + + + +------------------------------ + +## Expected Behavior + + +## Current Behavior + + +## Steps to Reproduce + + +1. +2. +3. +4. + +## Environment +**OS:** +**CPU architecture:** x86_64/arm32/arm64 +**How docker service was installed:** + + + +## Command used to create docker container (run/create/compose/screenshot) + + +## Docker logs + diff --git a/.github/ISSUE_TEMPLATE/issue.feature.md b/.github/ISSUE_TEMPLATE/issue.feature.md new file mode 100755 index 0000000..20a91fd --- /dev/null +++ b/.github/ISSUE_TEMPLATE/issue.feature.md @@ -0,0 +1,25 @@ +--- +name: Feature request +about: Suggest an idea for this project + +--- +[linuxserverurl]: https://linuxserver.io +[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl] + + + + + + + + +------------------------------ + +## Desired Behavior + + +## Current Behavior + + +## Alternatives Considered + diff --git a/.github/workflows/external_trigger_scheduler.yml b/.github/workflows/external_trigger_scheduler.yml index 9f6be23..ca37175 100644 --- a/.github/workflows/external_trigger_scheduler.yml +++ b/.github/workflows/external_trigger_scheduler.yml @@ -12,7 +12,7 @@ jobs: - uses: actions/checkout@v2.3.3 with: fetch-depth: '0' - + - name: External Trigger Scheduler run: | echo "**** Branches found: ****" diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml index 57d7a75..1f27acc 100644 --- a/.github/workflows/package_trigger_scheduler.yml +++ b/.github/workflows/package_trigger_scheduler.yml @@ -12,7 +12,7 @@ jobs: - uses: actions/checkout@v2.3.3 with: fetch-depth: '0' - + - name: Package Trigger Scheduler run: | echo "**** Branches found: ****" From e2ecc0716150b16194478b058cae616b5e984a9d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 15 Dec 2020 18:00:40 +0000 Subject: [PATCH 124/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index f7f30ce..c6c3fc8 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -148,7 +148,7 @@ openssl1.1.1f-1ubuntu2.1 passwd1:4.8.1-1ubuntu5.20.04 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.21.1.3766-7e23ef53c +plexmediaserver1.21.1.3795-ee64ab56f procps2:3.3.16-1ubuntu2 publicsuffix20200303.0012-1 readline-common8.0-4 From 3cb1af781160768b673286c6bbbab124a2723d03 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Tue, 15 Dec 2020 19:02:00 -0600 Subject: [PATCH 125/514] Update Jenkinsfile --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e1c8e27..6119199 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -244,11 +244,11 @@ pipeline { cd ${TEMPDIR}/docker-${CONTAINER_NAME} mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE - rm ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE.md + rm -f ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE.md cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || : cd ${TEMPDIR}/repo/${LS_REPO}/ git add ${TEMPLATED_FILES} - git rm .github/ISSUE_TEMPLATE.md + git rm .github/ISSUE_TEMPLATE.md || : git commit -m 'Bot Updating Templated Files' git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} From e1cbed98b8fa18147ab07e5245a30cee9f95e16a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 16 Dec 2020 01:05:30 +0000 Subject: [PATCH 126/514] Bot Updating Templated Files --- .github/workflows/external_trigger.yml | 1 + Jenkinsfile | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index f43ad8b..d746d8e 100644 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -27,6 +27,7 @@ jobs: "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} exit 1 fi + EXT_RELEASE=$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g') echo "**** External version: ${EXT_RELEASE} ****" echo "**** Retrieving last pushed version ****" image="linuxserver/plex" diff --git a/Jenkinsfile b/Jenkinsfile index 6119199..76920ac 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -442,6 +442,13 @@ pipeline { environment name: 'EXIT_STATUS', value: '' } steps { + sh '''#! /bin/bash + echo "Packages were updated. Cleaning up the image and exiting." + if [ "${MULTIARCH}" == "true" ]; then + docker rmi ${IMAGE}:amd64-${META_TAG} + else + docker rmi ${IMAGE}:${META_TAG} + fi''' script{ env.EXIT_STATUS = 'ABORTED' } @@ -459,6 +466,13 @@ pipeline { } } steps { + sh '''#! /bin/bash + echo "There are no package updates. Cleaning up the image and exiting." + if [ "${MULTIARCH}" == "true" ]; then + docker rmi ${IMAGE}:amd64-${META_TAG} + else + docker rmi ${IMAGE}:${META_TAG} + fi''' script{ env.EXIT_STATUS = 'ABORTED' } @@ -548,7 +562,7 @@ pipeline { ''' } sh '''#! /bin/bash - for DELETEIMAGE in "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do + for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do docker rmi \ ${DELETEIMAGE}:${META_TAG} \ ${DELETEIMAGE}:${EXT_RELEASE_TAG} \ From 579330f532e443134a3c60ce1ece992f5f6c910b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 17 Dec 2020 18:05:26 -0500 Subject: [PATCH 127/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index c6c3fc8..2e6fc88 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -148,7 +148,7 @@ openssl1.1.1f-1ubuntu2.1 passwd1:4.8.1-1ubuntu5.20.04 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.21.1.3795-ee64ab56f +plexmediaserver1.21.1.3830-6c22540d5 procps2:3.3.16-1ubuntu2 publicsuffix20200303.0012-1 readline-common8.0-4 From 136d7a062fac40dcc4fe14176a41480c0a98c990 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 18 Dec 2020 18:19:26 -0500 Subject: [PATCH 128/514] Bot Updating Package Versions --- package_versions.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package_versions.txt b/package_versions.txt index 2e6fc88..e331b81 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -34,6 +34,12 @@ grep3.4-1 gzip1.10-0ubuntu4 hostname3.23 init-system-helpers1.57 +intel-gmmlib20.3.2 +intel-igc-core1.0.5819 +intel-igc-opencl1.0.5819 +intel-level-zero-gpu1.0.18716 +intel-ocloc20.50.18716 +intel-opencl20.50.18716 jq1.6-1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 From 33e197e90996acd459fc579b8b523452d6d9be36 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 24 Dec 2020 05:12:43 -0500 Subject: [PATCH 129/514] Bot Updating Package Versions --- package_versions.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index e331b81..add32cb 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -35,11 +35,11 @@ gzip1.10-0ubuntu4 hostname3.23 init-system-helpers1.57 intel-gmmlib20.3.2 -intel-igc-core1.0.5819 -intel-igc-opencl1.0.5819 -intel-level-zero-gpu1.0.18716 -intel-ocloc20.50.18716 -intel-opencl20.50.18716 +intel-igc-core1.0.5884 +intel-igc-opencl1.0.5884 +intel-level-zero-gpu1.0.18762 +intel-ocloc20.51.18762 +intel-opencl20.51.18762 jq1.6-1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 From d5e77e4ac23da3cdf0901bc0e13aa4959ddacfb9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 31 Dec 2020 05:15:16 -0500 Subject: [PATCH 130/514] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index add32cb..d427fc7 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -37,9 +37,9 @@ init-system-helpers1.57 intel-gmmlib20.3.2 intel-igc-core1.0.5884 intel-igc-opencl1.0.5884 -intel-level-zero-gpu1.0.18762 -intel-ocloc20.51.18762 -intel-opencl20.51.18762 +intel-level-zero-gpu1.0.18783 +intel-ocloc20.52.18783 +intel-opencl20.52.18783 jq1.6-1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 From 1c2221274a4679f75e2febf3c34dcfc32b49762f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 4 Jan 2021 15:07:05 -0500 Subject: [PATCH 131/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index d427fc7..133e0ff 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -154,7 +154,7 @@ openssl1.1.1f-1ubuntu2.1 passwd1:4.8.1-1ubuntu5.20.04 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.21.1.3830-6c22540d5 +plexmediaserver1.21.1.3842-b0c7a97d9 procps2:3.3.16-1ubuntu2 publicsuffix20200303.0012-1 readline-common8.0-4 From 2fa47fcf15df736a67de2f6e063ca4be72aae3db Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 5 Jan 2021 18:18:29 -0500 Subject: [PATCH 132/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 133e0ff..f8a6edd 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -154,7 +154,7 @@ openssl1.1.1f-1ubuntu2.1 passwd1:4.8.1-1ubuntu5.20.04 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.21.1.3842-b0c7a97d9 +plexmediaserver1.21.1.3876-3c3adfcb4 procps2:3.3.16-1ubuntu2 publicsuffix20200303.0012-1 readline-common8.0-4 From 49843cd51988ee3aad4b5bce4e80503b2b36d546 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 7 Jan 2021 05:21:01 -0500 Subject: [PATCH 133/514] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index f8a6edd..b74a078 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -61,9 +61,9 @@ libcrypt11:4.4.10-10ubuntu4 libcurl47.68.0-1ubuntu2.4 libdb5.35.3.28+dfsg1-0.6ubuntu2 libdebconfclient00.251ubuntu1 -libdrm22.4.101-2 -libdrm-common2.4.101-2 -libdrm-intel12.4.101-2 +libdrm22.4.102-1ubuntu1~20.04.1 +libdrm-common2.4.102-1ubuntu1~20.04.1 +libdrm-intel12.4.102-1ubuntu1~20.04.1 libext2fs21.45.5-2ubuntu1 libfdisk12.34-0.1ubuntu9.1 libffi73.3-4 From 57d1183bd283ddae4607a552b4cbe5e564bc2d0e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 12 Jan 2021 23:09:36 -0500 Subject: [PATCH 134/514] Bot Updating Templated Files --- .github/workflows/external_trigger.yml | 3 ++- .github/workflows/greetings.yml | 2 +- .../workflows/package_trigger_scheduler.yml | 2 +- Jenkinsfile | 19 ++++++++++++++++++- 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index d746d8e..b8fddcc 100644 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -22,8 +22,9 @@ jobs: if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then echo "**** Can't retrieve external version, exiting ****" FAILURE_REASON="Can't retrieve external version for plex branch master" + GHA_TRIGGER_URL="https://github.com/linuxserver/docker-plex/actions/runs/${{ github.run_id }}" curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680, - "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}], + "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n**Trigger URL:** '"${GHA_TRIGGER_URL}"' \n"}], "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} exit 1 fi diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml index ba6c69c..468e09a 100755 --- a/.github/workflows/greetings.yml +++ b/.github/workflows/greetings.yml @@ -8,6 +8,6 @@ jobs: steps: - uses: actions/first-interaction@v1 with: - issue-message: 'Thanks for opening your first issue here! Be sure to follow the [issue template](https://github.com/linuxserver/docker-plex/blob/master/.github/ISSUE_TEMPLATE.md)!' + issue-message: 'Thanks for opening your first issue here! Be sure to follow the [bug](https://github.com/linuxserver/docker-plex/blob/master/.github/ISSUE_TEMPLATE/issue.bug.md) or [feature](https://github.com/linuxserver/docker-plex/blob/master/.github/ISSUE_TEMPLATE/issue.feature.md) issue templates!' pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-plex/blob/master/.github/PULL_REQUEST_TEMPLATE.md)!' repo-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml index 1f27acc..651ca0c 100644 --- a/.github/workflows/package_trigger_scheduler.yml +++ b/.github/workflows/package_trigger_scheduler.yml @@ -2,7 +2,7 @@ name: Package Trigger Scheduler on: schedule: - - cron: '51 9 * * 4' + - cron: '51 3 * * 2' workflow_dispatch: jobs: diff --git a/Jenkinsfile b/Jenkinsfile index 76920ac..4357f36 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -257,13 +257,30 @@ pipeline { fi mkdir -p ${TEMPDIR}/gitbook git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/gitbook/docker-documentation - if [[ "${BRANCH_NAME}" == "master" ]] && [[ (! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then + if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then cp ${TEMPDIR}/docker-${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/ cd ${TEMPDIR}/gitbook/docker-documentation/ git add images/docker-${CONTAINER_NAME}.md git commit -m 'Bot Updating Documentation' git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git --all fi + mkdir -p ${TEMPDIR}/unraid + git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates + git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates + if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then + sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/${CONTAINER_NAME}.xml + fi + if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then + if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then + echo "Image is on the ignore list, skipping Unraid template upload" + else + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ + cd ${TEMPDIR}/unraid/templates/ + git add unraid/${CONTAINER_NAME}.xml + git commit -m 'Bot Updating Unraid Template' + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git --all + fi + fi rm -Rf ${TEMPDIR}''' script{ env.FILES_UPDATED = sh( From 661c14fd69fee9cff0799aad7973f86f122f2495 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 12 Jan 2021 23:14:22 -0500 Subject: [PATCH 135/514] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index b74a078..d4eb7fd 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -35,11 +35,11 @@ gzip1.10-0ubuntu4 hostname3.23 init-system-helpers1.57 intel-gmmlib20.3.2 -intel-igc-core1.0.5884 -intel-igc-opencl1.0.5884 -intel-level-zero-gpu1.0.18783 -intel-ocloc20.52.18783 -intel-opencl20.52.18783 +intel-igc-core1.0.5964 +intel-igc-opencl1.0.5964 +intel-level-zero-gpu1.0.18793 +intel-ocloc21.01.18793 +intel-opencl21.01.18793 jq1.6-1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 @@ -99,7 +99,7 @@ libnettle73.5.1+really3.5.1-2 libnghttp2-141.40.0-1build1 libnpth01.6-1 libonig56.9.4-1 -libp11-kit00.23.20-1build1 +libp11-kit00.23.20-1ubuntu0.1 libpam0g1.3.1-5ubuntu4.1 libpam-modules1.3.1-5ubuntu4.1 libpam-modules-bin1.3.1-5ubuntu4.1 From 8e8e2f9664bb55ad095b3f30824ffe6c9e461674 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 18 Jan 2021 23:30:08 -0500 Subject: [PATCH 136/514] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index d4eb7fd..383aecd 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -37,9 +37,9 @@ init-system-helpers1.57 intel-gmmlib20.3.2 intel-igc-core1.0.5964 intel-igc-opencl1.0.5964 -intel-level-zero-gpu1.0.18793 -intel-ocloc21.01.18793 -intel-opencl21.01.18793 +intel-level-zero-gpu1.0.18820 +intel-ocloc21.02.18820 +intel-opencl21.02.18820 jq1.6-1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 @@ -129,7 +129,7 @@ libstdc++610.2.0-5ubuntu1~20.04 libsystemd0245.4-4ubuntu3.3 libtasn1-64.16.0-2 libtinfo66.2-0ubuntu2 -libudev1245.4-4ubuntu3.3 +libudev1245.4-4ubuntu3.4 libunistring20.9.10-2 libuuid12.34-0.1ubuntu9.1 libwind0-heimdal7.7.0+dfsg-1ubuntu1 @@ -162,9 +162,9 @@ sed4.7-1 sensible-utils0.0.12+nmu1 sysvinit-utils2.96-2.1ubuntu1 tar1.30+dfsg-7 -tzdata2020d-0ubuntu0.20.04 +tzdata2020f-0ubuntu0.20.04.1 ubuntu-keyring2020.02.11.2 -udev245.4-4ubuntu3.3 +udev245.4-4ubuntu3.4 unrar1:5.6.6-2build1 util-linux2.34-0.1ubuntu9.1 wget1.20.3-1ubuntu1 From 9a6da3e4007bcf73d3b681418091f4a7168a6a77 Mon Sep 17 00:00:00 2001 From: Roxedus Date: Wed, 20 Jan 2021 14:36:26 +0100 Subject: [PATCH 137/514] Deprecate UMASK_SET in favor of UMASK in baseimage --- README.md | 4 +--- readme-vars.yml | 2 +- root/etc/services.d/plex/run | 7 ++++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 2f8f7c6..6b31366 100644 --- a/README.md +++ b/README.md @@ -85,7 +85,6 @@ services: - PUID=1000 - PGID=1000 - VERSION=docker - - UMASK_SET=022 #optional - PLEX_CLAIM= #optional volumes: - /path/to/library:/config @@ -103,7 +102,6 @@ docker run -d \ -e PUID=1000 \ -e PGID=1000 \ -e VERSION=docker \ - -e UMASK_SET=022 `#optional` \ -e PLEX_CLAIM= `#optional` \ -v /path/to/library:/config \ -v /path/to/tvseries:/tv \ @@ -123,7 +121,6 @@ Container images are configured using parameters passed at runtime (such as thos | `-e PUID=1000` | for UserID - see below for explanation | | `-e PGID=1000` | for GroupID - see below for explanation | | `-e VERSION=docker` | Set whether to update plex or not - see Application Setup section. | -| `-e UMASK_SET=022` | control permissions of files and directories created by Plex | | `-e PLEX_CLAIM=` | Optionally you can obtain a claim token from https://plex.tv/claim and input here. Keep in mind that the claim tokens expire within 4 minutes. | | `-v /config` | Plex library location. *This can grow very large, 50gb+ is likely for a large collection.* | | `-v /tv` | Media goes here. Add as many as needed e.g. `/movies`, `/tv`, etc. | @@ -297,6 +294,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **20.01.21:** - Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information. * **10.12.20:** - Add latest Intel Compute packages from github repo for opencl support on latest gen igpu. * **23.11.20:** - Add Bionic branch make Focal default. * **03.05.20:** - Update exposed ports and example docs for bridge mode. diff --git a/readme-vars.yml b/readme-vars.yml index b02f294..efe9de6 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -38,7 +38,6 @@ param_env_vars: # optional env variables opt_param_usage_include_env: true opt_param_env_vars: - - { env_var: "UMASK_SET", env_value: "022", desc: "control permissions of files and directories created by Plex"} - { env_var: "PLEX_CLAIM", env_value: "", desc: "Optionally you can obtain a claim token from https://plex.tv/claim and input here. Keep in mind that the claim tokens expire within 4 minutes."} optional_parameters: | @@ -106,6 +105,7 @@ app_setup_block: | # changelog changelogs: + - { date: "20.01.21:", desc: "Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information." } - { date: "10.12.20:", desc: "Add latest Intel Compute packages from github repo for opencl support on latest gen igpu." } - { date: "23.11.20:", desc: "Add Bionic branch make Focal default." } - { date: "03.05.20:", desc: "Update exposed ports and example docs for bridge mode." } diff --git a/root/etc/services.d/plex/run b/root/etc/services.d/plex/run index 29fcf82..9845f09 100644 --- a/root/etc/services.d/plex/run +++ b/root/etc/services.d/plex/run @@ -1,9 +1,10 @@ #!/usr/bin/with-contenv bash -UMASK_SET=${UMASK_SET:-022} - -umask "$UMASK_SET" +if [ -n "${UMASK_SET}" ] && [ -z "${UMASK}" ]; then + echo -e "You are using a legacy method of defining umask\nplease update your environment variable from UMASK_SET to UMASK\nto keep the functionality after July 2021" + umask ${UMASK_SET} +fi echo "Starting Plex Media Server." export PLEX_MEDIA_SERVER_INFO_MODEL=$(uname -m) From 54603743ed632314334040062bd6ce061becced4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 20 Jan 2021 15:06:34 +0000 Subject: [PATCH 138/514] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 383aecd..7f6adee 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -40,7 +40,7 @@ intel-igc-opencl1.0.5964 intel-level-zero-gpu1.0.18820 intel-ocloc21.02.18820 intel-opencl21.02.18820 -jq1.6-1 +jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 libapt-pkg6.02.0.2ubuntu0.2 @@ -80,7 +80,7 @@ libheimntlm0-heimdal7.7.0+dfsg-1ubuntu1 libhogweed53.5.1+really3.5.1-2 libhx509-5-heimdal7.7.0+dfsg-1ubuntu1 libidn2-02.2.0-2 -libjq11.6-1 +libjq11.6-1ubuntu0.20.04.1 libk5crypto31.17-6ubuntu4.1 libkeyutils11.6-6ubuntu1 libkmod227-1ubuntu2 @@ -126,7 +126,7 @@ libss21.45.5-2ubuntu1 libssh-40.9.3-2ubuntu2.1 libssl1.11.1.1f-1ubuntu2.1 libstdc++610.2.0-5ubuntu1~20.04 -libsystemd0245.4-4ubuntu3.3 +libsystemd0245.4-4ubuntu3.4 libtasn1-64.16.0-2 libtinfo66.2-0ubuntu2 libudev1245.4-4ubuntu3.4 @@ -161,7 +161,7 @@ readline-common8.0-4 sed4.7-1 sensible-utils0.0.12+nmu1 sysvinit-utils2.96-2.1ubuntu1 -tar1.30+dfsg-7 +tar1.30+dfsg-7ubuntu0.20.04.1 tzdata2020f-0ubuntu0.20.04.1 ubuntu-keyring2020.02.11.2 udev245.4-4ubuntu3.4 From 19249484dc0531340f556d315041b740f9981993 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 26 Jan 2021 04:13:00 +0000 Subject: [PATCH 139/514] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 7f6adee..c5827ad 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -37,9 +37,9 @@ init-system-helpers1.57 intel-gmmlib20.3.2 intel-igc-core1.0.5964 intel-igc-opencl1.0.5964 -intel-level-zero-gpu1.0.18820 -intel-ocloc21.02.18820 -intel-opencl21.02.18820 +intel-level-zero-gpu1.0.18857 +intel-ocloc21.03.18857 +intel-opencl21.03.18857 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 From 2f65be9d5800a2114dbb025d2a52af1fe2d2eb47 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 26 Jan 2021 17:38:53 +0000 Subject: [PATCH 140/514] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index c5827ad..ea27f6e 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,6 +1,6 @@ adduser3.118ubuntu2 -apt2.0.2ubuntu0.2 -apt-utils2.0.2ubuntu0.2 +apt2.0.4 +apt-utils2.0.4 base-files11ubuntu5.2 base-passwd3.5.47 bash5.0-6ubuntu1.1 @@ -43,7 +43,7 @@ intel-opencl21.03.18857 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 -libapt-pkg6.02.0.2ubuntu0.2 +libapt-pkg6.02.0.4 libasn1-8-heimdal7.7.0+dfsg-1ubuntu1 libassuan02.5.3-7ubuntu2 libattr11:2.4.48-5 @@ -154,7 +154,7 @@ openssl1.1.1f-1ubuntu2.1 passwd1:4.8.1-1ubuntu5.20.04 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.21.1.3876-3c3adfcb4 +plexmediaserver1.21.2.3939-3945797bd procps2:3.3.16-1ubuntu2 publicsuffix20200303.0012-1 readline-common8.0-4 From b728f1acbbda9077905587034135aed15483da4c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 27 Jan 2021 21:09:08 +0000 Subject: [PATCH 141/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index ea27f6e..9ce31dd 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -154,7 +154,7 @@ openssl1.1.1f-1ubuntu2.1 passwd1:4.8.1-1ubuntu5.20.04 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.21.2.3939-3945797bd +plexmediaserver1.21.2.3943-a91458577 procps2:3.3.16-1ubuntu2 publicsuffix20200303.0012-1 readline-common8.0-4 From fb8a5ee9f22fb6a9bb8abb66e4a2839ff9668088 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 2 Feb 2021 04:15:57 +0000 Subject: [PATCH 142/514] Bot Updating Package Versions --- package_versions.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 9ce31dd..3004e38 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -35,11 +35,11 @@ gzip1.10-0ubuntu4 hostname3.23 init-system-helpers1.57 intel-gmmlib20.3.2 -intel-igc-core1.0.5964 -intel-igc-opencl1.0.5964 -intel-level-zero-gpu1.0.18857 -intel-ocloc21.03.18857 -intel-opencl21.03.18857 +intel-igc-core1.0.6083 +intel-igc-opencl1.0.6083 +intel-level-zero-gpu1.0.18912 +intel-ocloc21.04.18912 +intel-opencl21.04.18912 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 @@ -141,7 +141,7 @@ libxdmcp61:1.1.3-0ubuntu1 libxext62:1.3.4-0ubuntu1 libxfixes31:5.0.3-2 libzstd11.4.4+dfsg-3 -locales2.31-0ubuntu9.1 +locales2.31-0ubuntu9.2 login1:4.8.1-1ubuntu5.20.04 logsave1.45.5-2ubuntu1 lsb-base11.1.0ubuntu2 @@ -162,7 +162,7 @@ sed4.7-1 sensible-utils0.0.12+nmu1 sysvinit-utils2.96-2.1ubuntu1 tar1.30+dfsg-7ubuntu0.20.04.1 -tzdata2020f-0ubuntu0.20.04.1 +tzdata2021a-0ubuntu0.20.04 ubuntu-keyring2020.02.11.2 udev245.4-4ubuntu3.4 unrar1:5.6.6-2build1 From eec0e7779971e29a2b6c338c6a59ab958035bfc2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 6 Feb 2021 16:53:45 -0500 Subject: [PATCH 143/514] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 3004e38..7bdd686 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,7 +1,7 @@ adduser3.118ubuntu2 apt2.0.4 apt-utils2.0.4 -base-files11ubuntu5.2 +base-files11ubuntu5.3 base-passwd3.5.47 bash5.0-6ubuntu1.1 beignet-opencl-icd1.3.2-7build1 @@ -53,9 +53,9 @@ libblkid12.34-0.1ubuntu9.1 libbrotli11.0.7-6ubuntu0.1 libbsd00.10.0-1 libbz2-1.01.0.8-2 -libc62.31-0ubuntu9.1 +libc62.31-0ubuntu9.2 libcap-ng00.7.9-2.1build1 -libc-bin2.31-0ubuntu9.1 +libc-bin2.31-0ubuntu9.2 libcom-err21.45.5-2ubuntu1 libcrypt11:4.4.10-10ubuntu4 libcurl47.68.0-1ubuntu2.4 @@ -154,7 +154,7 @@ openssl1.1.1f-1ubuntu2.1 passwd1:4.8.1-1ubuntu5.20.04 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.21.2.3943-a91458577 +plexmediaserver1.21.3.4014-58bd20c02 procps2:3.3.16-1ubuntu2 publicsuffix20200303.0012-1 readline-common8.0-4 From bbf1d2fa623cb5f1e7ac041edb6d93dbe5b79050 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 9 Feb 2021 04:03:18 +0000 Subject: [PATCH 144/514] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 7bdd686..6a94af8 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -37,9 +37,9 @@ init-system-helpers1.57 intel-gmmlib20.3.2 intel-igc-core1.0.6083 intel-igc-opencl1.0.6083 -intel-level-zero-gpu1.0.18912 -intel-ocloc21.04.18912 -intel-opencl21.04.18912 +intel-level-zero-gpu1.0.18936 +intel-ocloc21.05.18936 +intel-opencl21.05.18936 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 From 7e01910be060fd707dcc6c03e7d4d0b7a8e99a98 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 10 Feb 2021 01:37:56 +0000 Subject: [PATCH 145/514] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 6a94af8..32f773b 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -7,7 +7,7 @@ bash5.0-6ubuntu1.1 beignet-opencl-icd1.3.2-7build1 bsdutils1:2.34-0.1ubuntu9.1 bzip21.0.8-2 -ca-certificates20201027ubuntu0.20.04.1 +ca-certificates20210119~20.04.1 coreutils8.30-3ubuntu2 curl7.68.0-1ubuntu2.4 dash0.5.10.2-6 @@ -88,8 +88,8 @@ libkrb5-26-heimdal7.7.0+dfsg-1ubuntu1 libkrb5-31.17-6ubuntu4.1 libkrb5support01.17-6ubuntu4.1 libksba81.3.5-2 -libldap-2.4-22.4.49+dfsg-2ubuntu1.5 -libldap-common2.4.49+dfsg-2ubuntu1.5 +libldap-2.4-22.4.49+dfsg-2ubuntu1.6 +libldap-common2.4.49+dfsg-2ubuntu1.6 liblz4-11.9.2-2 liblzma55.2.4-1ubuntu1 libmount12.34-0.1ubuntu9.1 @@ -154,7 +154,7 @@ openssl1.1.1f-1ubuntu2.1 passwd1:4.8.1-1ubuntu5.20.04 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.21.3.4014-58bd20c02 +plexmediaserver1.21.3.4021-5a0a3e4b2 procps2:3.3.16-1ubuntu2 publicsuffix20200303.0012-1 readline-common8.0-4 From 7cb6c62b9aad9c37f15c99bca45089715bad4337 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 15 Feb 2021 22:56:32 -0500 Subject: [PATCH 146/514] Bot Updating Templated Files --- Jenkinsfile | 77 ++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 61 insertions(+), 16 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4357f36..39444fb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -233,10 +233,53 @@ pipeline { TEMPDIR=$(mktemp -d) docker pull ghcr.io/linuxserver/jenkins-builder:latest docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest + # Stage 1 - Jenkinsfile update + if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then + mkdir -p ${TEMPDIR}/repo + git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} + cd ${TEMPDIR}/repo/${LS_REPO} + git checkout -f master + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/ + git add Jenkinsfile + git commit -m 'Bot Updating Templated Files' + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all + echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + echo "Updating Jenkinsfile" + rm -Rf ${TEMPDIR} + exit 0 + else + echo "Jenkinsfile is up to date." + fi + # Stage 2 - Delete old templates + OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md" + for i in ${OLD_TEMPLATES}; do + if [[ -f "${i}" ]]; then + TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}" + fi + done + if [[ -n "${TEMPLATES_TO_DELETE}" ]]; then + mkdir -p ${TEMPDIR}/repo + git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} + cd ${TEMPDIR}/repo/${LS_REPO} + git checkout -f master + cd ${TEMPDIR}/docker-${CONTAINER_NAME} + for i in ${TEMPLATES_TO_DELETE}; do + git rm "${i}" + done + git commit -m 'Bot Updating Templated Files' + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all + echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + echo "Deleting old templates" + rm -Rf ${TEMPDIR} + exit 0 + else + echo "No templates to delete" + fi + # Stage 3 - Update templates CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) cd ${TEMPDIR}/docker-${CONTAINER_NAME} NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) - if [[ "${CURRENTHASH}" != "${NEWHASH}" ]]; then + if [[ "${CURRENTHASH}" != "${NEWHASH}" ]] || ! grep -q '.jenkins-external' "${WORKSPACE}/.gitignore" 2>/dev/null; then mkdir -p ${TEMPDIR}/repo git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} cd ${TEMPDIR}/repo/${LS_REPO} @@ -244,11 +287,13 @@ pipeline { cd ${TEMPDIR}/docker-${CONTAINER_NAME} mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE - rm -f ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE.md cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || : cd ${TEMPDIR}/repo/${LS_REPO}/ + if ! grep -q '.jenkins-external' .gitignore 2>/dev/null; then + echo ".jenkins-external" >> .gitignore + git add .gitignore + fi git add ${TEMPLATED_FILES} - git rm .github/ISSUE_TEMPLATE.md || : git commit -m 'Bot Updating Templated Files' git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} @@ -257,8 +302,8 @@ pipeline { fi mkdir -p ${TEMPDIR}/gitbook git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/gitbook/docker-documentation - if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/ + if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/ cd ${TEMPDIR}/gitbook/docker-documentation/ git add images/docker-${CONTAINER_NAME}.md git commit -m 'Bot Updating Documentation' @@ -268,13 +313,13 @@ pipeline { git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then - sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/${CONTAINER_NAME}.xml + sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml fi - if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then + if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then echo "Image is on the ignore list, skipping Unraid template upload" else - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ cd ${TEMPDIR}/unraid/templates/ git add unraid/${CONTAINER_NAME}.xml git commit -m 'Bot Updating Unraid Template' @@ -514,7 +559,7 @@ pipeline { } sh '''#! /bin/bash set -e - docker pull ghcr.io/linuxserver/lsiodev-ci:latest + docker pull ghcr.io/linuxserver/ci:latest if [ "${MULTIARCH}" == "true" ]; then docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} @@ -539,7 +584,7 @@ pipeline { -e WEB_PATH=\"${CI_WEBPATH}\" \ -e DO_REGION="ams3" \ -e DO_BUCKET="lsio-ci" \ - -t ghcr.io/linuxserver/lsiodev-ci:latest \ + -t ghcr.io/linuxserver/ci:latest \ python /ci/ci.py''' } } @@ -684,9 +729,9 @@ pipeline { environment name: 'EXIT_STATUS', value: '' } steps { - echo "Pushing New tag for current commit ${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}" + echo "Pushing New tag for current commit ${META_TAG}" sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \ - -d '{"tag":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\ + -d '{"tag":"'${META_TAG}'",\ "object": "'${COMMIT_SHA}'",\ "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to master",\ "type": "commit",\ @@ -694,9 +739,9 @@ pipeline { echo "Pushing New release for Tag" sh '''#! /bin/bash echo "Data change at JSON endpoint ${JSON_URL}" > releasebody.json - echo '{"tag_name":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\ + echo '{"tag_name":"'${META_TAG}'",\ "target_commitish": "master",\ - "name": "'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\ + "name": "'${META_TAG}'",\ "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**Remote Changes:**\\n\\n' > start printf '","draft": false,"prerelease": false}' >> releasebody.json paste -d'\\0' start releasebody.json > releasebody.json.done @@ -723,7 +768,7 @@ pipeline { TEMPDIR=$(mktemp -d) docker pull ghcr.io/linuxserver/jenkins-builder:latest docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH="${BRANCH_NAME}" -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest - docker pull ghcr.io/linuxserver/lsiodev-readme-sync + docker pull ghcr.io/linuxserver/readme-sync docker run --rm=true \ -e DOCKERHUB_USERNAME=$DOCKERUSER \ -e DOCKERHUB_PASSWORD=$DOCKERPASS \ @@ -731,7 +776,7 @@ pipeline { -e DOCKER_REPOSITORY=${IMAGE} \ -e GIT_BRANCH=master \ -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/mnt \ - ghcr.io/linuxserver/lsiodev-readme-sync bash -c 'node sync' + ghcr.io/linuxserver/readme-sync bash -c 'node sync' rm -Rf ${TEMPDIR} ''' } } From e34051894fb1336abb062ac6cff888c5cfc35a73 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 15 Feb 2021 22:58:23 -0500 Subject: [PATCH 147/514] Bot Updating Templated Files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 96374c4..6e8ad97 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ $RECYCLE.BIN/ Network Trash Folder Temporary Items .apdisk +.jenkins-external From a18680aa7844f3c0d273ee0e396b2503a81db8c0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 15 Feb 2021 23:11:12 -0500 Subject: [PATCH 148/514] Bot Updating Package Versions --- package_versions.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 32f773b..3a81ffc 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -35,11 +35,11 @@ gzip1.10-0ubuntu4 hostname3.23 init-system-helpers1.57 intel-gmmlib20.3.2 -intel-igc-core1.0.6083 -intel-igc-opencl1.0.6083 -intel-level-zero-gpu1.0.18936 -intel-ocloc21.05.18936 -intel-opencl21.05.18936 +intel-igc-core1.0.6087 +intel-igc-opencl1.0.6087 +intel-level-zero-gpu1.0.18993 +intel-ocloc21.06.18993 +intel-opencl21.06.18993 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 From 4bfffc2790698da38bb082d5758fbd2d3fc2623e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 17 Feb 2021 11:51:39 +0000 Subject: [PATCH 149/514] Bot Updating Package Versions --- package_versions.txt | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 3a81ffc..6ffeac1 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -14,22 +14,22 @@ dash0.5.10.2-6 debconf1.5.73 debianutils4.9.1 diffutils1:3.7-3 -dirmngr2.2.19-3ubuntu2 +dirmngr2.2.19-3ubuntu2.1 dpkg1.19.7ubuntu3 e2fsprogs1.45.5-2ubuntu1 fdisk2.34-0.1ubuntu9.1 findutils4.7.0-1ubuntu1 gcc-10-base10.2.0-5ubuntu1~20.04 -gnupg2.2.19-3ubuntu2 -gnupg-l10n2.2.19-3ubuntu2 -gnupg-utils2.2.19-3ubuntu2 -gpg2.2.19-3ubuntu2 -gpg-agent2.2.19-3ubuntu2 -gpgconf2.2.19-3ubuntu2 -gpgsm2.2.19-3ubuntu2 -gpgv2.2.19-3ubuntu2 -gpg-wks-client2.2.19-3ubuntu2 -gpg-wks-server2.2.19-3ubuntu2 +gnupg2.2.19-3ubuntu2.1 +gnupg-l10n2.2.19-3ubuntu2.1 +gnupg-utils2.2.19-3ubuntu2.1 +gpg2.2.19-3ubuntu2.1 +gpg-agent2.2.19-3ubuntu2.1 +gpgconf2.2.19-3ubuntu2.1 +gpgsm2.2.19-3ubuntu2.1 +gpgv2.2.19-3ubuntu2.1 +gpg-wks-client2.2.19-3ubuntu2.1 +gpg-wks-server2.2.19-3ubuntu2.1 grep3.4-1 gzip1.10-0ubuntu4 hostname3.23 @@ -154,7 +154,7 @@ openssl1.1.1f-1ubuntu2.1 passwd1:4.8.1-1ubuntu5.20.04 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.21.3.4021-5a0a3e4b2 +plexmediaserver1.21.3.4046-3c1c83ba4 procps2:3.3.16-1ubuntu2 publicsuffix20200303.0012-1 readline-common8.0-4 From 2abc77663f71b515d92d7b95c3d052ae054a0ae7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 23 Feb 2021 04:04:00 +0000 Subject: [PATCH 150/514] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 6ffeac1..20b679f 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -37,9 +37,9 @@ init-system-helpers1.57 intel-gmmlib20.3.2 intel-igc-core1.0.6087 intel-igc-opencl1.0.6087 -intel-level-zero-gpu1.0.18993 -intel-ocloc21.06.18993 -intel-opencl21.06.18993 +intel-level-zero-gpu1.0.19042 +intel-ocloc21.07.19042 +intel-opencl21.07.19042 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 From 1d96698ab8eb18633ba12ceac888b3cb17ab93a5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 25 Feb 2021 18:05:06 -0500 Subject: [PATCH 151/514] Bot Updating Package Versions --- package_versions.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 20b679f..6213413 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -88,8 +88,8 @@ libkrb5-26-heimdal7.7.0+dfsg-1ubuntu1 libkrb5-31.17-6ubuntu4.1 libkrb5support01.17-6ubuntu4.1 libksba81.3.5-2 -libldap-2.4-22.4.49+dfsg-2ubuntu1.6 -libldap-common2.4.49+dfsg-2ubuntu1.6 +libldap-2.4-22.4.49+dfsg-2ubuntu1.7 +libldap-common2.4.49+dfsg-2ubuntu1.7 liblz4-11.9.2-2 liblzma55.2.4-1ubuntu1 libmount12.34-0.1ubuntu9.1 @@ -124,7 +124,7 @@ libsmartcols12.34-0.1ubuntu9.1 libsqlite3-03.31.1-4ubuntu0.2 libss21.45.5-2ubuntu1 libssh-40.9.3-2ubuntu2.1 -libssl1.11.1.1f-1ubuntu2.1 +libssl1.11.1.1f-1ubuntu2.2 libstdc++610.2.0-5ubuntu1~20.04 libsystemd0245.4-4ubuntu3.4 libtasn1-64.16.0-2 @@ -150,11 +150,11 @@ mount2.34-0.1ubuntu9.1 ncurses-base6.2-0ubuntu2 ncurses-bin6.2-0ubuntu2 ocl-icd-libopencl12.2.11-1ubuntu1 -openssl1.1.1f-1ubuntu2.1 +openssl1.1.1f-1ubuntu2.2 passwd1:4.8.1-1ubuntu5.20.04 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.21.3.4046-3c1c83ba4 +plexmediaserver1.21.4.4079-1b7748a7b procps2:3.3.16-1ubuntu2 publicsuffix20200303.0012-1 readline-common8.0-4 From 95d93b3bd5d020ac05c0535c772181c76e6b3aca Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 1 Mar 2021 23:03:29 -0500 Subject: [PATCH 152/514] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 6213413..99417a5 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -37,9 +37,9 @@ init-system-helpers1.57 intel-gmmlib20.3.2 intel-igc-core1.0.6087 intel-igc-opencl1.0.6087 -intel-level-zero-gpu1.0.19042 -intel-ocloc21.07.19042 -intel-opencl21.07.19042 +intel-level-zero-gpu1.0.19096 +intel-ocloc21.08.19096 +intel-opencl21.08.19096 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 From 95ba495d3cfdfe1896500f6433e671c7ce97eefd Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 8 Mar 2021 23:01:10 -0500 Subject: [PATCH 153/514] Bot Updating Package Versions --- package_versions.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 99417a5..8baf7fe 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -35,11 +35,11 @@ gzip1.10-0ubuntu4 hostname3.23 init-system-helpers1.57 intel-gmmlib20.3.2 -intel-igc-core1.0.6087 -intel-igc-opencl1.0.6087 -intel-level-zero-gpu1.0.19096 -intel-ocloc21.08.19096 -intel-opencl21.08.19096 +intel-igc-core1.0.6410 +intel-igc-opencl1.0.6410 +intel-level-zero-gpu1.0.19150 +intel-ocloc21.09.19150 +intel-opencl21.09.19150 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 From 5ac8c2160ce8601446e2c9452a2ecfbc777fd367 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 9 Mar 2021 16:04:54 +0000 Subject: [PATCH 154/514] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 8baf7fe..2547f9b 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -140,7 +140,7 @@ libxcb11.14-2 libxdmcp61:1.1.3-0ubuntu1 libxext62:1.3.4-0ubuntu1 libxfixes31:5.0.3-2 -libzstd11.4.4+dfsg-3 +libzstd11.4.4+dfsg-3ubuntu0.1 locales2.31-0ubuntu9.2 login1:4.8.1-1ubuntu5.20.04 logsave1.45.5-2ubuntu1 @@ -154,7 +154,7 @@ openssl1.1.1f-1ubuntu2.2 passwd1:4.8.1-1ubuntu5.20.04 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.21.4.4079-1b7748a7b +plexmediaserver1.22.0.4163-d8c4875dd procps2:3.3.16-1ubuntu2 publicsuffix20200303.0012-1 readline-common8.0-4 From 68d241ef98c2dbe0cca376c5925d3f554355bbbc Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 16 Mar 2021 04:03:58 +0000 Subject: [PATCH 155/514] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 2547f9b..3f6163d 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -37,9 +37,9 @@ init-system-helpers1.57 intel-gmmlib20.3.2 intel-igc-core1.0.6410 intel-igc-opencl1.0.6410 -intel-level-zero-gpu1.0.19150 -intel-ocloc21.09.19150 -intel-opencl21.09.19150 +intel-level-zero-gpu1.0.19208 +intel-ocloc21.10.19208 +intel-opencl21.10.19208 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 From 1a4635431f7f95d08e7a61c13f550fce58c941d3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 23 Mar 2021 04:07:23 +0000 Subject: [PATCH 156/514] Bot Updating Package Versions --- package_versions.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 3f6163d..48273f0 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -35,11 +35,11 @@ gzip1.10-0ubuntu4 hostname3.23 init-system-helpers1.57 intel-gmmlib20.3.2 -intel-igc-core1.0.6410 -intel-igc-opencl1.0.6410 -intel-level-zero-gpu1.0.19208 -intel-ocloc21.10.19208 -intel-opencl21.10.19208 +intel-igc-core1.0.6646 +intel-igc-opencl1.0.6646 +intel-level-zero-gpu1.0.19310 +intel-ocloc21.11.19310 +intel-opencl21.11.19310 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 @@ -129,7 +129,7 @@ libstdc++610.2.0-5ubuntu1~20.04 libsystemd0245.4-4ubuntu3.4 libtasn1-64.16.0-2 libtinfo66.2-0ubuntu2 -libudev1245.4-4ubuntu3.4 +libudev1245.4-4ubuntu3.5 libunistring20.9.10-2 libuuid12.34-0.1ubuntu9.1 libwind0-heimdal7.7.0+dfsg-1ubuntu1 @@ -164,7 +164,7 @@ sysvinit-utils2.96-2.1ubuntu1 tar1.30+dfsg-7ubuntu0.20.04.1 tzdata2021a-0ubuntu0.20.04 ubuntu-keyring2020.02.11.2 -udev245.4-4ubuntu3.4 +udev245.4-4ubuntu3.5 unrar1:5.6.6-2build1 util-linux2.34-0.1ubuntu9.1 wget1.20.3-1ubuntu1 From f41b55bb1ca34d4388d581035f19555b7c86eb3c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 24 Mar 2021 15:02:24 -0400 Subject: [PATCH 157/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 48273f0..f8f6751 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -154,7 +154,7 @@ openssl1.1.1f-1ubuntu2.2 passwd1:4.8.1-1ubuntu5.20.04 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.22.0.4163-d8c4875dd +plexmediaserver1.22.1.4228-724c56e62 procps2:3.3.16-1ubuntu2 publicsuffix20200303.0012-1 readline-common8.0-4 From 48d874686bcfefb0b718548ef11dedc01b0f5195 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 30 Mar 2021 05:05:18 +0100 Subject: [PATCH 158/514] Bot Updating Package Versions --- package_versions.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index f8f6751..bad404f 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -35,11 +35,11 @@ gzip1.10-0ubuntu4 hostname3.23 init-system-helpers1.57 intel-gmmlib20.3.2 -intel-igc-core1.0.6646 -intel-igc-opencl1.0.6646 -intel-level-zero-gpu1.0.19310 -intel-ocloc21.11.19310 -intel-opencl21.11.19310 +intel-igc-core1.0.6712 +intel-igc-opencl1.0.6712 +intel-level-zero-gpu1.0.19358 +intel-ocloc21.12.19358 +intel-opencl21.12.19358 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 From 44b85175ffbd0f83ecb30083998ccce93e1723cb Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 1 Apr 2021 19:57:46 +0000 Subject: [PATCH 159/514] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index bad404f..7aa936f 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -124,9 +124,9 @@ libsmartcols12.34-0.1ubuntu9.1 libsqlite3-03.31.1-4ubuntu0.2 libss21.45.5-2ubuntu1 libssh-40.9.3-2ubuntu2.1 -libssl1.11.1.1f-1ubuntu2.2 +libssl1.11.1.1f-1ubuntu2.3 libstdc++610.2.0-5ubuntu1~20.04 -libsystemd0245.4-4ubuntu3.4 +libsystemd0245.4-4ubuntu3.5 libtasn1-64.16.0-2 libtinfo66.2-0ubuntu2 libudev1245.4-4ubuntu3.5 @@ -150,11 +150,11 @@ mount2.34-0.1ubuntu9.1 ncurses-base6.2-0ubuntu2 ncurses-bin6.2-0ubuntu2 ocl-icd-libopencl12.2.11-1ubuntu1 -openssl1.1.1f-1ubuntu2.2 +openssl1.1.1f-1ubuntu2.3 passwd1:4.8.1-1ubuntu5.20.04 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.22.1.4228-724c56e62 +plexmediaserver1.22.1.4271-b86a5e175 procps2:3.3.16-1ubuntu2 publicsuffix20200303.0012-1 readline-common8.0-4 From d387b2ecbdc07781de231cd4b283bca3765d08e6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 1 Apr 2021 19:29:16 -0400 Subject: [PATCH 160/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 7aa936f..17369ac 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -154,7 +154,7 @@ openssl1.1.1f-1ubuntu2.3 passwd1:4.8.1-1ubuntu5.20.04 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.22.1.4271-b86a5e175 +plexmediaserver1.22.1.4228-724c56e62 procps2:3.3.16-1ubuntu2 publicsuffix20200303.0012-1 readline-common8.0-4 From fcfa37888704ffd64f372b72e0143f964983b7c2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 2 Apr 2021 00:12:15 +0000 Subject: [PATCH 161/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 17369ac..d96d7fb 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -154,7 +154,7 @@ openssl1.1.1f-1ubuntu2.3 passwd1:4.8.1-1ubuntu5.20.04 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.22.1.4228-724c56e62 +plexmediaserver1.22.1.4275-48e10484b procps2:3.3.16-1ubuntu2 publicsuffix20200303.0012-1 readline-common8.0-4 From 7953b4b840b6449ace8b9f32bbe6ecc09e600dcc Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 6 Apr 2021 05:07:03 +0100 Subject: [PATCH 162/514] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index d96d7fb..4a6e544 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -34,12 +34,12 @@ grep3.4-1 gzip1.10-0ubuntu4 hostname3.23 init-system-helpers1.57 -intel-gmmlib20.3.2 -intel-igc-core1.0.6712 -intel-igc-opencl1.0.6712 -intel-level-zero-gpu1.0.19358 -intel-ocloc21.12.19358 -intel-opencl21.12.19358 +intel-gmmlib20.4.1 +intel-igc-core1.0.6748 +intel-igc-opencl1.0.6748 +intel-level-zero-gpu1.0.19438 +intel-ocloc21.13.19438 +intel-opencl21.13.19438 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 From 2ceef2de6c628bb7392ecc50634adf08b9b1f21a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 6 Apr 2021 23:05:29 +0000 Subject: [PATCH 163/514] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 4a6e544..9c200c3 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -9,7 +9,7 @@ bsdutils1:2.34-0.1ubuntu9.1 bzip21.0.8-2 ca-certificates20210119~20.04.1 coreutils8.30-3ubuntu2 -curl7.68.0-1ubuntu2.4 +curl7.68.0-1ubuntu2.5 dash0.5.10.2-6 debconf1.5.73 debianutils4.9.1 @@ -58,7 +58,7 @@ libcap-ng00.7.9-2.1build1 libc-bin2.31-0ubuntu9.2 libcom-err21.45.5-2ubuntu1 libcrypt11:4.4.10-10ubuntu4 -libcurl47.68.0-1ubuntu2.4 +libcurl47.68.0-1ubuntu2.5 libdb5.35.3.28+dfsg1-0.6ubuntu2 libdebconfclient00.251ubuntu1 libdrm22.4.102-1ubuntu1~20.04.1 @@ -129,7 +129,7 @@ libstdc++610.2.0-5ubuntu1~20.04 libsystemd0245.4-4ubuntu3.5 libtasn1-64.16.0-2 libtinfo66.2-0ubuntu2 -libudev1245.4-4ubuntu3.5 +libudev1245.4-4ubuntu3.6 libunistring20.9.10-2 libuuid12.34-0.1ubuntu9.1 libwind0-heimdal7.7.0+dfsg-1ubuntu1 @@ -154,7 +154,7 @@ openssl1.1.1f-1ubuntu2.3 passwd1:4.8.1-1ubuntu5.20.04 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.22.1.4275-48e10484b +plexmediaserver1.22.2.4282-a97b03fad procps2:3.3.16-1ubuntu2 publicsuffix20200303.0012-1 readline-common8.0-4 @@ -163,8 +163,8 @@ sensible-utils0.0.12+nmu1 sysvinit-utils2.96-2.1ubuntu1 tar1.30+dfsg-7ubuntu0.20.04.1 tzdata2021a-0ubuntu0.20.04 -ubuntu-keyring2020.02.11.2 -udev245.4-4ubuntu3.5 +ubuntu-keyring2020.02.11.4 +udev245.4-4ubuntu3.6 unrar1:5.6.6-2build1 util-linux2.34-0.1ubuntu9.1 wget1.20.3-1ubuntu1 From 779827143983b59c1dfd24a9d23c96bca67fc17b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 13 Apr 2021 05:07:52 +0100 Subject: [PATCH 164/514] Bot Updating Package Versions --- package_versions.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 9c200c3..50e9460 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -35,11 +35,11 @@ gzip1.10-0ubuntu4 hostname3.23 init-system-helpers1.57 intel-gmmlib20.4.1 -intel-igc-core1.0.6748 -intel-igc-opencl1.0.6748 -intel-level-zero-gpu1.0.19438 -intel-ocloc21.13.19438 -intel-opencl21.13.19438 +intel-igc-core1.0.6812 +intel-igc-opencl1.0.6812 +intel-level-zero-gpu1.0.19498 +intel-ocloc21.14.19498 +intel-opencl21.14.19498 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 From 154613b515a7d2b6d0b662918f22f7cc8245500c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 20 Apr 2021 05:02:46 +0100 Subject: [PATCH 165/514] Bot Updating Templated Files --- Jenkinsfile | 88 ++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 71 insertions(+), 17 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 39444fb..449bd69 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -57,7 +57,7 @@ pipeline { env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/' env.PULL_REQUEST = env.CHANGE_ID - env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.md ./.github/ISSUE_TEMPLATE/issue.feature.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/greetings.yml ./.github/workflows/stale.yml ./.github/workflows/package_trigger.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/external_trigger.yml ./.github/workflows/external_trigger_scheduler.yml' + env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.md ./.github/ISSUE_TEMPLATE/issue.feature.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml' } script{ env.LS_RELEASE_NUMBER = sh( @@ -309,22 +309,24 @@ pipeline { git commit -m 'Bot Updating Documentation' git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git --all fi - mkdir -p ${TEMPDIR}/unraid + mkdir -p ${TEMPDIR}/unraid git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates - if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then - sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml + if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-logo.png ]]; then + sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-logo.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml fi if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then + cd ${TEMPDIR}/unraid/templates/ if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then - echo "Image is on the ignore list, skipping Unraid template upload" + echo "Image is on the ignore list, removing Unraid template" + git rm unraid/${CONTAINER_NAME}.xml || : + git commit -m 'Bot Removing Deprecated Unraid Template' || : else cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ - cd ${TEMPDIR}/unraid/templates/ git add unraid/${CONTAINER_NAME}.xml git commit -m 'Bot Updating Unraid Template' - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git --all fi + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git --all fi rm -Rf ${TEMPDIR}''' script{ @@ -381,8 +383,21 @@ pipeline { } steps { echo "Running on node: ${NODE_NAME}" - sh "docker build --no-cache --pull -t ${IMAGE}:${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + sh "docker build \ + --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \ + --label \"org.opencontainers.image.authors=linuxserver.io\" \ + --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-plex/packages\" \ + --label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-plex\" \ + --label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-plex\" \ + --label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \ + --label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \ + --label \"org.opencontainers.image.vendor=linuxserver.io\" \ + --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \ + --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ + --label \"org.opencontainers.image.title=Plex\" \ + --label \"org.opencontainers.image.description=[Plex](https://plex.tv) organizes video, music and photos from personal media libraries and streams them to smart TVs, streaming boxes and mobile devices. This container is packaged as a standalone Plex Media Server. has always been a top priority. Straightforward design and bulk actions mean getting things done faster.\" \ + --no-cache --pull -t ${IMAGE}:${META_TAG} \ + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." } } // Build MultiArch Docker containers for push to LS Repo @@ -395,8 +410,21 @@ pipeline { stage('Build X86') { steps { echo "Running on node: ${NODE_NAME}" - sh "docker build --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + sh "docker build \ + --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \ + --label \"org.opencontainers.image.authors=linuxserver.io\" \ + --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-plex/packages\" \ + --label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-plex\" \ + --label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-plex\" \ + --label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \ + --label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \ + --label \"org.opencontainers.image.vendor=linuxserver.io\" \ + --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \ + --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ + --label \"org.opencontainers.image.title=Plex\" \ + --label \"org.opencontainers.image.description=[Plex](https://plex.tv) organizes video, music and photos from personal media libraries and streams them to smart TVs, streaming boxes and mobile devices. This container is packaged as a standalone Plex Media Server. has always been a top priority. Straightforward design and bulk actions mean getting things done faster.\" \ + --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} \ + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." } } stage('Build ARMHF') { @@ -409,8 +437,21 @@ pipeline { sh '''#! /bin/bash echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin ''' - sh "docker build --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + sh "docker build \ + --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \ + --label \"org.opencontainers.image.authors=linuxserver.io\" \ + --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-plex/packages\" \ + --label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-plex\" \ + --label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-plex\" \ + --label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \ + --label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \ + --label \"org.opencontainers.image.vendor=linuxserver.io\" \ + --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \ + --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ + --label \"org.opencontainers.image.title=Plex\" \ + --label \"org.opencontainers.image.description=[Plex](https://plex.tv) organizes video, music and photos from personal media libraries and streams them to smart TVs, streaming boxes and mobile devices. This container is packaged as a standalone Plex Media Server. has always been a top priority. Straightforward design and bulk actions mean getting things done faster.\" \ + --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \ + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" retry(5) { sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" @@ -430,8 +471,21 @@ pipeline { sh '''#! /bin/bash echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin ''' - sh "docker build --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + sh "docker build \ + --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \ + --label \"org.opencontainers.image.authors=linuxserver.io\" \ + --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-plex/packages\" \ + --label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-plex\" \ + --label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-plex\" \ + --label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \ + --label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \ + --label \"org.opencontainers.image.vendor=linuxserver.io\" \ + --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \ + --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ + --label \"org.opencontainers.image.title=Plex\" \ + --label \"org.opencontainers.image.description=[Plex](https://plex.tv) organizes video, music and photos from personal media libraries and streams them to smart TVs, streaming boxes and mobile devices. This container is packaged as a standalone Plex Media Server. has always been a top priority. Straightforward design and bulk actions mean getting things done faster.\" \ + --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \ + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" retry(5) { sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" @@ -742,7 +796,7 @@ pipeline { echo '{"tag_name":"'${META_TAG}'",\ "target_commitish": "master",\ "name": "'${META_TAG}'",\ - "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**Remote Changes:**\\n\\n' > start + "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Remote Changes:**\\n\\n' > start printf '","draft": false,"prerelease": false}' >> releasebody.json paste -d'\\0' start releasebody.json > releasebody.json.done curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done''' @@ -767,7 +821,7 @@ pipeline { set -e TEMPDIR=$(mktemp -d) docker pull ghcr.io/linuxserver/jenkins-builder:latest - docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH="${BRANCH_NAME}" -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest + docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH="${BRANCH_NAME}" -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest docker pull ghcr.io/linuxserver/readme-sync docker run --rm=true \ -e DOCKERHUB_USERNAME=$DOCKERUSER \ From 8760a9bcddd40710ac81b784a8527aae4f654cb6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 20 Apr 2021 05:04:01 +0100 Subject: [PATCH 166/514] Bot Updating Templated Files --- .github/CONTRIBUTING.md | 7 +- .github/workflows/external_trigger.yml | 2 +- README.md | 110 +++++++++++++------------ 3 files changed, 62 insertions(+), 57 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index e1dd93e..2e7da93 100755 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -96,7 +96,7 @@ If you are proposing additional packages to be added, ensure that you added the ### Testing your changes -``` +```bash git clone https://github.com/linuxserver/docker-plex.git cd docker-plex docker build \ @@ -106,13 +106,14 @@ docker build \ ``` The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static` -``` + +```bash docker run --rm --privileged multiarch/qemu-user-static:register --reset ``` Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`. -## Update the chagelog +## Update the changelog If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-plex/tree/master/root), add an entry to the changelog diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index b8fddcc..2a84271 100644 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -18,7 +18,7 @@ jobs: fi echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_PLEX_MASTER\". ****" echo "**** Retrieving external version ****" - EXT_RELEASE=$(curl -s "https://plex.tv/api/downloads/5.json" | jq -r ". | .computer.Linux.version") + EXT_RELEASE=$(curl -s "https://plex.tv/api/downloads/5.json" | jq -r '. | .computer.Linux.version') if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then echo "**** Can't retrieve external version, exiting ****" FAILURE_REASON="Can't retrieve external version for plex branch master" diff --git a/README.md b/README.md index 6b31366..995e39e 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ - + [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io) @@ -12,13 +12,14 @@ The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring: - * regular and timely application updates - * easy user mappings (PGID, PUID) - * custom base image with s6 overlay - * weekly base OS updates with common layers across the entire LinuxServer.io ecosystem to minimise space usage, down time and bandwidth - * regular security updates +* regular and timely application updates +* easy user mappings (PGID, PUID) +* custom base image with s6 overlay +* weekly base OS updates with common layers across the entire LinuxServer.io ecosystem to minimise space usage, down time and bandwidth +* regular security updates Find us at: + * [Blog](https://blog.linuxserver.io) - all the things you can do with our containers including How-To guides, opinions and much more! * [Discord](https://discord.gg/YWrKVTn) - realtime support / chat with the community and the team. * [Discourse](https://discourse.linuxserver.io) - post on our community forum. @@ -65,6 +66,41 @@ This image provides various versions that are available via tags. `latest` tag u | latest | Stable releases with Focal baseimage | | bionic | Stable releases with Bionic baseimage | +## Application Setup + +Webui can be found at `:32400/web` + +** Note about updates, if there is no value set for the VERSION variable, then no updates will take place.** + +** For new users, no updates will take place on the first run of the container as there is no preferences file to read your token from, to update restart the Docker container after logging in through the webui** + +Valid settings for VERSION are:- + +`IMPORTANT NOTE:- YOU CANNOT UPDATE TO A PLEXPASS ONLY (BETA) VERSION IF YOU ARE NOT LOGGED IN WITH A PLEXPASS ACCOUNT` + ++ **`docker`**: Let Docker handle the Plex Version, we keep our Dockerhub Endpoint up to date with the latest public builds. This is the same as leaving this setting out of your create command. ++ **`latest`**: will update plex to the latest version available that you are entitled to. ++ **`public`**: will update plexpass users to the latest public version, useful for plexpass users that don't want to be on the bleeding edge but still want the latest public updates. ++ **``**: will select a specific version (eg 0.9.12.4.1192-9a47d21) of plex to install, note you cannot use this to access plexpass versions if you do not have plexpass. + +## Hardware Acceleration + +### Intel + +Hardware acceleration users for Intel Quicksync will need to mount their /dev/dri video device inside of the container by passing the following command when running or creating the container: + +```--device=/dev/dri:/dev/dri``` + +We will automatically ensure the abc user inside of the container has the proper permissions to access this device. + +### Nvidia + +Hardware acceleration users for Nvidia will need to install the container runtime provided by Nvidia on their host, instructions can be found here: + +https://github.com/NVIDIA/nvidia-docker + +We automatically add the necessary environment variable that will utilise all the features available on a GPU on the host. Once nvidia-docker is installed on your host you will need to re/create the docker container with the nvidia container runtime `--runtime=nvidia` and add an environment variable `-e NVIDIA_VISIBLE_DEVICES=all` (can also be set to a specific gpu's UUID, this can be discovered by running `nvidia-smi --query-gpu=gpu_name,gpu_uuid --format=csv` ). NVIDIA automatically mounts the GPU and drivers from your host into the plex docker. + ## Usage Here are some example snippets to help you get started creating a container. @@ -95,7 +131,7 @@ services: ### docker cli -``` +```bash docker run -d \ --name=plex \ --net=host \ @@ -110,7 +146,6 @@ docker run -d \ ghcr.io/linuxserver/plex ``` - ## Parameters Container images are configured using parameters passed at runtime (such as those above). These parameters are separated by a colon and indicate `:` respectively. For example, `-p 8080:80` would expose port `80` from inside the container to be accessible from the host's IP on port `8080` outside the container. @@ -132,7 +167,7 @@ You can set any environment variable from a file by using a special prepend `FIL As an example: -``` +```bash -e FILE__PASSWORD=/run/secrets/mysecretpassword ``` @@ -171,7 +206,6 @@ The application accepts a series of environment variables to further customize i | `--device=/dev/dri:/dev/dri` | Add this option to your run command if you plan on using Quicksync hardware acceleration - see Application Setup section.| | `--device=/dev/dvb:/dev/dvb` | Add this option to your run command if you plan on using dvb devices.| - ## User / Group Identifiers When using volumes (`-v` flags) permissions issues can arise between the host OS and the container, we avoid this issue by allowing you to specify the user `PUID` and group `PGID`. @@ -180,55 +214,17 @@ Ensure any volume directories on the host are owned by the same user you specify In this instance `PUID=1000` and `PGID=1000`, to find yours use `id user` as below: -``` +```bash $ id username uid=1000(dockeruser) gid=1000(dockergroup) groups=1000(dockergroup) ``` - -  -## Application Setup - -Webui can be found at `:32400/web` - -** Note about updates, if there is no value set for the VERSION variable, then no updates will take place.** - -** For new users, no updates will take place on the first run of the container as there is no preferences file to read your token from, to update restart the Docker container after logging in through the webui** - -Valid settings for VERSION are:- - -`IMPORTANT NOTE:- YOU CANNOT UPDATE TO A PLEXPASS ONLY (BETA) VERSION IF YOU ARE NOT LOGGED IN WITH A PLEXPASS ACCOUNT` - -+ **`docker`**: Let Docker handle the Plex Version, we keep our Dockerhub Endpoint up to date with the latest public builds. This is the same as leaving this setting out of your create command. -+ **`latest`**: will update plex to the latest version available that you are entitled to. -+ **`public`**: will update plexpass users to the latest public version, useful for plexpass users that don't want to be on the bleeding edge but still want the latest public updates. -+ **``**: will select a specific version (eg 0.9.12.4.1192-9a47d21) of plex to install, note you cannot use this to access plexpass versions if you do not have plexpass. - -## Hardware Acceleration - -### Intel - -Hardware acceleration users for Intel Quicksync will need to mount their /dev/dri video device inside of the container by passing the following command when running or creating the container: - -```--device=/dev/dri:/dev/dri``` - -We will automatically ensure the abc user inside of the container has the proper permissions to access this device. - -### Nvidia - -Hardware acceleration users for Nvidia will need to install the container runtime provided by Nvidia on their host, instructions can be found here: - -https://github.com/NVIDIA/nvidia-docker - -We automatically add the necessary environment variable that will utilise all the features available on a GPU on the host. Once nvidia-docker is installed on your host you will need to re/create the docker container with the nvidia container runtime `--runtime=nvidia` and add an environment variable `-e NVIDIA_VISIBLE_DEVICES=all` (can also be set to a specific gpu's UUID, this can be discovered by running `nvidia-smi --query-gpu=gpu_name,gpu_uuid --format=csv` ). NVIDIA automatically mounts the GPU and drivers from your host into the plex docker. - - ## Docker Mods + [![Docker Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=plex&query=%24.mods%5B%27plex%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=plex "view available mods for this container.") [![Docker Universal Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=universal&query=%24.mods%5B%27universal%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=universal "view available universal mods.") We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to enable additional functionality within the containers. The list of Mods available for this image (if any) as well as universal mods that can be applied to any one of our images can be accessed via the dynamic badges above. - ## Support Info * Shell access whilst the container is running: `docker exec -it plex /bin/bash` @@ -245,6 +241,7 @@ Most of our images are static, versioned, and require an image update and contai Below are the instructions for updating containers: ### Via Docker Compose + * Update all images: `docker-compose pull` * or update a single image: `docker-compose pull plex` * Let compose update all containers as necessary: `docker-compose up -d` @@ -252,6 +249,7 @@ Below are the instructions for updating containers: * You can also remove the old dangling images: `docker image prune` ### Via Docker Run + * Update the image: `docker pull ghcr.io/linuxserver/plex` * Stop the running container: `docker stop plex` * Delete the container: `docker rm plex` @@ -259,24 +257,29 @@ Below are the instructions for updating containers: * You can also remove the old dangling images: `docker image prune` ### Via Watchtower auto-updater (only use if you don't remember the original parameters) + * Pull the latest image at its tag and replace it with the same env variables in one run: - ``` + + ```bash docker run --rm \ -v /var/run/docker.sock:/var/run/docker.sock \ containrrr/watchtower \ --run-once plex ``` + * You can also remove the old dangling images: `docker image prune` **Note:** We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using [Docker Compose](https://docs.linuxserver.io/general/docker-compose). ### Image Update Notifications - Diun (Docker Image Update Notifier) + * We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported. ## Building locally If you want to make local modifications to these images for development purposes or just to customize the logic: -``` + +```bash git clone https://github.com/linuxserver/docker-plex.git cd docker-plex docker build \ @@ -286,7 +289,8 @@ docker build \ ``` The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static` -``` + +```bash docker run --rm --privileged multiarch/qemu-user-static:register --reset ``` From 2b31e84695221f6f9c2332d3faad1e98fc3c09c5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 20 Apr 2021 04:09:36 +0000 Subject: [PATCH 167/514] Bot Updating Package Versions --- package_versions.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 50e9460..21a5c25 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,6 +1,6 @@ adduser3.118ubuntu2 -apt2.0.4 -apt-utils2.0.4 +apt2.0.5 +apt-utils2.0.5 base-files11ubuntu5.3 base-passwd3.5.47 bash5.0-6ubuntu1.1 @@ -37,13 +37,13 @@ init-system-helpers1.57 intel-gmmlib20.4.1 intel-igc-core1.0.6812 intel-igc-opencl1.0.6812 -intel-level-zero-gpu1.0.19498 -intel-ocloc21.14.19498 -intel-opencl21.14.19498 +intel-level-zero-gpu1.1.19533 +intel-ocloc21.15.19533 +intel-opencl21.15.19533 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 -libapt-pkg6.02.0.4 +libapt-pkg6.02.0.5 libasn1-8-heimdal7.7.0+dfsg-1ubuntu1 libassuan02.5.3-7ubuntu2 libattr11:2.4.48-5 @@ -126,7 +126,7 @@ libss21.45.5-2ubuntu1 libssh-40.9.3-2ubuntu2.1 libssl1.11.1.1f-1ubuntu2.3 libstdc++610.2.0-5ubuntu1~20.04 -libsystemd0245.4-4ubuntu3.5 +libsystemd0245.4-4ubuntu3.6 libtasn1-64.16.0-2 libtinfo66.2-0ubuntu2 libudev1245.4-4ubuntu3.6 From c185ca2e244669ee5ef63d1eeb070ec8319e5cfc Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 22 Apr 2021 09:26:13 -0400 Subject: [PATCH 168/514] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 21a5c25..260b6dc 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -77,7 +77,7 @@ libgssapi-krb5-21.17-6ubuntu4.1 libhcrypto4-heimdal7.7.0+dfsg-1ubuntu1 libheimbase1-heimdal7.7.0+dfsg-1ubuntu1 libheimntlm0-heimdal7.7.0+dfsg-1ubuntu1 -libhogweed53.5.1+really3.5.1-2 +libhogweed53.5.1+really3.5.1-2ubuntu0.1 libhx509-5-heimdal7.7.0+dfsg-1ubuntu1 libidn2-02.2.0-2 libjq11.6-1ubuntu0.20.04.1 @@ -95,7 +95,7 @@ liblzma55.2.4-1ubuntu1 libmount12.34-0.1ubuntu9.1 libncurses66.2-0ubuntu2 libncursesw66.2-0ubuntu2 -libnettle73.5.1+really3.5.1-2 +libnettle73.5.1+really3.5.1-2ubuntu0.1 libnghttp2-141.40.0-1build1 libnpth01.6-1 libonig56.9.4-1 @@ -107,7 +107,7 @@ libpam-runtime1.3.1-5ubuntu4.1 libpciaccess00.16-0ubuntu1 libpcre2-8-010.34-7 libpcre32:8.39-12build1 -libprocps82:3.3.16-1ubuntu2 +libprocps82:3.3.16-1ubuntu2.1 libpsl50.21.0-1ubuntu1 libreadline88.0-4 libroken18-heimdal7.7.0+dfsg-1ubuntu1 @@ -115,7 +115,7 @@ librtmp12.4+20151223.gitfa8646d.1-2build1 libsasl2-22.1.27+dfsg-2 libsasl2-modules2.1.27+dfsg-2 libsasl2-modules-db2.1.27+dfsg-2 -libseccomp22.4.3-1ubuntu3.20.04.3 +libseccomp22.5.1-1ubuntu1~20.04.1 libselinux13.0-1build2 libsemanage13.0-1build2 libsemanage-common3.0-1build2 @@ -154,8 +154,8 @@ openssl1.1.1f-1ubuntu2.3 passwd1:4.8.1-1ubuntu5.20.04 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.22.2.4282-a97b03fad -procps2:3.3.16-1ubuntu2 +plexmediaserver1.22.3.4392-d7c624def +procps2:3.3.16-1ubuntu2.1 publicsuffix20200303.0012-1 readline-common8.0-4 sed4.7-1 From 4253b9b9d8a786b0da3f336b40f84dcaf7697c7d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 4 May 2021 04:07:33 +0000 Subject: [PATCH 169/514] Bot Updating Package Versions --- package_versions.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 260b6dc..7a06292 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -35,11 +35,11 @@ gzip1.10-0ubuntu4 hostname3.23 init-system-helpers1.57 intel-gmmlib20.4.1 -intel-igc-core1.0.6812 -intel-igc-opencl1.0.6812 -intel-level-zero-gpu1.1.19533 -intel-ocloc21.15.19533 -intel-opencl21.15.19533 +intel-igc-core1.0.7041 +intel-igc-opencl1.0.7041 +intel-level-zero-gpu1.1.19610 +intel-ocloc21.16.19610 +intel-opencl21.16.19610 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 @@ -88,8 +88,8 @@ libkrb5-26-heimdal7.7.0+dfsg-1ubuntu1 libkrb5-31.17-6ubuntu4.1 libkrb5support01.17-6ubuntu4.1 libksba81.3.5-2 -libldap-2.4-22.4.49+dfsg-2ubuntu1.7 -libldap-common2.4.49+dfsg-2ubuntu1.7 +libldap-2.4-22.4.49+dfsg-2ubuntu1.8 +libldap-common2.4.49+dfsg-2ubuntu1.8 liblz4-11.9.2-2 liblzma55.2.4-1ubuntu1 libmount12.34-0.1ubuntu9.1 @@ -141,7 +141,7 @@ libxdmcp61:1.1.3-0ubuntu1 libxext62:1.3.4-0ubuntu1 libxfixes31:5.0.3-2 libzstd11.4.4+dfsg-3ubuntu0.1 -locales2.31-0ubuntu9.2 +locales2.31-0ubuntu9.3 login1:4.8.1-1ubuntu5.20.04 logsave1.45.5-2ubuntu1 lsb-base11.1.0ubuntu2 From fccb8aedbe065b7881941128ce09ca7023b25777 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 11 May 2021 04:13:49 +0000 Subject: [PATCH 170/514] Bot Updating Package Versions --- package_versions.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 7a06292..95d7763 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -34,12 +34,12 @@ grep3.4-1 gzip1.10-0ubuntu4 hostname3.23 init-system-helpers1.57 -intel-gmmlib20.4.1 -intel-igc-core1.0.7041 -intel-igc-opencl1.0.7041 -intel-level-zero-gpu1.1.19610 -intel-ocloc21.16.19610 -intel-opencl21.16.19610 +intel-gmmlib21.1.2 +intel-igc-core1.0.7152 +intel-igc-opencl1.0.7152 +intel-level-zero-gpu1.1.19737 +intel-ocloc21.18.19737 +intel-opencl21.18.19737 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 @@ -141,7 +141,7 @@ libxdmcp61:1.1.3-0ubuntu1 libxext62:1.3.4-0ubuntu1 libxfixes31:5.0.3-2 libzstd11.4.4+dfsg-3ubuntu0.1 -locales2.31-0ubuntu9.3 +locales2.31-0ubuntu9.2 login1:4.8.1-1ubuntu5.20.04 logsave1.45.5-2ubuntu1 lsb-base11.1.0ubuntu2 From 1076277712e1dad4bfe16b210db05933f056df6e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 13 May 2021 16:08:12 +0000 Subject: [PATCH 171/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 95d7763..6e13a06 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -154,7 +154,7 @@ openssl1.1.1f-1ubuntu2.3 passwd1:4.8.1-1ubuntu5.20.04 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.22.3.4392-d7c624def +plexmediaserver1.22.3.4523-d0ce30438 procps2:3.3.16-1ubuntu2.1 publicsuffix20200303.0012-1 readline-common8.0-4 From 9acdde8bbcb1d071455d5c1671c34183c4cf65be Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 18 May 2021 05:15:28 +0100 Subject: [PATCH 172/514] Bot Updating Package Versions --- package_versions.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 6e13a06..9546732 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -35,11 +35,11 @@ gzip1.10-0ubuntu4 hostname3.23 init-system-helpers1.57 intel-gmmlib21.1.2 -intel-igc-core1.0.7152 -intel-igc-opencl1.0.7152 -intel-level-zero-gpu1.1.19737 -intel-ocloc21.18.19737 -intel-opencl21.18.19737 +intel-igc-core1.0.7181 +intel-igc-opencl1.0.7181 +intel-level-zero-gpu1.1.19792 +intel-ocloc21.19.19792 +intel-opencl21.19.19792 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 From f34485520fdce9faf6b38c2b75f4275747375ccd Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 25 May 2021 04:30:39 +0000 Subject: [PATCH 173/514] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 9546732..47f6511 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -34,12 +34,12 @@ grep3.4-1 gzip1.10-0ubuntu4 hostname3.23 init-system-helpers1.57 -intel-gmmlib21.1.2 -intel-igc-core1.0.7181 -intel-igc-opencl1.0.7181 -intel-level-zero-gpu1.1.19792 -intel-ocloc21.19.19792 -intel-opencl21.19.19792 +intel-gmmlib21.1.3 +intel-igc-core1.0.7423 +intel-igc-opencl1.0.7423 +intel-level-zero-gpu1.1.19883 +intel-ocloc21.20.19883 +intel-opencl21.20.19883 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 From e069e15e7b9f3b942f9f2982449b8572f1227d2a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 25 May 2021 20:27:36 +0100 Subject: [PATCH 174/514] Bot Updating Package Versions --- package_versions.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 47f6511..e0f455d 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -124,7 +124,7 @@ libsmartcols12.34-0.1ubuntu9.1 libsqlite3-03.31.1-4ubuntu0.2 libss21.45.5-2ubuntu1 libssh-40.9.3-2ubuntu2.1 -libssl1.11.1.1f-1ubuntu2.3 +libssl1.11.1.1f-1ubuntu2.4 libstdc++610.2.0-5ubuntu1~20.04 libsystemd0245.4-4ubuntu3.6 libtasn1-64.16.0-2 @@ -133,8 +133,8 @@ libudev1245.4-4ubuntu3.6 libunistring20.9.10-2 libuuid12.34-0.1ubuntu9.1 libwind0-heimdal7.7.0+dfsg-1ubuntu1 -libx11-62:1.6.9-2ubuntu1.1 -libx11-data2:1.6.9-2ubuntu1.1 +libx11-62:1.6.9-2ubuntu1.2 +libx11-data2:1.6.9-2ubuntu1.2 libxau61:1.0.9-0ubuntu1 libxcb11.14-2 libxdmcp61:1.1.3-0ubuntu1 @@ -150,11 +150,11 @@ mount2.34-0.1ubuntu9.1 ncurses-base6.2-0ubuntu2 ncurses-bin6.2-0ubuntu2 ocl-icd-libopencl12.2.11-1ubuntu1 -openssl1.1.1f-1ubuntu2.3 +openssl1.1.1f-1ubuntu2.4 passwd1:4.8.1-1ubuntu5.20.04 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.22.3.4523-d0ce30438 +plexmediaserver1.23.1.4571-6119e8eed procps2:3.3.16-1ubuntu2.1 publicsuffix20200303.0012-1 readline-common8.0-4 From 6c7139372e5ae64c1e8eb3ba0cf45c38a2243737 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 28 May 2021 12:27:59 -0400 Subject: [PATCH 175/514] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index e0f455d..0821aff 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -37,9 +37,9 @@ init-system-helpers1.57 intel-gmmlib21.1.3 intel-igc-core1.0.7423 intel-igc-opencl1.0.7423 -intel-level-zero-gpu1.1.19883 -intel-ocloc21.20.19883 -intel-opencl21.20.19883 +intel-level-zero-gpu1.1.19914 +intel-ocloc21.21.19914 +intel-opencl21.21.19914 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 @@ -154,7 +154,7 @@ openssl1.1.1f-1ubuntu2.4 passwd1:4.8.1-1ubuntu5.20.04 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.23.1.4571-6119e8eed +plexmediaserver1.23.1.4602-280ab6053 procps2:3.3.16-1ubuntu2.1 publicsuffix20200303.0012-1 readline-common8.0-4 From 471ff35962eed44e66aa4db2fe7637f07f7f8787 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 2 Jun 2021 00:57:00 +0000 Subject: [PATCH 176/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 0821aff..e4a3d34 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -154,7 +154,7 @@ openssl1.1.1f-1ubuntu2.4 passwd1:4.8.1-1ubuntu5.20.04 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.23.1.4602-280ab6053 +plexmediaserver1.23.2.4625-a83d2d0f9 procps2:3.3.16-1ubuntu2.1 publicsuffix20200303.0012-1 readline-common8.0-4 From 0a8222d17ca6e41d7c05c389baf77d532c919905 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 4 Jun 2021 00:49:19 +0000 Subject: [PATCH 177/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index e4a3d34..0821aff 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -154,7 +154,7 @@ openssl1.1.1f-1ubuntu2.4 passwd1:4.8.1-1ubuntu5.20.04 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.23.2.4625-a83d2d0f9 +plexmediaserver1.23.1.4602-280ab6053 procps2:3.3.16-1ubuntu2.1 publicsuffix20200303.0012-1 readline-common8.0-4 From 9aec39874df93b2c9afbee199943fcaa80edab7c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 5 Jun 2021 05:02:40 +0000 Subject: [PATCH 178/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 0821aff..ff74dcd 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -154,7 +154,7 @@ openssl1.1.1f-1ubuntu2.4 passwd1:4.8.1-1ubuntu5.20.04 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.23.1.4602-280ab6053 +plexmediaserver1.23.2.4656-85f0adf5b procps2:3.3.16-1ubuntu2.1 publicsuffix20200303.0012-1 readline-common8.0-4 From f4c0c84c85fd9717da97de5953f1c8a6266324c4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 8 Jun 2021 04:40:05 +0000 Subject: [PATCH 179/514] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index ff74dcd..7e7a4b9 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -37,9 +37,9 @@ init-system-helpers1.57 intel-gmmlib21.1.3 intel-igc-core1.0.7423 intel-igc-opencl1.0.7423 -intel-level-zero-gpu1.1.19914 -intel-ocloc21.21.19914 -intel-opencl21.21.19914 +intel-level-zero-gpu1.1.19967 +intel-ocloc21.22.19967 +intel-opencl21.22.19967 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 From 1c3b45d6581b66380f75407a4e5a6ab0b1bcdb50 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 15 Jun 2021 04:06:31 +0000 Subject: [PATCH 180/514] Bot Updating Package Versions --- package_versions.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 7e7a4b9..19b0914 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -37,9 +37,9 @@ init-system-helpers1.57 intel-gmmlib21.1.3 intel-igc-core1.0.7423 intel-igc-opencl1.0.7423 -intel-level-zero-gpu1.1.19967 -intel-ocloc21.22.19967 -intel-opencl21.22.19967 +intel-level-zero-gpu1.1.20043 +intel-ocloc21.23.20043 +intel-opencl21.23.20043 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 @@ -90,7 +90,7 @@ libkrb5support01.17-6ubuntu4.1 libksba81.3.5-2 libldap-2.4-22.4.49+dfsg-2ubuntu1.8 libldap-common2.4.49+dfsg-2ubuntu1.8 -liblz4-11.9.2-2 +liblz4-11.9.2-2ubuntu0.20.04.1 liblzma55.2.4-1ubuntu1 libmount12.34-0.1ubuntu9.1 libncurses66.2-0ubuntu2 @@ -100,10 +100,10 @@ libnghttp2-141.40.0-1build1 libnpth01.6-1 libonig56.9.4-1 libp11-kit00.23.20-1ubuntu0.1 -libpam0g1.3.1-5ubuntu4.1 -libpam-modules1.3.1-5ubuntu4.1 -libpam-modules-bin1.3.1-5ubuntu4.1 -libpam-runtime1.3.1-5ubuntu4.1 +libpam0g1.3.1-5ubuntu4.2 +libpam-modules1.3.1-5ubuntu4.2 +libpam-modules-bin1.3.1-5ubuntu4.2 +libpam-runtime1.3.1-5ubuntu4.2 libpciaccess00.16-0ubuntu1 libpcre2-8-010.34-7 libpcre32:8.39-12build1 From 763ed201d4dbe3416c7229abb4d996d65725e40e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 21 Jun 2021 09:17:40 -0400 Subject: [PATCH 181/514] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 19b0914..6103e96 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -129,7 +129,7 @@ libstdc++610.2.0-5ubuntu1~20.04 libsystemd0245.4-4ubuntu3.6 libtasn1-64.16.0-2 libtinfo66.2-0ubuntu2 -libudev1245.4-4ubuntu3.6 +libudev1245.4-4ubuntu3.7 libunistring20.9.10-2 libuuid12.34-0.1ubuntu9.1 libwind0-heimdal7.7.0+dfsg-1ubuntu1 @@ -154,7 +154,7 @@ openssl1.1.1f-1ubuntu2.4 passwd1:4.8.1-1ubuntu5.20.04 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.23.2.4656-85f0adf5b +plexmediaserver1.23.3.4707-ebb5fe9f3 procps2:3.3.16-1ubuntu2.1 publicsuffix20200303.0012-1 readline-common8.0-4 @@ -164,7 +164,7 @@ sysvinit-utils2.96-2.1ubuntu1 tar1.30+dfsg-7ubuntu0.20.04.1 tzdata2021a-0ubuntu0.20.04 ubuntu-keyring2020.02.11.4 -udev245.4-4ubuntu3.6 +udev245.4-4ubuntu3.7 unrar1:5.6.6-2build1 util-linux2.34-0.1ubuntu9.1 wget1.20.3-1ubuntu1 From f11ee17f13defaf9dff211ddacb5fc75b093b8ba Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 21 Jun 2021 23:58:59 -0400 Subject: [PATCH 182/514] Bot Updating Package Versions --- package_versions.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 6103e96..02652da 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -35,11 +35,11 @@ gzip1.10-0ubuntu4 hostname3.23 init-system-helpers1.57 intel-gmmlib21.1.3 -intel-igc-core1.0.7423 -intel-igc-opencl1.0.7423 -intel-level-zero-gpu1.1.20043 -intel-ocloc21.23.20043 -intel-opencl21.23.20043 +intel-igc-core1.0.7683 +intel-igc-opencl1.0.7683 +intel-level-zero-gpu1.1.20098 +intel-ocloc21.24.20098 +intel-opencl21.24.20098 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 From 588ca9e4eeb3b11c2e5f9619d0b81a9592137635 Mon Sep 17 00:00:00 2001 From: driz <40674481+drizuid@users.noreply.github.com> Date: Thu, 24 Jun 2021 22:22:06 -0400 Subject: [PATCH 183/514] Update readme-vars.yml remove bionic as a tag --- readme-vars.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/readme-vars.yml b/readme-vars.yml index efe9de6..04c3770 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -18,7 +18,6 @@ available_architectures: development_versions: true development_versions_items: - { tag: "latest", desc: "Stable releases with Focal baseimage" } - - { tag: "bionic", desc: "Stable releases with Bionic baseimage" } # container parameters common_param_env_vars_enabled: true #PGID, PUID, etc From 75b2de64273c2cf0e7966a2e003e2de8b7c1c543 Mon Sep 17 00:00:00 2001 From: driz <40674481+drizuid@users.noreply.github.com> Date: Thu, 24 Jun 2021 22:22:52 -0400 Subject: [PATCH 184/514] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 995e39e..4a8951f 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,6 @@ This image provides various versions that are available via tags. `latest` tag u | Tag | Description | | :----: | --- | | latest | Stable releases with Focal baseimage | -| bionic | Stable releases with Bionic baseimage | ## Application Setup From 861eb1fb833f20a5519c027519dead6ad714e5aa Mon Sep 17 00:00:00 2001 From: driz <40674481+drizuid@users.noreply.github.com> Date: Thu, 24 Jun 2021 22:30:27 -0400 Subject: [PATCH 185/514] Update readme-vars.yml --- readme-vars.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/readme-vars.yml b/readme-vars.yml index 04c3770..b38c13d 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -18,6 +18,7 @@ available_architectures: development_versions: true development_versions_items: - { tag: "latest", desc: "Stable releases with Focal baseimage" } + - { tag: "bionic", desc: "DEPRECATED - Stable releases with Bionic baseimage" } # container parameters common_param_env_vars_enabled: true #PGID, PUID, etc From 40f32406bf6845b6e7d24e01956ec35d8ef1191c Mon Sep 17 00:00:00 2001 From: driz <40674481+drizuid@users.noreply.github.com> Date: Thu, 24 Jun 2021 22:30:54 -0400 Subject: [PATCH 186/514] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 4a8951f..c0ab265 100644 --- a/README.md +++ b/README.md @@ -64,6 +64,7 @@ This image provides various versions that are available via tags. `latest` tag u | Tag | Description | | :----: | --- | | latest | Stable releases with Focal baseimage | +| bionic | DEPRECATED - Stable releases with Bionic baseimage | ## Application Setup From 6727e5dab63c0b557b0ab801358149108ceee6bb Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 5 Jul 2021 23:57:06 -0400 Subject: [PATCH 187/514] Bot Updating Templated Files --- Jenkinsfile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 449bd69..8cd8b9d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -57,7 +57,7 @@ pipeline { env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/' env.PULL_REQUEST = env.CHANGE_ID - env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.md ./.github/ISSUE_TEMPLATE/issue.feature.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml' + env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.md ./.github/ISSUE_TEMPLATE/issue.feature.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml' } script{ env.LS_RELEASE_NUMBER = sh( @@ -262,7 +262,6 @@ pipeline { git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} cd ${TEMPDIR}/repo/${LS_REPO} git checkout -f master - cd ${TEMPDIR}/docker-${CONTAINER_NAME} for i in ${TEMPLATES_TO_DELETE}; do git rm "${i}" done @@ -523,6 +522,15 @@ pipeline { apt list -qq --installed | sed "s#/.*now ##g" | cut -d" " -f1 > /tmp/package_versions.txt && \ sort -o /tmp/package_versions.txt /tmp/package_versions.txt && \ chmod 777 /tmp/package_versions.txt' + elif [ "${DIST_IMAGE}" == "fedora" ]; then + docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\ + rpm -qa > /tmp/package_versions.txt && \ + sort -o /tmp/package_versions.txt /tmp/package_versions.txt && \ + chmod 777 /tmp/package_versions.txt' + elif [ "${DIST_IMAGE}" == "arch" ]; then + docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\ + pacman -Q > /tmp/package_versions.txt && \ + chmod 777 /tmp/package_versions.txt' fi NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 ) echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github" From af322e83de8fdcc833a932df9f338bdfcba120fb Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 5 Jul 2021 23:58:06 -0400 Subject: [PATCH 188/514] Bot Updating Templated Files --- .editorconfig | 20 ++++++++++++++++++++ .github/CONTRIBUTING.md | 2 +- .github/PULL_REQUEST_TEMPLATE.md | 2 +- .github/workflows/stale.yml | 2 +- README.md | 7 ++----- 5 files changed, 25 insertions(+), 8 deletions(-) create mode 100755 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100755 index 0000000..a92f7df --- /dev/null +++ b/.editorconfig @@ -0,0 +1,20 @@ +# This file is globally distributed to all container image projects from +# https://github.com/linuxserver/docker-jenkins-builder/blob/master/.editorconfig + +# top-most EditorConfig file +root = true + +# Unix-style newlines with a newline ending every file +[*] +end_of_line = lf +insert_final_newline = true +# trim_trailing_whitespace may cause unintended issues and should not be globally set true +trim_trailing_whitespace = false + +[{Dockerfile*,**.yml}] +indent_style = space +indent_size = 2 + +[{**.sh,root/etc/cont-init.d/**,root/etc/services.d/**}] +indent_style = space +indent_size = 4 diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 2e7da93..4245cd8 100755 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -4,7 +4,7 @@ * While contributing make sure to make all your changes before creating a Pull Request, as our pipeline builds each commit after the PR is open. * Read, and fill the Pull Request template - * If this is a fix for a typo in code or documentation in the README please file an issue + * If this is a fix for a typo (in code, documentation, or the README) please file an issue and let us sort it out. We do not need a PR * If the PR is addressing an existing issue include, closes #\, in the body of the PR commit message * If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://discord.gg/YWrKVTn) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 6507b17..8ccdb75 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -6,7 +6,7 @@ - + diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 1806420..3b3846e 100755 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/stale@v1 + - uses: actions/stale@v3 with: stale-issue-message: "This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions." stale-pr-message: "This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions." diff --git a/README.md b/README.md index c0ab265..cd5e479 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,6 @@ Find us at: [![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-plex.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-plex/releases) [![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-plex/packages) [![GitLab Container Registry](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab)](https://gitlab.com/linuxserver.io/docker-plex/container_registry) -[![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/plex.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge)](https://microbadger.com/images/linuxserver/plex "Get your own version badge on microbadger.com") [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/plex.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/plex) [![Docker Stars](https://img.shields.io/docker/stars/linuxserver/plex.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/plex) [![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-plex%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-plex/job/master/) @@ -105,9 +104,7 @@ We automatically add the necessary environment variable that will utilise all th Here are some example snippets to help you get started creating a container. -### docker-compose ([recommended](https://docs.linuxserver.io/general/docker-compose)) - -Compatible with docker-compose v2 schemas. +### docker-compose (recommended, [click here for more info](https://docs.linuxserver.io/general/docker-compose)) ```yaml --- @@ -129,7 +126,7 @@ services: restart: unless-stopped ``` -### docker cli +### docker cli ([click here for more info](https://docs.docker.com/engine/reference/commandline/cli/)) ```bash docker run -d \ From 17017d5b72ca15e88e21162d199752ea763c7b40 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 6 Jul 2021 00:01:56 -0400 Subject: [PATCH 189/514] Bot Updating Package Versions --- package_versions.txt | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 02652da..8753b2f 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -19,7 +19,7 @@ dpkg1.19.7ubuntu3 e2fsprogs1.45.5-2ubuntu1 fdisk2.34-0.1ubuntu9.1 findutils4.7.0-1ubuntu1 -gcc-10-base10.2.0-5ubuntu1~20.04 +gcc-10-base10.3.0-1ubuntu1~20.04 gnupg2.2.19-3ubuntu2.1 gnupg-l10n2.2.19-3ubuntu2.1 gnupg-utils2.2.19-3ubuntu2.1 @@ -35,11 +35,11 @@ gzip1.10-0ubuntu4 hostname3.23 init-system-helpers1.57 intel-gmmlib21.1.3 -intel-igc-core1.0.7683 -intel-igc-opencl1.0.7683 -intel-level-zero-gpu1.1.20098 -intel-ocloc21.24.20098 -intel-opencl21.24.20098 +intel-igc-core1.0.7781 +intel-igc-opencl1.0.7781 +intel-level-zero-gpu1.1.20194 +intel-ocloc21.26.20194 +intel-opencl21.26.20194 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 @@ -67,7 +67,7 @@ libdrm-intel12.4.102-1ubuntu1~20.04.1 libext2fs21.45.5-2ubuntu1 libfdisk12.34-0.1ubuntu9.1 libffi73.3-4 -libgcc-s110.2.0-5ubuntu1~20.04 +libgcc-s110.3.0-1ubuntu1~20.04 libgcrypt201.8.5-5ubuntu1 libgmp102:6.2.0+dfsg-4 libgnutls303.6.13-2ubuntu1.3 @@ -77,7 +77,7 @@ libgssapi-krb5-21.17-6ubuntu4.1 libhcrypto4-heimdal7.7.0+dfsg-1ubuntu1 libheimbase1-heimdal7.7.0+dfsg-1ubuntu1 libheimntlm0-heimdal7.7.0+dfsg-1ubuntu1 -libhogweed53.5.1+really3.5.1-2ubuntu0.1 +libhogweed53.5.1+really3.5.1-2ubuntu0.2 libhx509-5-heimdal7.7.0+dfsg-1ubuntu1 libidn2-02.2.0-2 libjq11.6-1ubuntu0.20.04.1 @@ -95,7 +95,7 @@ liblzma55.2.4-1ubuntu1 libmount12.34-0.1ubuntu9.1 libncurses66.2-0ubuntu2 libncursesw66.2-0ubuntu2 -libnettle73.5.1+really3.5.1-2ubuntu0.1 +libnettle73.5.1+really3.5.1-2ubuntu0.2 libnghttp2-141.40.0-1build1 libnpth01.6-1 libonig56.9.4-1 @@ -107,7 +107,7 @@ libpam-runtime1.3.1-5ubuntu4.2 libpciaccess00.16-0ubuntu1 libpcre2-8-010.34-7 libpcre32:8.39-12build1 -libprocps82:3.3.16-1ubuntu2.1 +libprocps82:3.3.16-1ubuntu2.2 libpsl50.21.0-1ubuntu1 libreadline88.0-4 libroken18-heimdal7.7.0+dfsg-1ubuntu1 @@ -125,8 +125,8 @@ libsqlite3-03.31.1-4ubuntu0.2 libss21.45.5-2ubuntu1 libssh-40.9.3-2ubuntu2.1 libssl1.11.1.1f-1ubuntu2.4 -libstdc++610.2.0-5ubuntu1~20.04 -libsystemd0245.4-4ubuntu3.6 +libstdc++610.3.0-1ubuntu1~20.04 +libsystemd0245.4-4ubuntu3.7 libtasn1-64.16.0-2 libtinfo66.2-0ubuntu2 libudev1245.4-4ubuntu3.7 @@ -155,7 +155,7 @@ passwd1:4.8.1-1ubuntu5.20.04 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 plexmediaserver1.23.3.4707-ebb5fe9f3 -procps2:3.3.16-1ubuntu2.1 +procps2:3.3.16-1ubuntu2.2 publicsuffix20200303.0012-1 readline-common8.0-4 sed4.7-1 From 87130943a315506e3cfd41aa283ef01b293fc368 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 12 Jul 2021 17:11:17 +0000 Subject: [PATCH 190/514] Bot Updating Package Versions --- package_versions.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 8753b2f..dfa3ba1 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,6 +1,6 @@ adduser3.118ubuntu2 -apt2.0.5 -apt-utils2.0.5 +apt2.0.6 +apt-utils2.0.6 base-files11ubuntu5.3 base-passwd3.5.47 bash5.0-6ubuntu1.1 @@ -34,16 +34,16 @@ grep3.4-1 gzip1.10-0ubuntu4 hostname3.23 init-system-helpers1.57 -intel-gmmlib21.1.3 -intel-igc-core1.0.7781 -intel-igc-opencl1.0.7781 -intel-level-zero-gpu1.1.20194 -intel-ocloc21.26.20194 -intel-opencl21.26.20194 +intel-gmmlib21.2.1 +intel-igc-core1.0.7862 +intel-igc-opencl1.0.7862 +intel-level-zero-gpu1.1.20266 +intel-ocloc21.27.20266 +intel-opencl21.27.20266 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 -libapt-pkg6.02.0.5 +libapt-pkg6.02.0.6 libasn1-8-heimdal7.7.0+dfsg-1ubuntu1 libassuan02.5.3-7ubuntu2 libattr11:2.4.48-5 @@ -154,7 +154,7 @@ openssl1.1.1f-1ubuntu2.4 passwd1:4.8.1-1ubuntu5.20.04 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.23.3.4707-ebb5fe9f3 +plexmediaserver1.23.4.4805-186bae04e procps2:3.3.16-1ubuntu2.2 publicsuffix20200303.0012-1 readline-common8.0-4 From 961f93a33778432efac5af254ddfca90d86d0753 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 20 Jul 2021 05:58:33 +0200 Subject: [PATCH 191/514] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index dfa3ba1..e3c1706 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -37,9 +37,9 @@ init-system-helpers1.57 intel-gmmlib21.2.1 intel-igc-core1.0.7862 intel-igc-opencl1.0.7862 -intel-level-zero-gpu1.1.20266 -intel-ocloc21.27.20266 -intel-opencl21.27.20266 +intel-level-zero-gpu1.1.20343 +intel-ocloc21.28.20343 +intel-opencl21.28.20343 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 From 46b1af833441ba1ee0bec16779c74f88b7aa31a3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 20 Jul 2021 20:56:52 +0200 Subject: [PATCH 192/514] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index e3c1706..c305af7 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -129,7 +129,7 @@ libstdc++610.3.0-1ubuntu1~20.04 libsystemd0245.4-4ubuntu3.7 libtasn1-64.16.0-2 libtinfo66.2-0ubuntu2 -libudev1245.4-4ubuntu3.7 +libudev1245.4-4ubuntu3.10 libunistring20.9.10-2 libuuid12.34-0.1ubuntu9.1 libwind0-heimdal7.7.0+dfsg-1ubuntu1 @@ -154,7 +154,7 @@ openssl1.1.1f-1ubuntu2.4 passwd1:4.8.1-1ubuntu5.20.04 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.23.4.4805-186bae04e +plexmediaserver1.23.5.4841-549599676 procps2:3.3.16-1ubuntu2.2 publicsuffix20200303.0012-1 readline-common8.0-4 @@ -164,7 +164,7 @@ sysvinit-utils2.96-2.1ubuntu1 tar1.30+dfsg-7ubuntu0.20.04.1 tzdata2021a-0ubuntu0.20.04 ubuntu-keyring2020.02.11.4 -udev245.4-4ubuntu3.7 +udev245.4-4ubuntu3.10 unrar1:5.6.6-2build1 util-linux2.34-0.1ubuntu9.1 wget1.20.3-1ubuntu1 From 9d83314174f2203cf6edbbe5143d3d92677a9d71 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 23 Jul 2021 19:51:16 +0200 Subject: [PATCH 193/514] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index c305af7..f77e1e7 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -37,9 +37,9 @@ init-system-helpers1.57 intel-gmmlib21.2.1 intel-igc-core1.0.7862 intel-igc-opencl1.0.7862 -intel-level-zero-gpu1.1.20343 -intel-ocloc21.28.20343 -intel-opencl21.28.20343 +intel-level-zero-gpu1.1.20389 +intel-ocloc21.29.20389 +intel-opencl21.29.20389 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 @@ -129,7 +129,7 @@ libstdc++610.3.0-1ubuntu1~20.04 libsystemd0245.4-4ubuntu3.7 libtasn1-64.16.0-2 libtinfo66.2-0ubuntu2 -libudev1245.4-4ubuntu3.10 +libudev1245.4-4ubuntu3.11 libunistring20.9.10-2 libuuid12.34-0.1ubuntu9.1 libwind0-heimdal7.7.0+dfsg-1ubuntu1 @@ -154,7 +154,7 @@ openssl1.1.1f-1ubuntu2.4 passwd1:4.8.1-1ubuntu5.20.04 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.23.5.4841-549599676 +plexmediaserver1.23.5.4862-0f739d462 procps2:3.3.16-1ubuntu2.2 publicsuffix20200303.0012-1 readline-common8.0-4 @@ -164,7 +164,7 @@ sysvinit-utils2.96-2.1ubuntu1 tar1.30+dfsg-7ubuntu0.20.04.1 tzdata2021a-0ubuntu0.20.04 ubuntu-keyring2020.02.11.4 -udev245.4-4ubuntu3.10 +udev245.4-4ubuntu3.11 unrar1:5.6.6-2build1 util-linux2.34-0.1ubuntu9.1 wget1.20.3-1ubuntu1 From bbaed1533b84efbceb31a7f9e2bf504cc07dddba Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 30 Jul 2021 00:50:08 +0200 Subject: [PATCH 194/514] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index f77e1e7..9408e72 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -9,7 +9,7 @@ bsdutils1:2.34-0.1ubuntu9.1 bzip21.0.8-2 ca-certificates20210119~20.04.1 coreutils8.30-3ubuntu2 -curl7.68.0-1ubuntu2.5 +curl7.68.0-1ubuntu2.6 dash0.5.10.2-6 debconf1.5.73 debianutils4.9.1 @@ -58,7 +58,7 @@ libcap-ng00.7.9-2.1build1 libc-bin2.31-0ubuntu9.2 libcom-err21.45.5-2ubuntu1 libcrypt11:4.4.10-10ubuntu4 -libcurl47.68.0-1ubuntu2.5 +libcurl47.68.0-1ubuntu2.6 libdb5.35.3.28+dfsg1-0.6ubuntu2 libdebconfclient00.251ubuntu1 libdrm22.4.102-1ubuntu1~20.04.1 @@ -126,7 +126,7 @@ libss21.45.5-2ubuntu1 libssh-40.9.3-2ubuntu2.1 libssl1.11.1.1f-1ubuntu2.4 libstdc++610.3.0-1ubuntu1~20.04 -libsystemd0245.4-4ubuntu3.7 +libsystemd0245.4-4ubuntu3.10 libtasn1-64.16.0-2 libtinfo66.2-0ubuntu2 libudev1245.4-4ubuntu3.11 @@ -154,7 +154,7 @@ openssl1.1.1f-1ubuntu2.4 passwd1:4.8.1-1ubuntu5.20.04 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.23.5.4862-0f739d462 +plexmediaserver1.23.6.4881-e2e58f321 procps2:3.3.16-1ubuntu2.2 publicsuffix20200303.0012-1 readline-common8.0-4 From d100812daa1891689c1afffe9f36498ba74095c5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 3 Aug 2021 05:59:08 +0200 Subject: [PATCH 195/514] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 9408e72..123de82 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -37,9 +37,9 @@ init-system-helpers1.57 intel-gmmlib21.2.1 intel-igc-core1.0.7862 intel-igc-opencl1.0.7862 -intel-level-zero-gpu1.1.20389 -intel-ocloc21.29.20389 -intel-opencl21.29.20389 +intel-level-zero-gpu1.1.20482 +intel-ocloc21.30.20482 +intel-opencl21.30.20482 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 From dfc23625487cc5b7c839bb8678294454182dd405 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 10 Aug 2021 05:58:56 +0200 Subject: [PATCH 196/514] Bot Updating Package Versions --- package_versions.txt | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 123de82..47624dc 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -35,11 +35,11 @@ gzip1.10-0ubuntu4 hostname3.23 init-system-helpers1.57 intel-gmmlib21.2.1 -intel-igc-core1.0.7862 -intel-igc-opencl1.0.7862 -intel-level-zero-gpu1.1.20482 -intel-ocloc21.30.20482 -intel-opencl21.30.20482 +intel-igc-core1.0.8173 +intel-igc-opencl1.0.8173 +intel-level-zero-gpu1.1.20514 +intel-ocloc21.31.20514 +intel-opencl21.31.20514 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 @@ -61,16 +61,16 @@ libcrypt11:4.4.10-10ubuntu4 libcurl47.68.0-1ubuntu2.6 libdb5.35.3.28+dfsg1-0.6ubuntu2 libdebconfclient00.251ubuntu1 -libdrm22.4.102-1ubuntu1~20.04.1 -libdrm-common2.4.102-1ubuntu1~20.04.1 -libdrm-intel12.4.102-1ubuntu1~20.04.1 +libdrm22.4.105-3~20.04.1 +libdrm-common2.4.105-3~20.04.1 +libdrm-intel12.4.105-3~20.04.1 libext2fs21.45.5-2ubuntu1 libfdisk12.34-0.1ubuntu9.1 libffi73.3-4 libgcc-s110.3.0-1ubuntu1~20.04 libgcrypt201.8.5-5ubuntu1 libgmp102:6.2.0+dfsg-4 -libgnutls303.6.13-2ubuntu1.3 +libgnutls303.6.13-2ubuntu1.6 libgpg-error01.37-1 libgssapi3-heimdal7.7.0+dfsg-1ubuntu1 libgssapi-krb5-21.17-6ubuntu4.1 @@ -126,7 +126,7 @@ libss21.45.5-2ubuntu1 libssh-40.9.3-2ubuntu2.1 libssl1.11.1.1f-1ubuntu2.4 libstdc++610.3.0-1ubuntu1~20.04 -libsystemd0245.4-4ubuntu3.10 +libsystemd0245.4-4ubuntu3.11 libtasn1-64.16.0-2 libtinfo66.2-0ubuntu2 libudev1245.4-4ubuntu3.11 @@ -142,7 +142,7 @@ libxext62:1.3.4-0ubuntu1 libxfixes31:5.0.3-2 libzstd11.4.4+dfsg-3ubuntu0.1 locales2.31-0ubuntu9.2 -login1:4.8.1-1ubuntu5.20.04 +login1:4.8.1-1ubuntu5.20.04.1 logsave1.45.5-2ubuntu1 lsb-base11.1.0ubuntu2 mawk1.3.4.20200120-2 @@ -151,7 +151,7 @@ ncurses-base6.2-0ubuntu2 ncurses-bin6.2-0ubuntu2 ocl-icd-libopencl12.2.11-1ubuntu1 openssl1.1.1f-1ubuntu2.4 -passwd1:4.8.1-1ubuntu5.20.04 +passwd1:4.8.1-1ubuntu5.20.04.1 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 plexmediaserver1.23.6.4881-e2e58f321 From e8aaaaefd3f6791eda61f07dc5450628199779ae Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 12 Aug 2021 10:50:16 +0200 Subject: [PATCH 197/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 47624dc..e77417a 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -154,7 +154,7 @@ openssl1.1.1f-1ubuntu2.4 passwd1:4.8.1-1ubuntu5.20.04.1 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.23.6.4881-e2e58f321 +plexmediaserver1.24.0.4930-ab6e1a058 procps2:3.3.16-1ubuntu2.2 publicsuffix20200303.0012-1 readline-common8.0-4 From 002a4dd38c942ec7c6713ff142b365231f65d086 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 17 Aug 2021 05:58:42 +0200 Subject: [PATCH 198/514] Bot Updating Package Versions --- package_versions.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index e77417a..a01e61d 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -35,11 +35,11 @@ gzip1.10-0ubuntu4 hostname3.23 init-system-helpers1.57 intel-gmmlib21.2.1 -intel-igc-core1.0.8173 -intel-igc-opencl1.0.8173 -intel-level-zero-gpu1.1.20514 -intel-ocloc21.31.20514 -intel-opencl21.31.20514 +intel-igc-core1.0.8279 +intel-igc-opencl1.0.8279 +intel-level-zero-gpu1.1.20609 +intel-ocloc21.32.20609 +intel-opencl21.32.20609 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 From 5f4ed7aa9105e57a1ff67cc50a997ebad9f07f24 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 23 Aug 2021 19:06:19 +0200 Subject: [PATCH 199/514] Bot Updating Package Versions --- package_versions.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index a01e61d..3db1a0e 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -35,11 +35,11 @@ gzip1.10-0ubuntu4 hostname3.23 init-system-helpers1.57 intel-gmmlib21.2.1 -intel-igc-core1.0.8279 -intel-igc-opencl1.0.8279 -intel-level-zero-gpu1.1.20609 -intel-ocloc21.32.20609 -intel-opencl21.32.20609 +intel-igc-core1.0.8365 +intel-igc-opencl1.0.8365 +intel-level-zero-gpu1.1.20678 +intel-ocloc21.33.20678 +intel-opencl21.33.20678 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 @@ -124,7 +124,7 @@ libsmartcols12.34-0.1ubuntu9.1 libsqlite3-03.31.1-4ubuntu0.2 libss21.45.5-2ubuntu1 libssh-40.9.3-2ubuntu2.1 -libssl1.11.1.1f-1ubuntu2.4 +libssl1.11.1.1f-1ubuntu2.5 libstdc++610.3.0-1ubuntu1~20.04 libsystemd0245.4-4ubuntu3.11 libtasn1-64.16.0-2 @@ -150,11 +150,11 @@ mount2.34-0.1ubuntu9.1 ncurses-base6.2-0ubuntu2 ncurses-bin6.2-0ubuntu2 ocl-icd-libopencl12.2.11-1ubuntu1 -openssl1.1.1f-1ubuntu2.4 +openssl1.1.1f-1ubuntu2.5 passwd1:4.8.1-1ubuntu5.20.04.1 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.24.0.4930-ab6e1a058 +plexmediaserver1.24.1.4931-1a38e63c6 procps2:3.3.16-1ubuntu2.2 publicsuffix20200303.0012-1 readline-common8.0-4 From 5669824db8d9588c2dbd637b4a3ee8f4570bb65d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 31 Aug 2021 05:57:03 +0200 Subject: [PATCH 200/514] Bot Updating Templated Files --- Jenkinsfile | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8cd8b9d..6783a49 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -377,7 +377,9 @@ pipeline { // Build Docker container for push to LS Repo stage('Build-Single') { when { - environment name: 'MULTIARCH', value: 'false' + expression { + env.MULTIARCH == 'false' || params.PACKAGE_CHECK == 'true' + } environment name: 'EXIT_STATUS', value: '' } steps { @@ -402,7 +404,10 @@ pipeline { // Build MultiArch Docker containers for push to LS Repo stage('Build-Multi') { when { - environment name: 'MULTIARCH', value: 'true' + allOf { + environment name: 'MULTIARCH', value: 'true' + expression { params.PACKAGE_CHECK == 'false' } + } environment name: 'EXIT_STATUS', value: '' } parallel { @@ -507,7 +512,7 @@ pipeline { sh '''#! /bin/bash set -e TEMPDIR=$(mktemp -d) - if [ "${MULTIARCH}" == "true" ]; then + if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then LOCAL_CONTAINER=${IMAGE}:amd64-${META_TAG} else LOCAL_CONTAINER=${IMAGE}:${META_TAG} @@ -568,7 +573,7 @@ pipeline { steps { sh '''#! /bin/bash echo "Packages were updated. Cleaning up the image and exiting." - if [ "${MULTIARCH}" == "true" ]; then + if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then docker rmi ${IMAGE}:amd64-${META_TAG} else docker rmi ${IMAGE}:${META_TAG} @@ -592,7 +597,7 @@ pipeline { steps { sh '''#! /bin/bash echo "There are no package updates. Cleaning up the image and exiting." - if [ "${MULTIARCH}" == "true" ]; then + if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then docker rmi ${IMAGE}:amd64-${META_TAG} else docker rmi ${IMAGE}:${META_TAG} From f80c24732781387480c83945ba7f11ca4d592a52 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 31 Aug 2021 05:59:36 +0200 Subject: [PATCH 201/514] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 3db1a0e..7262f54 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,7 +1,7 @@ adduser3.118ubuntu2 apt2.0.6 apt-utils2.0.6 -base-files11ubuntu5.3 +base-files11ubuntu5.4 base-passwd3.5.47 bash5.0-6ubuntu1.1 beignet-opencl-icd1.3.2-7build1 @@ -37,9 +37,9 @@ init-system-helpers1.57 intel-gmmlib21.2.1 intel-igc-core1.0.8365 intel-igc-opencl1.0.8365 -intel-level-zero-gpu1.1.20678 -intel-ocloc21.33.20678 -intel-opencl21.33.20678 +intel-level-zero-gpu1.1.20767 +intel-ocloc21.34.20767 +intel-opencl21.34.20767 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 From 82a07dcd63f2d2950b4427fefe258f6653eee2a6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 7 Sep 2021 05:57:56 +0200 Subject: [PATCH 202/514] Bot Updating Package Versions --- package_versions.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 7262f54..954f693 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -35,11 +35,11 @@ gzip1.10-0ubuntu4 hostname3.23 init-system-helpers1.57 intel-gmmlib21.2.1 -intel-igc-core1.0.8365 -intel-igc-opencl1.0.8365 -intel-level-zero-gpu1.1.20767 -intel-ocloc21.34.20767 -intel-opencl21.34.20767 +intel-igc-core1.0.8517 +intel-igc-opencl1.0.8517 +intel-level-zero-gpu1.2.20826 +intel-ocloc21.35.20826 +intel-opencl21.35.20826 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 @@ -123,8 +123,8 @@ libsepol13.0-1 libsmartcols12.34-0.1ubuntu9.1 libsqlite3-03.31.1-4ubuntu0.2 libss21.45.5-2ubuntu1 -libssh-40.9.3-2ubuntu2.1 -libssl1.11.1.1f-1ubuntu2.5 +libssh-40.9.3-2ubuntu2.2 +libssl1.11.1.1f-1ubuntu2.8 libstdc++610.3.0-1ubuntu1~20.04 libsystemd0245.4-4ubuntu3.11 libtasn1-64.16.0-2 @@ -150,7 +150,7 @@ mount2.34-0.1ubuntu9.1 ncurses-base6.2-0ubuntu2 ncurses-bin6.2-0ubuntu2 ocl-icd-libopencl12.2.11-1ubuntu1 -openssl1.1.1f-1ubuntu2.5 +openssl1.1.1f-1ubuntu2.8 passwd1:4.8.1-1ubuntu5.20.04.1 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 From 4a4213fa8dae2bcfe3a13fbfbfd38aa1751424ba Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 8 Sep 2021 23:49:49 +0200 Subject: [PATCH 203/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 954f693..e9022a4 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -154,7 +154,7 @@ openssl1.1.1f-1ubuntu2.8 passwd1:4.8.1-1ubuntu5.20.04.1 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.24.1.4931-1a38e63c6 +plexmediaserver1.24.2.4973-2b1b51db9 procps2:3.3.16-1ubuntu2.2 publicsuffix20200303.0012-1 readline-common8.0-4 From 2aee3ca612b1eeaf8b4a94e624031f93afcb4153 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 14 Sep 2021 05:58:23 +0200 Subject: [PATCH 204/514] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index e9022a4..e18edc5 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -37,9 +37,9 @@ init-system-helpers1.57 intel-gmmlib21.2.1 intel-igc-core1.0.8517 intel-igc-opencl1.0.8517 -intel-level-zero-gpu1.2.20826 -intel-ocloc21.35.20826 -intel-opencl21.35.20826 +intel-level-zero-gpu1.2.20889 +intel-ocloc21.36.20889 +intel-opencl21.36.20889 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 From 57231c20698173e157f4a38fd831edee8bee49b6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 20 Sep 2021 19:01:57 +0200 Subject: [PATCH 205/514] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index e18edc5..005e9a0 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -37,9 +37,9 @@ init-system-helpers1.57 intel-gmmlib21.2.1 intel-igc-core1.0.8517 intel-igc-opencl1.0.8517 -intel-level-zero-gpu1.2.20889 -intel-ocloc21.36.20889 -intel-opencl21.36.20889 +intel-level-zero-gpu1.2.20939 +intel-ocloc21.37.20939 +intel-opencl21.37.20939 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 @@ -129,7 +129,7 @@ libstdc++610.3.0-1ubuntu1~20.04 libsystemd0245.4-4ubuntu3.11 libtasn1-64.16.0-2 libtinfo66.2-0ubuntu2 -libudev1245.4-4ubuntu3.11 +libudev1245.4-4ubuntu3.13 libunistring20.9.10-2 libuuid12.34-0.1ubuntu9.1 libwind0-heimdal7.7.0+dfsg-1ubuntu1 @@ -154,7 +154,7 @@ openssl1.1.1f-1ubuntu2.8 passwd1:4.8.1-1ubuntu5.20.04.1 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.24.2.4973-2b1b51db9 +plexmediaserver1.24.3.5033-757abe6b4 procps2:3.3.16-1ubuntu2.2 publicsuffix20200303.0012-1 readline-common8.0-4 @@ -164,7 +164,7 @@ sysvinit-utils2.96-2.1ubuntu1 tar1.30+dfsg-7ubuntu0.20.04.1 tzdata2021a-0ubuntu0.20.04 ubuntu-keyring2020.02.11.4 -udev245.4-4ubuntu3.11 +udev245.4-4ubuntu3.13 unrar1:5.6.6-2build1 util-linux2.34-0.1ubuntu9.1 wget1.20.3-1ubuntu1 From 7f6e08ef13287e8ba33009e9ec473c6e86917a3c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 28 Sep 2021 05:57:53 +0200 Subject: [PATCH 206/514] Bot Updating Package Versions --- package_versions.txt | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 005e9a0..94f59ef 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -9,7 +9,7 @@ bsdutils1:2.34-0.1ubuntu9.1 bzip21.0.8-2 ca-certificates20210119~20.04.1 coreutils8.30-3ubuntu2 -curl7.68.0-1ubuntu2.6 +curl7.68.0-1ubuntu2.7 dash0.5.10.2-6 debconf1.5.73 debianutils4.9.1 @@ -35,11 +35,11 @@ gzip1.10-0ubuntu4 hostname3.23 init-system-helpers1.57 intel-gmmlib21.2.1 -intel-igc-core1.0.8517 -intel-igc-opencl1.0.8517 -intel-level-zero-gpu1.2.20939 -intel-ocloc21.37.20939 -intel-opencl21.37.20939 +intel-igc-core1.0.8708 +intel-igc-opencl1.0.8708 +intel-level-zero-gpu1.2.21026 +intel-ocloc21.38.21026 +intel-opencl21.38.21026 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 @@ -58,17 +58,17 @@ libcap-ng00.7.9-2.1build1 libc-bin2.31-0ubuntu9.2 libcom-err21.45.5-2ubuntu1 libcrypt11:4.4.10-10ubuntu4 -libcurl47.68.0-1ubuntu2.6 +libcurl47.68.0-1ubuntu2.7 libdb5.35.3.28+dfsg1-0.6ubuntu2 libdebconfclient00.251ubuntu1 -libdrm22.4.105-3~20.04.1 -libdrm-common2.4.105-3~20.04.1 -libdrm-intel12.4.105-3~20.04.1 +libdrm22.4.105-3~20.04.2 +libdrm-common2.4.105-3~20.04.2 +libdrm-intel12.4.105-3~20.04.2 libext2fs21.45.5-2ubuntu1 libfdisk12.34-0.1ubuntu9.1 libffi73.3-4 libgcc-s110.3.0-1ubuntu1~20.04 -libgcrypt201.8.5-5ubuntu1 +libgcrypt201.8.5-5ubuntu1.1 libgmp102:6.2.0+dfsg-4 libgnutls303.6.13-2ubuntu1.6 libgpg-error01.37-1 @@ -126,7 +126,7 @@ libss21.45.5-2ubuntu1 libssh-40.9.3-2ubuntu2.2 libssl1.11.1.1f-1ubuntu2.8 libstdc++610.3.0-1ubuntu1~20.04 -libsystemd0245.4-4ubuntu3.11 +libsystemd0245.4-4ubuntu3.13 libtasn1-64.16.0-2 libtinfo66.2-0ubuntu2 libudev1245.4-4ubuntu3.13 From 3b3800d86c8c95ae1b64cac066a4944f25ec19e4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 5 Oct 2021 05:57:20 +0200 Subject: [PATCH 207/514] Bot Updating Templated Files --- Jenkinsfile | 108 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 101 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6783a49..3fc7768 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,6 +16,7 @@ pipeline { GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab') GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0') GITLAB_NAMESPACE=credentials('gitlab-namespace-id') + SCARF_TOKEN=credentials('scarf_api_key') JSON_URL = 'https://plex.tv/api/downloads/5.json' JSON_PATH = '.computer.Linux.version' BUILD_VERSION_ARG = 'PLEX_RELEASE' @@ -118,6 +119,23 @@ pipeline { env.EXT_RELEASE_CLEAN = sh( script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g' ''', returnStdout: true).trim() + + env.SEMVER = (new Date()).format('YYYY.MM.dd') + def semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)\.(\d+)$/ + if (semver.find()) { + env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${semver[0][3]}" + } else { + semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)(?:\.(\d+))?(.*)$/ + if (semver.find()) { + if (semver[0][3]) { + env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${semver[0][3]}" + } else if (!semver[0][3] && !semver[0][4]) { + env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${(new Date()).format('YYYYMMdd')}" + } + } + } + + println("SEMVER: ${env.SEMVER}") } } } @@ -132,6 +150,7 @@ pipeline { env.IMAGE = env.DOCKERHUB_IMAGE env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/' + env.CONTAINER_NAME env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME + env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER } else { @@ -154,6 +173,7 @@ pipeline { env.IMAGE = env.DEV_DOCKERHUB_IMAGE env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/lsiodev-' + env.CONTAINER_NAME env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME + env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA } else { @@ -176,6 +196,7 @@ pipeline { env.IMAGE = env.PR_DOCKERHUB_IMAGE env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/lspipepr-' + env.CONTAINER_NAME env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME + env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST } else { @@ -371,6 +392,48 @@ pipeline { "visibility":"public"}' ''' } } + /* ####################### + Scarf.sh package registry + ####################### */ + // Add package to Scarf.sh and set permissions + stage("Scarf.sh package registry"){ + when { + branch "master" + environment name: 'EXIT_STATUS', value: '' + } + steps{ + sh '''#! /bin/bash + set -e + PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/packages | jq -r '.[] | select(.name=="linuxserver/plex") | .uuid') + if [ -z "${PACKAGE_UUID}" ]; then + echo "Adding package to Scarf.sh" + PACKAGE_UUID=$(curl -sX POST https://scarf.sh/api/v1/packages \ + -H "Authorization: Bearer ${SCARF_TOKEN}" \ + -H "Content-Type: application/json" \ + -d '{"name":"linuxserver/plex",\ + "shortDescription":"example description",\ + "libraryType":"docker",\ + "website":"https://github.com/linuxserver/docker-plex",\ + "backendUrl":"https://ghcr.io/linuxserver/plex",\ + "publicUrl":"https://lscr.io/linuxserver/plex"}' \ + | jq -r .uuid) + else + echo "Package already exists on Scarf.sh" + fi + echo "Setting permissions on Scarf.sh for package ${PACKAGE_UUID}" + curl -X POST https://scarf.sh/api/v1/packages/${PACKAGE_UUID}/permissions \ + -H "Authorization: Bearer ${SCARF_TOKEN}" \ + -H "Content-Type: application/json" \ + -d '[{"userQuery":"Spad","permissionLevel":"admin"},\ + {"userQuery":"roxedus","permissionLevel":"admin"},\ + {"userQuery":"nemchik","permissionLevel":"admin"},\ + {"userQuery":"driz","permissionLevel":"admin"},\ + {"userQuery":"aptalca","permissionLevel":"admin"},\ + {"userQuery":"saarg","permissionLevel":"admin"},\ + {"userQuery":"Stark","permissionLevel":"admin"}]' + ''' + } + } /* ############### Build Container ############### */ @@ -378,7 +441,7 @@ pipeline { stage('Build-Single') { when { expression { - env.MULTIARCH == 'false' || params.PACKAGE_CHECK == 'true' + env.MULTIARCH == 'false' || params.PACKAGE_CHECK == 'true' } environment name: 'EXIT_STATUS', value: '' } @@ -672,6 +735,12 @@ pipeline { credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', usernameVariable: 'DOCKERUSER', passwordVariable: 'DOCKERPASS' + ], + [ + $class: 'UsernamePasswordMultiBinding', + credentialsId: 'Quay.io-Robot', + usernameVariable: 'QUAYUSER', + passwordVariable: 'QUAYPASS' ] ]) { retry(5) { @@ -680,22 +749,26 @@ pipeline { echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin - for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do + echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin + for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG} docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG} + docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER} docker push ${PUSHIMAGE}:latest docker push ${PUSHIMAGE}:${META_TAG} docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG} + docker push ${PUSHIMAGE}:${SEMVER} done ''' } sh '''#! /bin/bash - for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do + for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do docker rmi \ ${DELETEIMAGE}:${META_TAG} \ ${DELETEIMAGE}:${EXT_RELEASE_TAG} \ - ${DELETEIMAGE}:latest || : + ${DELETEIMAGE}:latest \ + ${DELETEIMAGE}:${SEMVER} || : done ''' } @@ -714,6 +787,12 @@ pipeline { credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', usernameVariable: 'DOCKERUSER', passwordVariable: 'DOCKERPASS' + ], + [ + $class: 'UsernamePasswordMultiBinding', + credentialsId: 'Quay.io-Robot', + usernameVariable: 'QUAYUSER', + passwordVariable: 'QUAYPASS' ] ]) { retry(5) { @@ -722,13 +801,14 @@ pipeline { echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin + echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin if [ "${CI}" == "false" ]; then docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG} docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} fi - for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}"; do + for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} @@ -738,6 +818,9 @@ pipeline { docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} + docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER} + docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER} + docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER} docker push ${MANIFESTIMAGE}:amd64-${META_TAG} docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG} docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} @@ -747,6 +830,9 @@ pipeline { docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} + docker push ${MANIFESTIMAGE}:amd64-${SEMVER} + docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER} + docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER} docker manifest push --purge ${MANIFESTIMAGE}:latest || : docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm @@ -759,24 +845,32 @@ pipeline { docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8 + docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || : + docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} + docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm + docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8 docker manifest push --purge ${MANIFESTIMAGE}:latest docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} + docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} done ''' } sh '''#! /bin/bash - for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do + for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do docker rmi \ ${DELETEIMAGE}:amd64-${META_TAG} \ ${DELETEIMAGE}:amd64-latest \ ${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \ + ${DELETEIMAGE}:amd64-${SEMVER} \ ${DELETEIMAGE}:arm32v7-${META_TAG} \ ${DELETEIMAGE}:arm32v7-latest \ ${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \ + ${DELETEIMAGE}:arm32v7-${SEMVER} \ ${DELETEIMAGE}:arm64v8-${META_TAG} \ ${DELETEIMAGE}:arm64v8-latest \ - ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || : + ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} \ + ${DELETEIMAGE}:arm64v8-${SEMVER} || : done docker rmi \ ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \ From b0ace02400d0df6dd54d2fbb4aaaae845a0747b5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 5 Oct 2021 05:58:35 +0200 Subject: [PATCH 208/514] Bot Updating Templated Files --- README.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index cd5e479..1feb878 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,7 @@ Find us at: [![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-plex.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-plex/releases) [![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-plex/packages) [![GitLab Container Registry](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab)](https://gitlab.com/linuxserver.io/docker-plex/container_registry) +[![Quay.io](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Quay.io)](https://quay.io/repository/linuxserver.io/plex) [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/plex.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/plex) [![Docker Stars](https://img.shields.io/docker/stars/linuxserver/plex.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/plex) [![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-plex%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-plex/job/master/) @@ -46,7 +47,7 @@ Find us at: Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/). -Simply pulling `ghcr.io/linuxserver/plex` should retrieve the correct image for your arch, but you can also pull specific arch images via tags. +Simply pulling `lscr.io/linuxserver/plex` should retrieve the correct image for your arch, but you can also pull specific arch images via tags. The architectures supported by this image are: @@ -111,7 +112,7 @@ Here are some example snippets to help you get started creating a container. version: "2.1" services: plex: - image: ghcr.io/linuxserver/plex + image: lscr.io/linuxserver/plex container_name: plex network_mode: host environment: @@ -140,7 +141,7 @@ docker run -d \ -v /path/to/tvseries:/tv \ -v /path/to/movies:/movies \ --restart unless-stopped \ - ghcr.io/linuxserver/plex + lscr.io/linuxserver/plex ``` ## Parameters @@ -229,7 +230,7 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to * container version number * `docker inspect -f '{{ index .Config.Labels "build_version" }}' plex` * image version number - * `docker inspect -f '{{ index .Config.Labels "build_version" }}' ghcr.io/linuxserver/plex` + * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/plex` ## Updating Info @@ -247,7 +248,7 @@ Below are the instructions for updating containers: ### Via Docker Run -* Update the image: `docker pull ghcr.io/linuxserver/plex` +* Update the image: `docker pull lscr.io/linuxserver/plex` * Stop the running container: `docker stop plex` * Delete the container: `docker rm plex` * Recreate a new container with the same docker run parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved) @@ -282,7 +283,7 @@ cd docker-plex docker build \ --no-cache \ --pull \ - -t ghcr.io/linuxserver/plex:latest . + -t lscr.io/linuxserver/plex:latest . ``` The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static` From 7bef9b4b7f1dcf7286ccd1b5edc4ef69eb3822b4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 5 Oct 2021 06:03:19 +0200 Subject: [PATCH 209/514] Bot Updating Package Versions --- package_versions.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 94f59ef..e3d3439 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -7,7 +7,7 @@ bash5.0-6ubuntu1.1 beignet-opencl-icd1.3.2-7build1 bsdutils1:2.34-0.1ubuntu9.1 bzip21.0.8-2 -ca-certificates20210119~20.04.1 +ca-certificates20210119~20.04.2 coreutils8.30-3ubuntu2 curl7.68.0-1ubuntu2.7 dash0.5.10.2-6 @@ -35,11 +35,11 @@ gzip1.10-0ubuntu4 hostname3.23 init-system-helpers1.57 intel-gmmlib21.2.1 -intel-igc-core1.0.8708 -intel-igc-opencl1.0.8708 -intel-level-zero-gpu1.2.21026 -intel-ocloc21.38.21026 -intel-opencl21.38.21026 +intel-igc-core1.0.8744 +intel-igc-opencl1.0.8744 +intel-level-zero-gpu1.2.21127 +intel-ocloc21.39.21127 +intel-opencl21.39.21127 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 @@ -107,7 +107,7 @@ libpam-runtime1.3.1-5ubuntu4.2 libpciaccess00.16-0ubuntu1 libpcre2-8-010.34-7 libpcre32:8.39-12build1 -libprocps82:3.3.16-1ubuntu2.2 +libprocps82:3.3.16-1ubuntu2.3 libpsl50.21.0-1ubuntu1 libreadline88.0-4 libroken18-heimdal7.7.0+dfsg-1ubuntu1 @@ -155,7 +155,7 @@ passwd1:4.8.1-1ubuntu5.20.04.1 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 plexmediaserver1.24.3.5033-757abe6b4 -procps2:3.3.16-1ubuntu2.2 +procps2:3.3.16-1ubuntu2.3 publicsuffix20200303.0012-1 readline-common8.0-4 sed4.7-1 From 48eda9ffd6d5104cd7d3817e7ba32c65c5208e3b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 12 Oct 2021 05:58:10 +0200 Subject: [PATCH 210/514] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index e3d3439..97f383b 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -37,9 +37,9 @@ init-system-helpers1.57 intel-gmmlib21.2.1 intel-igc-core1.0.8744 intel-igc-opencl1.0.8744 -intel-level-zero-gpu1.2.21127 -intel-ocloc21.39.21127 -intel-opencl21.39.21127 +intel-level-zero-gpu1.2.21182 +intel-ocloc21.40.21182 +intel-opencl21.40.21182 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 From eb3fca875d9065e17a3a869c26b4963d3e9a0edb Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 13 Oct 2021 00:49:37 +0200 Subject: [PATCH 211/514] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 97f383b..fbd641e 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -154,7 +154,7 @@ openssl1.1.1f-1ubuntu2.8 passwd1:4.8.1-1ubuntu5.20.04.1 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.24.3.5033-757abe6b4 +plexmediaserver1.24.4.5081-e362dc1ee procps2:3.3.16-1ubuntu2.3 publicsuffix20200303.0012-1 readline-common8.0-4 @@ -162,7 +162,7 @@ sed4.7-1 sensible-utils0.0.12+nmu1 sysvinit-utils2.96-2.1ubuntu1 tar1.30+dfsg-7ubuntu0.20.04.1 -tzdata2021a-0ubuntu0.20.04 +tzdata2021a-2ubuntu0.20.04 ubuntu-keyring2020.02.11.4 udev245.4-4ubuntu3.13 unrar1:5.6.6-2build1 From 4db14e9e4c901ea7fd9421995adc7d69fea6b0a0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 19 Oct 2021 05:58:23 +0200 Subject: [PATCH 212/514] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index fbd641e..c486be2 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -37,9 +37,9 @@ init-system-helpers1.57 intel-gmmlib21.2.1 intel-igc-core1.0.8744 intel-igc-opencl1.0.8744 -intel-level-zero-gpu1.2.21182 -intel-ocloc21.40.21182 -intel-opencl21.40.21182 +intel-level-zero-gpu1.2.21220 +intel-ocloc21.41.21220 +intel-opencl21.41.21220 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 From b62bb6e803967c34c9b879aa1bfd0d77743e7f43 Mon Sep 17 00:00:00 2001 From: Colby Rome Date: Sun, 24 Oct 2021 22:33:46 -0400 Subject: [PATCH 213/514] Fix Plex readme. Although rendering properly on Github, the line "--device=/dev/dri:/dev/dri" is not valid markdown and is not rendered correctly on the linuxserver.io site: see https://docs.linuxserver.io/images/docker-plex#intel (the formatting is all messed up). This fixes the markdown. --- readme-vars.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/readme-vars.yml b/readme-vars.yml index b38c13d..5092cf2 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -91,7 +91,9 @@ app_setup_block: | Hardware acceleration users for Intel Quicksync will need to mount their /dev/dri video device inside of the container by passing the following command when running or creating the container: - ```--device=/dev/dri:/dev/dri``` + ``` + --device=/dev/dri:/dev/dri + ``` We will automatically ensure the abc user inside of the container has the proper permissions to access this device. From 8a8d9c2330813618291220ec17c51a617bd852fb Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 26 Oct 2021 05:58:14 +0200 Subject: [PATCH 214/514] Bot Updating Package Versions --- package_versions.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index c486be2..8a57ca4 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -37,9 +37,8 @@ init-system-helpers1.57 intel-gmmlib21.2.1 intel-igc-core1.0.8744 intel-igc-opencl1.0.8744 -intel-level-zero-gpu1.2.21220 -intel-ocloc21.41.21220 -intel-opencl21.41.21220 +intel-level-zero-gpu1.2.021270 +intel-opencl-icd21.42.021270 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 From 6f2a6d0422d226debcdb00f80edd37205d7b334a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 26 Oct 2021 08:44:47 +0200 Subject: [PATCH 215/514] Bot Updating Templated Files --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 1feb878..8bbd79c 100644 --- a/README.md +++ b/README.md @@ -89,7 +89,9 @@ Valid settings for VERSION are:- Hardware acceleration users for Intel Quicksync will need to mount their /dev/dri video device inside of the container by passing the following command when running or creating the container: -```--device=/dev/dri:/dev/dri``` +``` +--device=/dev/dri:/dev/dri +``` We will automatically ensure the abc user inside of the container has the proper permissions to access this device. From 012e7c9d64eae3409cf5ac1b62e7b614ca94022d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 27 Oct 2021 15:07:12 +0200 Subject: [PATCH 216/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 8a57ca4..037e7d3 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -153,7 +153,7 @@ openssl1.1.1f-1ubuntu2.8 passwd1:4.8.1-1ubuntu5.20.04.1 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.24.4.5081-e362dc1ee +plexmediaserver1.24.5.5173-8dcc73a59 procps2:3.3.16-1ubuntu2.3 publicsuffix20200303.0012-1 readline-common8.0-4 From 81bcc01207820842b5fa14cdfbb566c32de12c48 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 2 Nov 2021 04:58:05 +0100 Subject: [PATCH 217/514] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 037e7d3..23fa9a8 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -37,8 +37,8 @@ init-system-helpers1.57 intel-gmmlib21.2.1 intel-igc-core1.0.8744 intel-igc-opencl1.0.8744 -intel-level-zero-gpu1.2.021270 -intel-opencl-icd21.42.021270 +intel-level-zero-gpu1.2.021438 +intel-opencl-icd21.43.021438 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 From 53aff94c5bc687678f0ddacb6b9839d8a81217ad Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 9 Nov 2021 04:59:30 +0100 Subject: [PATCH 218/514] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 23fa9a8..775591c 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -37,8 +37,8 @@ init-system-helpers1.57 intel-gmmlib21.2.1 intel-igc-core1.0.8744 intel-igc-opencl1.0.8744 -intel-level-zero-gpu1.2.021438 -intel-opencl-icd21.43.021438 +intel-level-zero-gpu1.2.21506 +intel-opencl-icd21.44.21506 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 @@ -161,7 +161,7 @@ sed4.7-1 sensible-utils0.0.12+nmu1 sysvinit-utils2.96-2.1ubuntu1 tar1.30+dfsg-7ubuntu0.20.04.1 -tzdata2021a-2ubuntu0.20.04 +tzdata2021e-0ubuntu0.20.04 ubuntu-keyring2020.02.11.4 udev245.4-4ubuntu3.13 unrar1:5.6.6-2build1 From 41499b4af55c99aed8f791b37060744eed279b8b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 16 Nov 2021 04:58:16 +0100 Subject: [PATCH 219/514] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 775591c..00c057f 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -37,8 +37,8 @@ init-system-helpers1.57 intel-gmmlib21.2.1 intel-igc-core1.0.8744 intel-igc-opencl1.0.8744 -intel-level-zero-gpu1.2.21506 -intel-opencl-icd21.44.21506 +intel-level-zero-gpu1.2.21574 +intel-opencl-icd21.45.21574 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 @@ -99,10 +99,10 @@ libnghttp2-141.40.0-1build1 libnpth01.6-1 libonig56.9.4-1 libp11-kit00.23.20-1ubuntu0.1 -libpam0g1.3.1-5ubuntu4.2 -libpam-modules1.3.1-5ubuntu4.2 -libpam-modules-bin1.3.1-5ubuntu4.2 -libpam-runtime1.3.1-5ubuntu4.2 +libpam0g1.3.1-5ubuntu4.3 +libpam-modules1.3.1-5ubuntu4.3 +libpam-modules-bin1.3.1-5ubuntu4.3 +libpam-runtime1.3.1-5ubuntu4.3 libpciaccess00.16-0ubuntu1 libpcre2-8-010.34-7 libpcre32:8.39-12build1 From fa4e0f240c3933af040632f535fe77156db62595 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 23 Nov 2021 04:58:10 +0100 Subject: [PATCH 220/514] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 00c057f..de20218 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -37,8 +37,8 @@ init-system-helpers1.57 intel-gmmlib21.2.1 intel-igc-core1.0.8744 intel-igc-opencl1.0.8744 -intel-level-zero-gpu1.2.21574 -intel-opencl-icd21.45.21574 +intel-level-zero-gpu1.2.21636 +intel-opencl-icd21.46.21636 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 @@ -123,7 +123,7 @@ libsmartcols12.34-0.1ubuntu9.1 libsqlite3-03.31.1-4ubuntu0.2 libss21.45.5-2ubuntu1 libssh-40.9.3-2ubuntu2.2 -libssl1.11.1.1f-1ubuntu2.8 +libssl1.11.1.1f-1ubuntu2.9 libstdc++610.3.0-1ubuntu1~20.04 libsystemd0245.4-4ubuntu3.13 libtasn1-64.16.0-2 @@ -149,7 +149,7 @@ mount2.34-0.1ubuntu9.1 ncurses-base6.2-0ubuntu2 ncurses-bin6.2-0ubuntu2 ocl-icd-libopencl12.2.11-1ubuntu1 -openssl1.1.1f-1ubuntu2.8 +openssl1.1.1f-1ubuntu2.9 passwd1:4.8.1-1ubuntu5.20.04.1 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 From f0fdb4011100afb83dd2c8b4dd6de8e21b76bbda Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 30 Nov 2021 04:58:32 +0100 Subject: [PATCH 221/514] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index de20218..fdfdc1b 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -34,11 +34,11 @@ grep3.4-1 gzip1.10-0ubuntu4 hostname3.23 init-system-helpers1.57 -intel-gmmlib21.2.1 -intel-igc-core1.0.8744 -intel-igc-opencl1.0.8744 -intel-level-zero-gpu1.2.21636 -intel-opencl-icd21.46.21636 +intel-gmmlib21.3.3 +intel-igc-core1.0.9389 +intel-igc-opencl1.0.9389 +intel-level-zero-gpu1.2.21710 +intel-opencl-icd21.47.21710 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 @@ -166,5 +166,5 @@ ubuntu-keyring2020.02.11.4 udev245.4-4ubuntu3.13 unrar1:5.6.6-2build1 util-linux2.34-0.1ubuntu9.1 -wget1.20.3-1ubuntu1 +wget1.20.3-1ubuntu2 zlib1g1:1.2.11.dfsg-2ubuntu1.2 From ab570f52f4f8831b7676d85d2af95498f1bf0708 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 1 Dec 2021 05:59:23 +0100 Subject: [PATCH 222/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index fdfdc1b..67b1674 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -153,7 +153,7 @@ openssl1.1.1f-1ubuntu2.9 passwd1:4.8.1-1ubuntu5.20.04.1 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.24.5.5173-8dcc73a59 +plexmediaserver1.25.0.5282-2edd3c44d procps2:3.3.16-1ubuntu2.3 publicsuffix20200303.0012-1 readline-common8.0-4 From a9bebde0229ab875cbc2195b97c0a4f6bbd3e2ea Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 7 Dec 2021 04:58:20 +0100 Subject: [PATCH 223/514] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 67b1674..f29fcd8 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -35,10 +35,10 @@ gzip1.10-0ubuntu4 hostname3.23 init-system-helpers1.57 intel-gmmlib21.3.3 -intel-igc-core1.0.9389 -intel-igc-opencl1.0.9389 -intel-level-zero-gpu1.2.21710 -intel-opencl-icd21.47.21710 +intel-igc-core1.0.9441 +intel-igc-opencl1.0.9441 +intel-level-zero-gpu1.2.21782 +intel-opencl-icd21.48.21782 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 From c7287d75fc3166fcdfea9a5d977b8838ec2487f5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 7 Dec 2021 09:54:36 +0100 Subject: [PATCH 224/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index f29fcd8..e7830fc 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -153,7 +153,7 @@ openssl1.1.1f-1ubuntu2.9 passwd1:4.8.1-1ubuntu5.20.04.1 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.25.0.5282-2edd3c44d +plexmediaserver1.25.1.5286-34f965be8 procps2:3.3.16-1ubuntu2.3 publicsuffix20200303.0012-1 readline-common8.0-4 From 8d5968317d741bc85196960e1069dbb472b554b5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 13 Dec 2021 21:50:34 +0100 Subject: [PATCH 225/514] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index e7830fc..eda0cab 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -37,8 +37,8 @@ init-system-helpers1.57 intel-gmmlib21.3.3 intel-igc-core1.0.9441 intel-igc-opencl1.0.9441 -intel-level-zero-gpu1.2.21782 -intel-opencl-icd21.48.21782 +intel-level-zero-gpu1.2.21786 +intel-opencl-icd21.49.21786 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 @@ -153,7 +153,7 @@ openssl1.1.1f-1ubuntu2.9 passwd1:4.8.1-1ubuntu5.20.04.1 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.25.1.5286-34f965be8 +plexmediaserver1.25.2.5319-c43dc0277 procps2:3.3.16-1ubuntu2.3 publicsuffix20200303.0012-1 readline-common8.0-4 From b9264980d8b21d49940977de9cfc9ee91dfc3554 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 21 Dec 2021 04:57:24 +0100 Subject: [PATCH 226/514] Bot Updating Templated Files --- Jenkinsfile | 88 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 50 insertions(+), 38 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3fc7768..6ddbb4b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -120,12 +120,11 @@ pipeline { script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g' ''', returnStdout: true).trim() - env.SEMVER = (new Date()).format('YYYY.MM.dd') - def semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)\.(\d+)$/ + def semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)\.(\d+)/ if (semver.find()) { env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${semver[0][3]}" } else { - semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)(?:\.(\d+))?(.*)$/ + semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)(?:\.(\d+))?(.*)/ if (semver.find()) { if (semver[0][3]) { env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${semver[0][3]}" @@ -135,7 +134,15 @@ pipeline { } } - println("SEMVER: ${env.SEMVER}") + if (env.SEMVER != null) { + if (BRANCH_NAME != "master" && BRANCH_NAME != "main") { + env.SEMVER = "${env.SEMVER}-${BRANCH_NAME}" + } + println("SEMVER: ${env.SEMVER}") + } else { + println("No SEMVER detected") + } + } } } @@ -404,10 +411,10 @@ pipeline { steps{ sh '''#! /bin/bash set -e - PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/packages | jq -r '.[] | select(.name=="linuxserver/plex") | .uuid') + PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/organizations/linuxserver-ci/packages | jq -r '.[] | select(.name=="linuxserver/plex") | .uuid') if [ -z "${PACKAGE_UUID}" ]; then echo "Adding package to Scarf.sh" - PACKAGE_UUID=$(curl -sX POST https://scarf.sh/api/v1/packages \ + curl -sX POST https://scarf.sh/api/v1/organizations/linuxserver-ci/packages \ -H "Authorization: Bearer ${SCARF_TOKEN}" \ -H "Content-Type: application/json" \ -d '{"name":"linuxserver/plex",\ @@ -415,22 +422,10 @@ pipeline { "libraryType":"docker",\ "website":"https://github.com/linuxserver/docker-plex",\ "backendUrl":"https://ghcr.io/linuxserver/plex",\ - "publicUrl":"https://lscr.io/linuxserver/plex"}' \ - | jq -r .uuid) + "publicUrl":"https://lscr.io/linuxserver/plex"}' || : else echo "Package already exists on Scarf.sh" fi - echo "Setting permissions on Scarf.sh for package ${PACKAGE_UUID}" - curl -X POST https://scarf.sh/api/v1/packages/${PACKAGE_UUID}/permissions \ - -H "Authorization: Bearer ${SCARF_TOKEN}" \ - -H "Content-Type: application/json" \ - -d '[{"userQuery":"Spad","permissionLevel":"admin"},\ - {"userQuery":"roxedus","permissionLevel":"admin"},\ - {"userQuery":"nemchik","permissionLevel":"admin"},\ - {"userQuery":"driz","permissionLevel":"admin"},\ - {"userQuery":"aptalca","permissionLevel":"admin"},\ - {"userQuery":"saarg","permissionLevel":"admin"},\ - {"userQuery":"Stark","permissionLevel":"admin"}]' ''' } } @@ -754,11 +749,15 @@ pipeline { docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG} docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG} - docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER} + if [ -n "${SEMVER}" ]; then + docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER} + fi docker push ${PUSHIMAGE}:latest docker push ${PUSHIMAGE}:${META_TAG} docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG} - docker push ${PUSHIMAGE}:${SEMVER} + if [ -n "${SEMVER}" ]; then + docker push ${PUSHIMAGE}:${SEMVER} + fi done ''' } @@ -767,8 +766,10 @@ pipeline { docker rmi \ ${DELETEIMAGE}:${META_TAG} \ ${DELETEIMAGE}:${EXT_RELEASE_TAG} \ - ${DELETEIMAGE}:latest \ - ${DELETEIMAGE}:${SEMVER} || : + ${DELETEIMAGE}:latest || : + if [ -n "${SEMVER}" ]; then + docker rmi ${DELETEIMAGE}:${SEMVER} || : + fi done ''' } @@ -818,9 +819,11 @@ pipeline { docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} - docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER} - docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER} - docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER} + if [ -n "${SEMVER}" ]; then + docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER} + docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER} + docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER} + fi docker push ${MANIFESTIMAGE}:amd64-${META_TAG} docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG} docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} @@ -830,9 +833,11 @@ pipeline { docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} - docker push ${MANIFESTIMAGE}:amd64-${SEMVER} - docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER} - docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER} + if [ -n "${SEMVER}" ]; then + docker push ${MANIFESTIMAGE}:amd64-${SEMVER} + docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER} + docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER} + fi docker manifest push --purge ${MANIFESTIMAGE}:latest || : docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm @@ -845,14 +850,18 @@ pipeline { docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8 - docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || : - docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} - docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm - docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8 + if [ -n "${SEMVER}" ]; then + docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || : + docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} + docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm + docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8 + fi docker manifest push --purge ${MANIFESTIMAGE}:latest docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} - docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} + if [ -n "${SEMVER}" ]; then + docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} + fi done ''' } @@ -862,15 +871,18 @@ pipeline { ${DELETEIMAGE}:amd64-${META_TAG} \ ${DELETEIMAGE}:amd64-latest \ ${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \ - ${DELETEIMAGE}:amd64-${SEMVER} \ ${DELETEIMAGE}:arm32v7-${META_TAG} \ ${DELETEIMAGE}:arm32v7-latest \ ${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \ - ${DELETEIMAGE}:arm32v7-${SEMVER} \ ${DELETEIMAGE}:arm64v8-${META_TAG} \ ${DELETEIMAGE}:arm64v8-latest \ - ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} \ - ${DELETEIMAGE}:arm64v8-${SEMVER} || : + ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || : + if [ -n "${SEMVER}" ]; then + docker rmi \ + ${DELETEIMAGE}:amd64-${SEMVER} \ + ${DELETEIMAGE}:arm32v7-${SEMVER} \ + ${DELETEIMAGE}:arm64v8-${SEMVER} || : + fi done docker rmi \ ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \ From 33121e9e6fb6f86542476f4d626a1045fb89492d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 21 Dec 2021 04:58:43 +0100 Subject: [PATCH 227/514] Bot Updating Templated Files --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 8bbd79c..ba85c1f 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,7 @@ Find us at: # [linuxserver/plex](https://github.com/linuxserver/docker-plex) +[![Scarf.io pulls](https://scarf.sh/installs-badge/linuxserver-ci/linuxserver%2Fplex?color=94398d&label-color=555555&logo-color=ffffff&style=for-the-badge&package-type=docker)](https://scarf.sh/gateway/linuxserver-ci/docker/linuxserver%2Fplex) [![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-plex.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-plex) [![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-plex.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-plex/releases) [![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-plex/packages) From d004764e9777514e7bc211075a68c657477e10f5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 21 Dec 2021 05:02:05 +0100 Subject: [PATCH 228/514] Bot Updating Package Versions --- package_versions.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index eda0cab..5df5e85 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -34,11 +34,11 @@ grep3.4-1 gzip1.10-0ubuntu4 hostname3.23 init-system-helpers1.57 -intel-gmmlib21.3.3 +intel-gmmlib22.0.0 intel-igc-core1.0.9441 intel-igc-opencl1.0.9441 -intel-level-zero-gpu1.2.21786 -intel-opencl-icd21.49.21786 +intel-level-zero-gpu1.2.21939 +intel-opencl-icd21.50.21939 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 @@ -123,7 +123,7 @@ libsmartcols12.34-0.1ubuntu9.1 libsqlite3-03.31.1-4ubuntu0.2 libss21.45.5-2ubuntu1 libssh-40.9.3-2ubuntu2.2 -libssl1.11.1.1f-1ubuntu2.9 +libssl1.11.1.1f-1ubuntu2.10 libstdc++610.3.0-1ubuntu1~20.04 libsystemd0245.4-4ubuntu3.13 libtasn1-64.16.0-2 @@ -149,7 +149,7 @@ mount2.34-0.1ubuntu9.1 ncurses-base6.2-0ubuntu2 ncurses-bin6.2-0ubuntu2 ocl-icd-libopencl12.2.11-1ubuntu1 -openssl1.1.1f-1ubuntu2.9 +openssl1.1.1f-1ubuntu2.10 passwd1:4.8.1-1ubuntu5.20.04.1 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 From b00e11ed4a8c55eb3ff323752b0e5cb3ab1cbc9e Mon Sep 17 00:00:00 2001 From: aptalca Date: Thu, 23 Dec 2021 11:29:09 -0500 Subject: [PATCH 229/514] install intel drivers after plex to fix tonemap --- Dockerfile | 19 ++++++++++--------- README.md | 1 + readme-vars.yml | 1 + 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5e32433..ba4ee12 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,6 +31,16 @@ RUN \ 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'); \ + fi && \ + curl -o \ + /tmp/plexmediaserver.deb -L \ + "${PLEX_DOWNLOAD}/${PLEX_RELEASE}/debian/plexmediaserver_${PLEX_RELEASE}_${PLEX_ARCH}.deb" && \ + dpkg -i /tmp/plexmediaserver.deb && \ + echo "**** Install the latest Intel drivers ****" && \ COMP_RT_RELEASE=$(curl -sX GET "https://api.github.com/repos/intel/compute-runtime/releases/latest" | jq -r '.tag_name') && \ COMP_RT_URLS=$(curl -sX GET "https://api.github.com/repos/intel/compute-runtime/releases/tags/${COMP_RT_RELEASE}" | jq -r '.body' | grep wget | sed 's|wget ||g') && \ mkdir -p /opencl-intel && \ @@ -42,15 +52,6 @@ RUN \ done && \ dpkg -i /opencl-intel/*.deb && \ rm -rf /opencl-intel && \ - 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'); \ - fi && \ - curl -o \ - /tmp/plexmediaserver.deb -L \ - "${PLEX_DOWNLOAD}/${PLEX_RELEASE}/debian/plexmediaserver_${PLEX_RELEASE}_${PLEX_ARCH}.deb" && \ - dpkg -i /tmp/plexmediaserver.deb && \ echo "**** ensure abc user's home folder is /app ****" && \ usermod -d /app abc && \ echo "**** cleanup ****" && \ diff --git a/README.md b/README.md index ba85c1f..63091a6 100644 --- a/README.md +++ b/README.md @@ -299,6 +299,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **23.12.21:** - Install Intel drivers _after_ Plex to fix broken tone mapping on comet lake. * **20.01.21:** - Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information. * **10.12.20:** - Add latest Intel Compute packages from github repo for opencl support on latest gen igpu. * **23.11.20:** - Add Bionic branch make Focal default. diff --git a/readme-vars.yml b/readme-vars.yml index 5092cf2..31d5bd3 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -107,6 +107,7 @@ app_setup_block: | # changelog changelogs: + - { date: "23.12.21:", desc: "Install Intel drivers _after_ Plex to fix broken tone mapping on comet lake." } - { date: "20.01.21:", desc: "Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information." } - { date: "10.12.20:", desc: "Add latest Intel Compute packages from github repo for opencl support on latest gen igpu." } - { date: "23.11.20:", desc: "Add Bionic branch make Focal default." } From 2f08980441f26b55db4d95db8ee42c958882cc36 Mon Sep 17 00:00:00 2001 From: aptalca Date: Fri, 24 Dec 2021 14:45:59 -0500 Subject: [PATCH 230/514] use intel repo --- Dockerfile | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/Dockerfile b/Dockerfile index ba4ee12..4892a22 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,12 +22,14 @@ PLEX_MEDIA_SERVER_INFO_VENDOR="Docker" \ PLEX_MEDIA_SERVER_INFO_DEVICE="Docker Container (LinuxServer.io)" RUN \ + echo "**** add Intel repo ****" && \ + curl -sL https://repositories.intel.com/graphics/intel-graphics.key | apt-key add - && \ + echo 'deb [arch=amd64] https://repositories.intel.com/graphics/ubuntu focal main' > /etc/apt/sources.list.d/intel.list && \ echo "**** install runtime packages ****" && \ apt-get update && \ apt-get install -y \ - beignet-opencl-icd \ jq \ - ocl-icd-libopencl1 \ + intel-opencl-icd \ udev \ unrar \ wget && \ @@ -40,18 +42,6 @@ RUN \ /tmp/plexmediaserver.deb -L \ "${PLEX_DOWNLOAD}/${PLEX_RELEASE}/debian/plexmediaserver_${PLEX_RELEASE}_${PLEX_ARCH}.deb" && \ dpkg -i /tmp/plexmediaserver.deb && \ - echo "**** Install the latest Intel drivers ****" && \ - COMP_RT_RELEASE=$(curl -sX GET "https://api.github.com/repos/intel/compute-runtime/releases/latest" | jq -r '.tag_name') && \ - COMP_RT_URLS=$(curl -sX GET "https://api.github.com/repos/intel/compute-runtime/releases/tags/${COMP_RT_RELEASE}" | jq -r '.body' | grep wget | sed 's|wget ||g') && \ - mkdir -p /opencl-intel && \ - for i in ${COMP_RT_URLS}; do \ - i=$(echo ${i} | tr -d '\r'); \ - echo "**** downloading ${i} ****"; \ - curl -o "/opencl-intel/$(basename ${i})" \ - -L "${i}"; \ - done && \ - dpkg -i /opencl-intel/*.deb && \ - rm -rf /opencl-intel && \ echo "**** ensure abc user's home folder is /app ****" && \ usermod -d /app abc && \ echo "**** cleanup ****" && \ From 9a093c24042631c263fd06fd5ee3c11136d06155 Mon Sep 17 00:00:00 2001 From: aptalca Date: Sat, 25 Dec 2021 14:24:10 -0500 Subject: [PATCH 231/514] update readme, improve gid-video verbosity --- README.md | 2 +- readme-vars.yml | 2 +- root/etc/cont-init.d/50-gid-video | 32 +++++++++++++------------------ 3 files changed, 15 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 63091a6..cf35fa9 100644 --- a/README.md +++ b/README.md @@ -299,7 +299,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions -* **23.12.21:** - Install Intel drivers _after_ Plex to fix broken tone mapping on comet lake. +* **25.12.21:** - Install Intel drivers from the official repo. * **20.01.21:** - Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information. * **10.12.20:** - Add latest Intel Compute packages from github repo for opencl support on latest gen igpu. * **23.11.20:** - Add Bionic branch make Focal default. diff --git a/readme-vars.yml b/readme-vars.yml index 31d5bd3..13867d0 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -107,7 +107,7 @@ app_setup_block: | # changelog changelogs: - - { date: "23.12.21:", desc: "Install Intel drivers _after_ Plex to fix broken tone mapping on comet lake." } + - { date: "25.12.21:", desc: "Install Intel drivers from the official repo." } - { date: "20.01.21:", desc: "Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information." } - { date: "10.12.20:", desc: "Add latest Intel Compute packages from github repo for opencl support on latest gen igpu." } - { date: "23.11.20:", desc: "Add Bionic branch make Focal default." } diff --git a/root/etc/cont-init.d/50-gid-video b/root/etc/cont-init.d/50-gid-video index 8e0dec3..9766c76 100755 --- a/root/etc/cont-init.d/50-gid-video +++ b/root/etc/cont-init.d/50-gid-video @@ -4,23 +4,17 @@ FILES=$(find /dev/dri /dev/dvb -type c -print 2>/dev/null) for i in $FILES do - VIDEO_GID=$(stat -c '%g' "$i") - if id -G abc | grep -qw "$VIDEO_GID"; then - touch /groupadd - else - if [ ! "${VIDEO_GID}" == '0' ]; then - VIDEO_NAME=$(getent group "${VIDEO_GID}" | awk -F: '{print $1}') - if [ -z "${VIDEO_NAME}" ]; then - VIDEO_NAME="video$(head /dev/urandom | tr -dc 'a-zA-Z0-9' | head -c8)" - groupadd "$VIDEO_NAME" - groupmod -g "$VIDEO_GID" "$VIDEO_NAME" - fi - usermod -a -G "$VIDEO_NAME" abc - touch /groupadd - fi - fi + VIDEO_GID=$(stat -c '%g' "$i") + if ! id -G abc | grep -qw "$VIDEO_GID"; then + VIDEO_NAME=$(getent group "${VIDEO_GID}" | awk -F: '{print $1}') + if [ -z "${VIDEO_NAME}" ]; then + VIDEO_NAME="video$(head /dev/urandom | tr -dc 'a-zA-Z0-9' | head -c8)" + groupadd "$VIDEO_NAME" + groupmod -g "$VIDEO_GID" "$VIDEO_NAME" + fi + usermod -a -G "$VIDEO_NAME" abc + if [ $(stat -c '%A' "${i}" | cut -b 5,6) != "rw" ]; then + echo -e "**** The device ${i} does not have group read/write permissions, which might prevent hardware transcode from functioning correctly. To fix it, you can run the following on your docker host: ****\nsudo chmod g+rw ${i}\n" + fi + fi done - -if [ -n "${FILES}" ] && [ ! -f "/groupadd" ]; then - usermod -a -G root abc -fi From 56f8bdf0b483fc2b86bcbe961b7f37853a81d69b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 26 Dec 2021 19:30:08 +0100 Subject: [PATCH 232/514] Bot Updating Package Versions --- package_versions.txt | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 5df5e85..e08b375 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -4,7 +4,6 @@ apt-utils2.0.6 base-files11ubuntu5.4 base-passwd3.5.47 bash5.0-6ubuntu1.1 -beignet-opencl-icd1.3.2-7build1 bsdutils1:2.34-0.1ubuntu9.1 bzip21.0.8-2 ca-certificates20210119~20.04.2 @@ -34,11 +33,8 @@ grep3.4-1 gzip1.10-0ubuntu4 hostname3.23 init-system-helpers1.57 -intel-gmmlib22.0.0 -intel-igc-core1.0.9441 -intel-igc-opencl1.0.9441 -intel-level-zero-gpu1.2.21939 -intel-opencl-icd21.50.21939 +intel-igc-cm1.0.97+i643~u20.04 +intel-opencl-icd21.49.21786+i643~u20.04 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 @@ -50,7 +46,6 @@ libaudit11:2.8.5-2ubuntu6 libaudit-common1:2.8.5-2ubuntu6 libblkid12.34-0.1ubuntu9.1 libbrotli11.0.7-6ubuntu0.1 -libbsd00.10.0-1 libbz2-1.01.0.8-2 libc62.31-0ubuntu9.2 libcap-ng00.7.9-2.1build1 @@ -60,9 +55,6 @@ libcrypt11:4.4.10-10ubuntu4 libcurl47.68.0-1ubuntu2.7 libdb5.35.3.28+dfsg1-0.6ubuntu2 libdebconfclient00.251ubuntu1 -libdrm22.4.105-3~20.04.2 -libdrm-common2.4.105-3~20.04.2 -libdrm-intel12.4.105-3~20.04.2 libext2fs21.45.5-2ubuntu1 libfdisk12.34-0.1ubuntu9.1 libffi73.3-4 @@ -79,6 +71,9 @@ libheimntlm0-heimdal7.7.0+dfsg-1ubuntu1 libhogweed53.5.1+really3.5.1-2ubuntu0.2 libhx509-5-heimdal7.7.0+dfsg-1ubuntu1 libidn2-02.2.0-2 +libigc11.0.9441+i643~u20.04 +libigdfcl11.0.9441+i643~u20.04 +libigdgmm1121.3.3+i643~u20.04 libjq11.6-1ubuntu0.20.04.1 libk5crypto31.17-6ubuntu4.1 libkeyutils11.6-6ubuntu1 @@ -103,7 +98,6 @@ libpam0g1.3.1-5ubuntu4.3 libpam-modules1.3.1-5ubuntu4.3 libpam-modules-bin1.3.1-5ubuntu4.3 libpam-runtime1.3.1-5ubuntu4.3 -libpciaccess00.16-0ubuntu1 libpcre2-8-010.34-7 libpcre32:8.39-12build1 libprocps82:3.3.16-1ubuntu2.3 @@ -114,7 +108,7 @@ librtmp12.4+20151223.gitfa8646d.1-2build1 libsasl2-22.1.27+dfsg-2 libsasl2-modules2.1.27+dfsg-2 libsasl2-modules-db2.1.27+dfsg-2 -libseccomp22.5.1-1ubuntu1~20.04.1 +libseccomp22.5.1-1ubuntu1~20.04.2 libselinux13.0-1build2 libsemanage13.0-1build2 libsemanage-common3.0-1build2 @@ -132,13 +126,7 @@ libudev1245.4-4ubuntu3.13 libunistring20.9.10-2 libuuid12.34-0.1ubuntu9.1 libwind0-heimdal7.7.0+dfsg-1ubuntu1 -libx11-62:1.6.9-2ubuntu1.2 -libx11-data2:1.6.9-2ubuntu1.2 -libxau61:1.0.9-0ubuntu1 -libxcb11.14-2 -libxdmcp61:1.1.3-0ubuntu1 -libxext62:1.3.4-0ubuntu1 -libxfixes31:5.0.3-2 +libz3-44.8.7-4build1 libzstd11.4.4+dfsg-3ubuntu0.1 locales2.31-0ubuntu9.2 login1:4.8.1-1ubuntu5.20.04.1 From a5880ef244f509df0fd54de0e9240222990833ef Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 11 Jan 2022 04:57:45 +0100 Subject: [PATCH 233/514] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index e08b375..23c9aab 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -122,7 +122,7 @@ libstdc++610.3.0-1ubuntu1~20.04 libsystemd0245.4-4ubuntu3.13 libtasn1-64.16.0-2 libtinfo66.2-0ubuntu2 -libudev1245.4-4ubuntu3.13 +libudev1245.4-4ubuntu3.14 libunistring20.9.10-2 libuuid12.34-0.1ubuntu9.1 libwind0-heimdal7.7.0+dfsg-1ubuntu1 @@ -151,7 +151,7 @@ sysvinit-utils2.96-2.1ubuntu1 tar1.30+dfsg-7ubuntu0.20.04.1 tzdata2021e-0ubuntu0.20.04 ubuntu-keyring2020.02.11.4 -udev245.4-4ubuntu3.13 +udev245.4-4ubuntu3.14 unrar1:5.6.6-2build1 util-linux2.34-0.1ubuntu9.1 wget1.20.3-1ubuntu2 From 127c9be1f3f5bbeee196735e4fa298a2d865b430 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 12 Jan 2022 02:52:31 +0100 Subject: [PATCH 234/514] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 23c9aab..18e7a57 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -119,7 +119,7 @@ libss21.45.5-2ubuntu1 libssh-40.9.3-2ubuntu2.2 libssl1.11.1.1f-1ubuntu2.10 libstdc++610.3.0-1ubuntu1~20.04 -libsystemd0245.4-4ubuntu3.13 +libsystemd0245.4-4ubuntu3.14 libtasn1-64.16.0-2 libtinfo66.2-0ubuntu2 libudev1245.4-4ubuntu3.14 @@ -141,7 +141,7 @@ openssl1.1.1f-1ubuntu2.10 passwd1:4.8.1-1ubuntu5.20.04.1 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.25.2.5319-c43dc0277 +plexmediaserver1.25.3.5385-f05b712b6 procps2:3.3.16-1ubuntu2.3 publicsuffix20200303.0012-1 readline-common8.0-4 From 6d4029bb75365353fbca7b146a9a472891702170 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 13 Jan 2022 14:51:06 +0100 Subject: [PATCH 235/514] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 18e7a57..032660c 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -122,7 +122,7 @@ libstdc++610.3.0-1ubuntu1~20.04 libsystemd0245.4-4ubuntu3.14 libtasn1-64.16.0-2 libtinfo66.2-0ubuntu2 -libudev1245.4-4ubuntu3.14 +libudev1245.4-4ubuntu3.15 libunistring20.9.10-2 libuuid12.34-0.1ubuntu9.1 libwind0-heimdal7.7.0+dfsg-1ubuntu1 @@ -141,7 +141,7 @@ openssl1.1.1f-1ubuntu2.10 passwd1:4.8.1-1ubuntu5.20.04.1 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.25.3.5385-f05b712b6 +plexmediaserver1.25.3.5409-f11334058 procps2:3.3.16-1ubuntu2.3 publicsuffix20200303.0012-1 readline-common8.0-4 @@ -151,7 +151,7 @@ sysvinit-utils2.96-2.1ubuntu1 tar1.30+dfsg-7ubuntu0.20.04.1 tzdata2021e-0ubuntu0.20.04 ubuntu-keyring2020.02.11.4 -udev245.4-4ubuntu3.14 +udev245.4-4ubuntu3.15 unrar1:5.6.6-2build1 util-linux2.34-0.1ubuntu9.1 wget1.20.3-1ubuntu2 From 863fa5fb6bd3d3abfca0df017b1993c27dd1707e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 25 Jan 2022 04:57:21 +0100 Subject: [PATCH 236/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 032660c..b65c145 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -119,7 +119,7 @@ libss21.45.5-2ubuntu1 libssh-40.9.3-2ubuntu2.2 libssl1.11.1.1f-1ubuntu2.10 libstdc++610.3.0-1ubuntu1~20.04 -libsystemd0245.4-4ubuntu3.14 +libsystemd0245.4-4ubuntu3.15 libtasn1-64.16.0-2 libtinfo66.2-0ubuntu2 libudev1245.4-4ubuntu3.15 From 5c706d82e8c8c7881b49dde24e17306b9696789c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 31 Jan 2022 08:49:13 +0100 Subject: [PATCH 237/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index b65c145..84a3381 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -141,7 +141,7 @@ openssl1.1.1f-1ubuntu2.10 passwd1:4.8.1-1ubuntu5.20.04.1 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.25.3.5409-f11334058 +plexmediaserver1.25.4.5468-989df2310 procps2:3.3.16-1ubuntu2.3 publicsuffix20200303.0012-1 readline-common8.0-4 From db1e255267abeed25f2ac4ffba33724c1c07d91a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 1 Feb 2022 08:49:35 +0100 Subject: [PATCH 238/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 84a3381..6c63c8e 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -141,7 +141,7 @@ openssl1.1.1f-1ubuntu2.10 passwd1:4.8.1-1ubuntu5.20.04.1 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.25.4.5468-989df2310 +plexmediaserver1.25.4.5487-648a8f9f9 procps2:3.3.16-1ubuntu2.3 publicsuffix20200303.0012-1 readline-common8.0-4 From 5faa4dd3d9bfd53a3a3fa63c39edff751fd762f5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 8 Feb 2022 11:49:41 +0100 Subject: [PATCH 239/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 6c63c8e..b28e7a0 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -141,7 +141,7 @@ openssl1.1.1f-1ubuntu2.10 passwd1:4.8.1-1ubuntu5.20.04.1 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.25.4.5487-648a8f9f9 +plexmediaserver1.25.5.5492-12f6b8c83 procps2:3.3.16-1ubuntu2.3 publicsuffix20200303.0012-1 readline-common8.0-4 From 16f7da4054e323bdc71eb02affec05a8716c3313 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 22 Feb 2022 04:57:32 +0100 Subject: [PATCH 240/514] Bot Updating Package Versions --- package_versions.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index b28e7a0..05248cf 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -4,7 +4,7 @@ apt-utils2.0.6 base-files11ubuntu5.4 base-passwd3.5.47 bash5.0-6ubuntu1.1 -bsdutils1:2.34-0.1ubuntu9.1 +bsdutils1:2.34-0.1ubuntu9.3 bzip21.0.8-2 ca-certificates20210119~20.04.2 coreutils8.30-3ubuntu2 @@ -16,7 +16,7 @@ diffutils1:3.7-3 dirmngr2.2.19-3ubuntu2.1 dpkg1.19.7ubuntu3 e2fsprogs1.45.5-2ubuntu1 -fdisk2.34-0.1ubuntu9.1 +fdisk2.34-0.1ubuntu9.3 findutils4.7.0-1ubuntu1 gcc-10-base10.3.0-1ubuntu1~20.04 gnupg2.2.19-3ubuntu2.1 @@ -44,7 +44,7 @@ libassuan02.5.3-7ubuntu2 libattr11:2.4.48-5 libaudit11:2.8.5-2ubuntu6 libaudit-common1:2.8.5-2ubuntu6 -libblkid12.34-0.1ubuntu9.1 +libblkid12.34-0.1ubuntu9.3 libbrotli11.0.7-6ubuntu0.1 libbz2-1.01.0.8-2 libc62.31-0ubuntu9.2 @@ -56,7 +56,7 @@ libcurl47.68.0-1ubuntu2.7 libdb5.35.3.28+dfsg1-0.6ubuntu2 libdebconfclient00.251ubuntu1 libext2fs21.45.5-2ubuntu1 -libfdisk12.34-0.1ubuntu9.1 +libfdisk12.34-0.1ubuntu9.3 libffi73.3-4 libgcc-s110.3.0-1ubuntu1~20.04 libgcrypt201.8.5-5ubuntu1.1 @@ -86,7 +86,7 @@ libldap-2.4-22.4.49+dfsg-2ubuntu1.8 libldap-common2.4.49+dfsg-2ubuntu1.8 liblz4-11.9.2-2ubuntu0.20.04.1 liblzma55.2.4-1ubuntu1 -libmount12.34-0.1ubuntu9.1 +libmount12.34-0.1ubuntu9.3 libncurses66.2-0ubuntu2 libncursesw66.2-0ubuntu2 libnettle73.5.1+really3.5.1-2ubuntu0.2 @@ -113,7 +113,7 @@ libselinux13.0-1build2 libsemanage13.0-1build2 libsemanage-common3.0-1build2 libsepol13.0-1 -libsmartcols12.34-0.1ubuntu9.1 +libsmartcols12.34-0.1ubuntu9.3 libsqlite3-03.31.1-4ubuntu0.2 libss21.45.5-2ubuntu1 libssh-40.9.3-2ubuntu2.2 @@ -124,7 +124,7 @@ libtasn1-64.16.0-2 libtinfo66.2-0ubuntu2 libudev1245.4-4ubuntu3.15 libunistring20.9.10-2 -libuuid12.34-0.1ubuntu9.1 +libuuid12.34-0.1ubuntu9.3 libwind0-heimdal7.7.0+dfsg-1ubuntu1 libz3-44.8.7-4build1 libzstd11.4.4+dfsg-3ubuntu0.1 @@ -133,7 +133,7 @@ login1:4.8.1-1ubuntu5.20.04.1 logsave1.45.5-2ubuntu1 lsb-base11.1.0ubuntu2 mawk1.3.4.20200120-2 -mount2.34-0.1ubuntu9.1 +mount2.34-0.1ubuntu9.3 ncurses-base6.2-0ubuntu2 ncurses-bin6.2-0ubuntu2 ocl-icd-libopencl12.2.11-1ubuntu1 @@ -153,6 +153,6 @@ tzdata2021e-0ubuntu0.20.04 ubuntu-keyring2020.02.11.4 udev245.4-4ubuntu3.15 unrar1:5.6.6-2build1 -util-linux2.34-0.1ubuntu9.1 +util-linux2.34-0.1ubuntu9.3 wget1.20.3-1ubuntu2 zlib1g1:1.2.11.dfsg-2ubuntu1.2 From 194fe9085e3845bc1b33c38a9a1cf46f6bbe7136 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 22 Feb 2022 18:53:54 +0100 Subject: [PATCH 241/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 05248cf..8e956b7 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -141,7 +141,7 @@ openssl1.1.1f-1ubuntu2.10 passwd1:4.8.1-1ubuntu5.20.04.1 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.25.5.5492-12f6b8c83 +plexmediaserver1.25.6.5577-c8bd13540 procps2:3.3.16-1ubuntu2.3 publicsuffix20200303.0012-1 readline-common8.0-4 From 28db793d3324698a8309c98d0022a6965ac85425 Mon Sep 17 00:00:00 2001 From: aptalca Date: Fri, 4 Mar 2022 14:40:34 -0500 Subject: [PATCH 242/514] increase video perm fix verbosity, set group rw --- README.md | 1 + readme-vars.yml | 1 + root/etc/cont-init.d/50-gid-video | 33 ++++++++++++++++++++++--------- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index cf35fa9..fa8fbf9 100644 --- a/README.md +++ b/README.md @@ -299,6 +299,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **04.03.22:** - Increase verbosity of video device permissions fix, attempt to fix missing group rw. * **25.12.21:** - Install Intel drivers from the official repo. * **20.01.21:** - Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information. * **10.12.20:** - Add latest Intel Compute packages from github repo for opencl support on latest gen igpu. diff --git a/readme-vars.yml b/readme-vars.yml index 13867d0..2c39ad4 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -107,6 +107,7 @@ app_setup_block: | # changelog changelogs: + - { date: "04.03.22:", desc: "Increase verbosity of video device permissions fix, attempt to fix missing group rw." } - { date: "25.12.21:", desc: "Install Intel drivers from the official repo." } - { date: "20.01.21:", desc: "Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information." } - { date: "10.12.20:", desc: "Add latest Intel Compute packages from github repo for opencl support on latest gen igpu." } diff --git a/root/etc/cont-init.d/50-gid-video b/root/etc/cont-init.d/50-gid-video index 9766c76..48048e1 100755 --- a/root/etc/cont-init.d/50-gid-video +++ b/root/etc/cont-init.d/50-gid-video @@ -4,17 +4,32 @@ FILES=$(find /dev/dri /dev/dvb -type c -print 2>/dev/null) for i in $FILES do - VIDEO_GID=$(stat -c '%g' "$i") - if ! id -G abc | grep -qw "$VIDEO_GID"; then - VIDEO_NAME=$(getent group "${VIDEO_GID}" | awk -F: '{print $1}') - if [ -z "${VIDEO_NAME}" ]; then - VIDEO_NAME="video$(head /dev/urandom | tr -dc 'a-zA-Z0-9' | head -c8)" - groupadd "$VIDEO_NAME" - groupmod -g "$VIDEO_GID" "$VIDEO_NAME" + VIDEO_GID=$(stat -c '%g' "${i}") + VIDEO_UID=$(stat -c '%u' "${i}") + # check if user matches device + if id -u abc | grep -qw "${VIDEO_UID}"; then + echo "**** permissions for ${i} are good ****" + else + # check if group matches and that device has group rw + if id -G abc | grep -qw "${VIDEO_GID}" && [ $(stat -c '%A' "${i}" | cut -b 5,6) = "rw" ]; then + echo "**** permissions for ${i} are good ****" + # check if device needs to be added to video group + elif ! id -G abc | grep -qw "${VIDEO_GID}"; then + # check if video group needs to be created + VIDEO_NAME=$(getent group "${VIDEO_GID}" | awk -F: '{print $1}') + if [ -z "${VIDEO_NAME}" ]; then + VIDEO_NAME="video$(head /dev/urandom | tr -dc 'a-zA-Z0-9' | head -c8)" + groupadd "${VIDEO_NAME}" + groupmod -g "${VIDEO_GID}" "${VIDEO_NAME}" + echo "**** creating video group ${VIDEO_NAME} with id ${VIDEO_GID} ****" + fi + echo "**** adding ${i} to video group ${VIDEO_NAME} with id ${VIDEO_GID} ****" + usermod -a -G "${VIDEO_NAME}" abc fi - usermod -a -G "$VIDEO_NAME" abc + # check if device has group rw if [ $(stat -c '%A' "${i}" | cut -b 5,6) != "rw" ]; then - echo -e "**** The device ${i} does not have group read/write permissions, which might prevent hardware transcode from functioning correctly. To fix it, you can run the following on your docker host: ****\nsudo chmod g+rw ${i}\n" + echo -e "**** The device ${i} does not have group read/write permissions, attempting to fix inside the container.If it doesn't work, you can run the following on your docker host: ****\nsudo chmod g+rw ${i}\n" + chmod g+rw "${i}" fi fi done From a498a4cf157a76bfde8b961c294799fd5a296f7b Mon Sep 17 00:00:00 2001 From: aptalca Date: Fri, 4 Mar 2022 14:45:44 -0500 Subject: [PATCH 243/514] standardize for alpine --- root/etc/cont-init.d/50-gid-video | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/cont-init.d/50-gid-video b/root/etc/cont-init.d/50-gid-video index 48048e1..aaf9dfd 100755 --- a/root/etc/cont-init.d/50-gid-video +++ b/root/etc/cont-init.d/50-gid-video @@ -18,7 +18,7 @@ do # check if video group needs to be created VIDEO_NAME=$(getent group "${VIDEO_GID}" | awk -F: '{print $1}') if [ -z "${VIDEO_NAME}" ]; then - VIDEO_NAME="video$(head /dev/urandom | tr -dc 'a-zA-Z0-9' | head -c8)" + VIDEO_NAME="video$(head /dev/urandom | tr -dc 'a-z0-9' | head -c4)" groupadd "${VIDEO_NAME}" groupmod -g "${VIDEO_GID}" "${VIDEO_NAME}" echo "**** creating video group ${VIDEO_NAME} with id ${VIDEO_GID} ****" From 561f7356cb00998016bbe20e9f323dbb2bedfdf9 Mon Sep 17 00:00:00 2001 From: aptalca Date: Fri, 4 Mar 2022 15:28:49 -0500 Subject: [PATCH 244/514] update log message --- root/etc/cont-init.d/50-gid-video | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/cont-init.d/50-gid-video b/root/etc/cont-init.d/50-gid-video index aaf9dfd..c07fe60 100755 --- a/root/etc/cont-init.d/50-gid-video +++ b/root/etc/cont-init.d/50-gid-video @@ -28,7 +28,7 @@ do fi # check if device has group rw if [ $(stat -c '%A' "${i}" | cut -b 5,6) != "rw" ]; then - echo -e "**** The device ${i} does not have group read/write permissions, attempting to fix inside the container.If it doesn't work, you can run the following on your docker host: ****\nsudo chmod g+rw ${i}\n" + echo -e "**** The device ${i} does not have group read/write permissions, attempting to fix inside the container. ****" chmod g+rw "${i}" fi fi From d27157a2e694c252416c0b63c30eb6a24cfff319 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 6 Mar 2022 23:31:36 +0100 Subject: [PATCH 245/514] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 8e956b7..f3792b1 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -105,9 +105,9 @@ libpsl50.21.0-1ubuntu1 libreadline88.0-4 libroken18-heimdal7.7.0+dfsg-1ubuntu1 librtmp12.4+20151223.gitfa8646d.1-2build1 -libsasl2-22.1.27+dfsg-2 -libsasl2-modules2.1.27+dfsg-2 -libsasl2-modules-db2.1.27+dfsg-2 +libsasl2-22.1.27+dfsg-2ubuntu0.1 +libsasl2-modules2.1.27+dfsg-2ubuntu0.1 +libsasl2-modules-db2.1.27+dfsg-2ubuntu0.1 libseccomp22.5.1-1ubuntu1~20.04.2 libselinux13.0-1build2 libsemanage13.0-1build2 From 1a2a2c9bd5e646267891d9df10cd278e5ae71447 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 14 Mar 2022 22:57:54 -0500 Subject: [PATCH 246/514] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index f3792b1..54426f1 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,7 +1,7 @@ adduser3.118ubuntu2 apt2.0.6 apt-utils2.0.6 -base-files11ubuntu5.4 +base-files11ubuntu5.5 base-passwd3.5.47 bash5.0-6ubuntu1.1 bsdutils1:2.34-0.1ubuntu9.3 @@ -47,9 +47,9 @@ libaudit-common1:2.8.5-2ubuntu6 libblkid12.34-0.1ubuntu9.3 libbrotli11.0.7-6ubuntu0.1 libbz2-1.01.0.8-2 -libc62.31-0ubuntu9.2 +libc62.31-0ubuntu9.7 libcap-ng00.7.9-2.1build1 -libc-bin2.31-0ubuntu9.2 +libc-bin2.31-0ubuntu9.7 libcom-err21.45.5-2ubuntu1 libcrypt11:4.4.10-10ubuntu4 libcurl47.68.0-1ubuntu2.7 @@ -117,7 +117,7 @@ libsmartcols12.34-0.1ubuntu9.3 libsqlite3-03.31.1-4ubuntu0.2 libss21.45.5-2ubuntu1 libssh-40.9.3-2ubuntu2.2 -libssl1.11.1.1f-1ubuntu2.10 +libssl1.11.1.1f-1ubuntu2.11 libstdc++610.3.0-1ubuntu1~20.04 libsystemd0245.4-4ubuntu3.15 libtasn1-64.16.0-2 @@ -128,7 +128,7 @@ libuuid12.34-0.1ubuntu9.3 libwind0-heimdal7.7.0+dfsg-1ubuntu1 libz3-44.8.7-4build1 libzstd11.4.4+dfsg-3ubuntu0.1 -locales2.31-0ubuntu9.2 +locales2.31-0ubuntu9.7 login1:4.8.1-1ubuntu5.20.04.1 logsave1.45.5-2ubuntu1 lsb-base11.1.0ubuntu2 @@ -137,7 +137,7 @@ mount2.34-0.1ubuntu9.3 ncurses-base6.2-0ubuntu2 ncurses-bin6.2-0ubuntu2 ocl-icd-libopencl12.2.11-1ubuntu1 -openssl1.1.1f-1ubuntu2.10 +openssl1.1.1f-1ubuntu2.11 passwd1:4.8.1-1ubuntu5.20.04.1 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 From 07857eeaf128132e5ccd9bc5a0ae00657d05f13a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 16 Mar 2022 04:05:13 +0100 Subject: [PATCH 247/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 54426f1..1911448 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -141,7 +141,7 @@ openssl1.1.1f-1ubuntu2.11 passwd1:4.8.1-1ubuntu5.20.04.1 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.25.6.5577-c8bd13540 +plexmediaserver1.25.7.5604-980a13e02 procps2:3.3.16-1ubuntu2.3 publicsuffix20200303.0012-1 readline-common8.0-4 From 98f7c965bf476ee63d1e286125420f410e8e8cca Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 24 Mar 2022 04:49:53 -0500 Subject: [PATCH 248/514] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 1911448..7ef6e5d 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -117,7 +117,7 @@ libsmartcols12.34-0.1ubuntu9.3 libsqlite3-03.31.1-4ubuntu0.2 libss21.45.5-2ubuntu1 libssh-40.9.3-2ubuntu2.2 -libssl1.11.1.1f-1ubuntu2.11 +libssl1.11.1.1f-1ubuntu2.12 libstdc++610.3.0-1ubuntu1~20.04 libsystemd0245.4-4ubuntu3.15 libtasn1-64.16.0-2 @@ -137,18 +137,18 @@ mount2.34-0.1ubuntu9.3 ncurses-base6.2-0ubuntu2 ncurses-bin6.2-0ubuntu2 ocl-icd-libopencl12.2.11-1ubuntu1 -openssl1.1.1f-1ubuntu2.11 +openssl1.1.1f-1ubuntu2.12 passwd1:4.8.1-1ubuntu5.20.04.1 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.25.7.5604-980a13e02 +plexmediaserver1.25.8.5663-e071c3d62 procps2:3.3.16-1ubuntu2.3 publicsuffix20200303.0012-1 readline-common8.0-4 sed4.7-1 sensible-utils0.0.12+nmu1 sysvinit-utils2.96-2.1ubuntu1 -tar1.30+dfsg-7ubuntu0.20.04.1 +tar1.30+dfsg-7ubuntu0.20.04.2 tzdata2021e-0ubuntu0.20.04 ubuntu-keyring2020.02.11.4 udev245.4-4ubuntu3.15 From 12e751aac71eb8ca333bf3e322d5256e903b8c4f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 5 Apr 2022 05:58:49 +0200 Subject: [PATCH 249/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 7ef6e5d..7b7fed5 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -149,7 +149,7 @@ sed4.7-1 sensible-utils0.0.12+nmu1 sysvinit-utils2.96-2.1ubuntu1 tar1.30+dfsg-7ubuntu0.20.04.2 -tzdata2021e-0ubuntu0.20.04 +tzdata2022a-0ubuntu0.20.04 ubuntu-keyring2020.02.11.4 udev245.4-4ubuntu3.15 unrar1:5.6.6-2build1 From 2dcb2ab2e80e6baeddc16a85354ae018967d888b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 6 Apr 2022 15:52:35 +0200 Subject: [PATCH 250/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 7b7fed5..225eea8 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -141,7 +141,7 @@ openssl1.1.1f-1ubuntu2.12 passwd1:4.8.1-1ubuntu5.20.04.1 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.25.8.5663-e071c3d62 +plexmediaserver1.25.9.5721-965587f64 procps2:3.3.16-1ubuntu2.3 publicsuffix20200303.0012-1 readline-common8.0-4 From 1db7fcd909bc974a7cb64aa2f0ae4c0a5ce0ef4e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 19 Apr 2022 06:20:40 +0200 Subject: [PATCH 251/514] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 225eea8..460c090 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -122,7 +122,7 @@ libstdc++610.3.0-1ubuntu1~20.04 libsystemd0245.4-4ubuntu3.15 libtasn1-64.16.0-2 libtinfo66.2-0ubuntu2 -libudev1245.4-4ubuntu3.15 +libudev1245.4-4ubuntu3.16 libunistring20.9.10-2 libuuid12.34-0.1ubuntu9.3 libwind0-heimdal7.7.0+dfsg-1ubuntu1 @@ -151,7 +151,7 @@ sysvinit-utils2.96-2.1ubuntu1 tar1.30+dfsg-7ubuntu0.20.04.2 tzdata2022a-0ubuntu0.20.04 ubuntu-keyring2020.02.11.4 -udev245.4-4ubuntu3.15 +udev245.4-4ubuntu3.16 unrar1:5.6.6-2build1 util-linux2.34-0.1ubuntu9.3 wget1.20.3-1ubuntu2 From 0de5813a9b72f6a629788d4ae41bfb647e8aa380 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 21 Apr 2022 16:49:24 +0200 Subject: [PATCH 252/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 460c090..e66eb60 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -141,7 +141,7 @@ openssl1.1.1f-1ubuntu2.12 passwd1:4.8.1-1ubuntu5.20.04.1 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.25.9.5721-965587f64 +plexmediaserver1.26.0.5715-8cf78dab3 procps2:3.3.16-1ubuntu2.3 publicsuffix20200303.0012-1 readline-common8.0-4 From eb174b92caae05d6f059ed1df00b4f71b904a38a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 3 May 2022 06:19:00 +0200 Subject: [PATCH 253/514] Bot Updating Templated Files --- Jenkinsfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6ddbb4b..73d8893 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -345,9 +345,11 @@ pipeline { if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then cd ${TEMPDIR}/unraid/templates/ if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then - echo "Image is on the ignore list, removing Unraid template" - git rm unraid/${CONTAINER_NAME}.xml || : - git commit -m 'Bot Removing Deprecated Unraid Template' || : + echo "Image is on the ignore list, marking Unraid template as deprecated" + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ + git add -u unraid/${CONTAINER_NAME}.xml + git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || : + git commit -m 'Bot Moving Deprecated Unraid Template' || : else cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ git add unraid/${CONTAINER_NAME}.xml From 32342806c20fa1ccdb387f2c290fea1223a469ab Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 3 May 2022 06:20:15 +0200 Subject: [PATCH 254/514] Bot Updating Templated Files --- README.md | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index fa8fbf9..5d18cd6 100644 --- a/README.md +++ b/README.md @@ -46,26 +46,26 @@ Find us at: ## Supported Architectures -Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/). +We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/). -Simply pulling `lscr.io/linuxserver/plex` should retrieve the correct image for your arch, but you can also pull specific arch images via tags. +Simply pulling `lscr.io/linuxserver/plex:latest` should retrieve the correct image for your arch, but you can also pull specific arch images via tags. The architectures supported by this image are: -| Architecture | Tag | -| :----: | --- | -| x86-64 | amd64-latest | -| arm64 | arm64v8-latest | -| armhf | arm32v7-latest | +| Architecture | Available | Tag | +| :----: | :----: | ---- | +| x86-64 | ✅ | amd64-\ | +| arm64 | ✅ | arm64v8-\ | +| armhf| ✅ | arm32v7-\ | ## Version Tags -This image provides various versions that are available via tags. `latest` tag usually provides the latest stable version. Others are considered under development and caution must be exercised when using them. +This image provides various versions that are available via tags. Please read the descriptions carefully and exercise caution when using unstable or development tags. -| Tag | Description | -| :----: | --- | -| latest | Stable releases with Focal baseimage | -| bionic | DEPRECATED - Stable releases with Bionic baseimage | +| Tag | Available | Description | +| :----: | :----: |--- | +| latest | ✅ | Stable releases with Focal baseimage | +| bionic | ✅ | DEPRECATED - Stable releases with Bionic baseimage | ## Application Setup @@ -115,7 +115,7 @@ Here are some example snippets to help you get started creating a container. version: "2.1" services: plex: - image: lscr.io/linuxserver/plex + image: lscr.io/linuxserver/plex:latest container_name: plex network_mode: host environment: @@ -144,7 +144,7 @@ docker run -d \ -v /path/to/tvseries:/tv \ -v /path/to/movies:/movies \ --restart unless-stopped \ - lscr.io/linuxserver/plex + lscr.io/linuxserver/plex:latest ``` ## Parameters @@ -233,7 +233,7 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to * container version number * `docker inspect -f '{{ index .Config.Labels "build_version" }}' plex` * image version number - * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/plex` + * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/plex:latest` ## Updating Info @@ -251,7 +251,7 @@ Below are the instructions for updating containers: ### Via Docker Run -* Update the image: `docker pull lscr.io/linuxserver/plex` +* Update the image: `docker pull lscr.io/linuxserver/plex:latest` * Stop the running container: `docker stop plex` * Delete the container: `docker rm plex` * Recreate a new container with the same docker run parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved) From 8812c6cb7013df4ef2e67cdbbd9e7aa378b6737d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 9 May 2022 22:59:13 -0500 Subject: [PATCH 255/514] Bot Updating Package Versions --- package_versions.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index e66eb60..db375cd 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -8,7 +8,7 @@ bsdutils1:2.34-0.1ubuntu9.3 bzip21.0.8-2 ca-certificates20210119~20.04.2 coreutils8.30-3ubuntu2 -curl7.68.0-1ubuntu2.7 +curl7.68.0-1ubuntu2.10 dash0.5.10.2-6 debconf1.5.73 debianutils4.9.1 @@ -33,8 +33,8 @@ grep3.4-1 gzip1.10-0ubuntu4 hostname3.23 init-system-helpers1.57 -intel-igc-cm1.0.97+i643~u20.04 -intel-opencl-icd21.49.21786+i643~u20.04 +intel-igc-cm1.0.128+i699~u20.04 +intel-opencl-icd22.10.22597+i699~u20.04 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 @@ -52,7 +52,7 @@ libcap-ng00.7.9-2.1build1 libc-bin2.31-0ubuntu9.7 libcom-err21.45.5-2ubuntu1 libcrypt11:4.4.10-10ubuntu4 -libcurl47.68.0-1ubuntu2.7 +libcurl47.68.0-1ubuntu2.10 libdb5.35.3.28+dfsg1-0.6ubuntu2 libdebconfclient00.251ubuntu1 libext2fs21.45.5-2ubuntu1 @@ -71,9 +71,9 @@ libheimntlm0-heimdal7.7.0+dfsg-1ubuntu1 libhogweed53.5.1+really3.5.1-2ubuntu0.2 libhx509-5-heimdal7.7.0+dfsg-1ubuntu1 libidn2-02.2.0-2 -libigc11.0.9441+i643~u20.04 -libigdfcl11.0.9441+i643~u20.04 -libigdgmm1121.3.3+i643~u20.04 +libigc11.0.10409+i699~u20.04 +libigdfcl11.0.10409+i699~u20.04 +libigdgmm1222.0.3+i699~u20.04 libjq11.6-1ubuntu0.20.04.1 libk5crypto31.17-6ubuntu4.1 libkeyutils11.6-6ubuntu1 From 5cd2ec48281cbd98157b4a92ea090f5920020da3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 16 May 2022 17:55:18 +0200 Subject: [PATCH 256/514] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index db375cd..8823937 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -114,15 +114,15 @@ libsemanage13.0-1build2 libsemanage-common3.0-1build2 libsepol13.0-1 libsmartcols12.34-0.1ubuntu9.3 -libsqlite3-03.31.1-4ubuntu0.2 +libsqlite3-03.31.1-4ubuntu0.3 libss21.45.5-2ubuntu1 libssh-40.9.3-2ubuntu2.2 -libssl1.11.1.1f-1ubuntu2.12 +libssl1.11.1.1f-1ubuntu2.13 libstdc++610.3.0-1ubuntu1~20.04 libsystemd0245.4-4ubuntu3.15 libtasn1-64.16.0-2 libtinfo66.2-0ubuntu2 -libudev1245.4-4ubuntu3.16 +libudev1245.4-4ubuntu3.17 libunistring20.9.10-2 libuuid12.34-0.1ubuntu9.3 libwind0-heimdal7.7.0+dfsg-1ubuntu1 @@ -137,11 +137,11 @@ mount2.34-0.1ubuntu9.3 ncurses-base6.2-0ubuntu2 ncurses-bin6.2-0ubuntu2 ocl-icd-libopencl12.2.11-1ubuntu1 -openssl1.1.1f-1ubuntu2.12 +openssl1.1.1f-1ubuntu2.13 passwd1:4.8.1-1ubuntu5.20.04.1 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.26.0.5715-8cf78dab3 +plexmediaserver1.26.1.5798-99a4a6ac9 procps2:3.3.16-1ubuntu2.3 publicsuffix20200303.0012-1 readline-common8.0-4 @@ -151,7 +151,7 @@ sysvinit-utils2.96-2.1ubuntu1 tar1.30+dfsg-7ubuntu0.20.04.2 tzdata2022a-0ubuntu0.20.04 ubuntu-keyring2020.02.11.4 -udev245.4-4ubuntu3.16 +udev245.4-4ubuntu3.17 unrar1:5.6.6-2build1 util-linux2.34-0.1ubuntu9.3 wget1.20.3-1ubuntu2 From 36ba76633189862b341562e1adf0d5878624677b Mon Sep 17 00:00:00 2001 From: aptalca Date: Mon, 16 May 2022 20:50:41 -0400 Subject: [PATCH 257/514] pin opencl version --- Dockerfile | 2 +- README.md | 1 + readme-vars.yml | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4892a22..b2ef6ce 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,7 +29,7 @@ RUN \ apt-get update && \ apt-get install -y \ jq \ - intel-opencl-icd \ + intel-opencl-icd=21.49.21786+i643~u20.04 \ udev \ unrar \ wget && \ diff --git a/README.md b/README.md index 5d18cd6..295f394 100644 --- a/README.md +++ b/README.md @@ -299,6 +299,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **16.05.22:** - Pin opencl version. * **04.03.22:** - Increase verbosity of video device permissions fix, attempt to fix missing group rw. * **25.12.21:** - Install Intel drivers from the official repo. * **20.01.21:** - Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information. diff --git a/readme-vars.yml b/readme-vars.yml index 2c39ad4..5bf8d14 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -107,6 +107,7 @@ app_setup_block: | # changelog changelogs: + - { date: "16.05.22:", desc: "Pin opencl version." } - { date: "04.03.22:", desc: "Increase verbosity of video device permissions fix, attempt to fix missing group rw." } - { date: "25.12.21:", desc: "Install Intel drivers from the official repo." } - { date: "20.01.21:", desc: "Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information." } From 890235034330d6da9631848954b505464f5c4186 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 17 May 2022 03:10:45 +0200 Subject: [PATCH 258/514] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 8823937..04d1c21 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -34,7 +34,7 @@ gzip1.10-0ubuntu4 hostname3.23 init-system-helpers1.57 intel-igc-cm1.0.128+i699~u20.04 -intel-opencl-icd22.10.22597+i699~u20.04 +intel-opencl-icd21.49.21786+i643~u20.04 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 @@ -73,7 +73,7 @@ libhx509-5-heimdal7.7.0+dfsg-1ubuntu1 libidn2-02.2.0-2 libigc11.0.10409+i699~u20.04 libigdfcl11.0.10409+i699~u20.04 -libigdgmm1222.0.3+i699~u20.04 +libigdgmm1121.3.3+i643~u20.04 libjq11.6-1ubuntu0.20.04.1 libk5crypto31.17-6ubuntu4.1 libkeyutils11.6-6ubuntu1 From 2c5d7b0a43c2a93f730d35ad56daaef1cd031ee2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 23 May 2022 23:21:22 -0500 Subject: [PATCH 259/514] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 04d1c21..4007414 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -8,7 +8,7 @@ bsdutils1:2.34-0.1ubuntu9.3 bzip21.0.8-2 ca-certificates20210119~20.04.2 coreutils8.30-3ubuntu2 -curl7.68.0-1ubuntu2.10 +curl7.68.0-1ubuntu2.11 dash0.5.10.2-6 debconf1.5.73 debianutils4.9.1 @@ -33,7 +33,7 @@ grep3.4-1 gzip1.10-0ubuntu4 hostname3.23 init-system-helpers1.57 -intel-igc-cm1.0.128+i699~u20.04 +intel-igc-cm1.0.128+i699.3~u20.04 intel-opencl-icd21.49.21786+i643~u20.04 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 @@ -52,7 +52,7 @@ libcap-ng00.7.9-2.1build1 libc-bin2.31-0ubuntu9.7 libcom-err21.45.5-2ubuntu1 libcrypt11:4.4.10-10ubuntu4 -libcurl47.68.0-1ubuntu2.10 +libcurl47.68.0-1ubuntu2.11 libdb5.35.3.28+dfsg1-0.6ubuntu2 libdebconfclient00.251ubuntu1 libext2fs21.45.5-2ubuntu1 @@ -71,8 +71,8 @@ libheimntlm0-heimdal7.7.0+dfsg-1ubuntu1 libhogweed53.5.1+really3.5.1-2ubuntu0.2 libhx509-5-heimdal7.7.0+dfsg-1ubuntu1 libidn2-02.2.0-2 -libigc11.0.10409+i699~u20.04 -libigdfcl11.0.10409+i699~u20.04 +libigc11.0.10409+i699.3~u20.04 +libigdfcl11.0.10409+i699.3~u20.04 libigdgmm1121.3.3+i643~u20.04 libjq11.6-1ubuntu0.20.04.1 libk5crypto31.17-6ubuntu4.1 @@ -128,7 +128,7 @@ libuuid12.34-0.1ubuntu9.3 libwind0-heimdal7.7.0+dfsg-1ubuntu1 libz3-44.8.7-4build1 libzstd11.4.4+dfsg-3ubuntu0.1 -locales2.31-0ubuntu9.7 +locales2.31-0ubuntu9.9 login1:4.8.1-1ubuntu5.20.04.1 logsave1.45.5-2ubuntu1 lsb-base11.1.0ubuntu2 From 653dc58bddec38ddfe8a38f0424dd928fffd14f2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 24 May 2022 19:06:29 +0200 Subject: [PATCH 260/514] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 4007414..778759f 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,6 +1,6 @@ adduser3.118ubuntu2 -apt2.0.6 -apt-utils2.0.6 +apt2.0.8 +apt-utils2.0.8 base-files11ubuntu5.5 base-passwd3.5.47 bash5.0-6ubuntu1.1 @@ -38,7 +38,7 @@ intel-opencl-icd21.49.21786+i643~u20.04 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 -libapt-pkg6.02.0.6 +libapt-pkg6.02.0.8 libasn1-8-heimdal7.7.0+dfsg-1ubuntu1 libassuan02.5.3-7ubuntu2 libattr11:2.4.48-5 @@ -82,8 +82,8 @@ libkrb5-26-heimdal7.7.0+dfsg-1ubuntu1 libkrb5-31.17-6ubuntu4.1 libkrb5support01.17-6ubuntu4.1 libksba81.3.5-2 -libldap-2.4-22.4.49+dfsg-2ubuntu1.8 -libldap-common2.4.49+dfsg-2ubuntu1.8 +libldap-2.4-22.4.49+dfsg-2ubuntu1.9 +libldap-common2.4.49+dfsg-2ubuntu1.9 liblz4-11.9.2-2ubuntu0.20.04.1 liblzma55.2.4-1ubuntu1 libmount12.34-0.1ubuntu9.3 @@ -141,7 +141,7 @@ openssl1.1.1f-1ubuntu2.13 passwd1:4.8.1-1ubuntu5.20.04.1 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.26.1.5798-99a4a6ac9 +plexmediaserver1.26.2.5797-5bd057d2b procps2:3.3.16-1ubuntu2.3 publicsuffix20200303.0012-1 readline-common8.0-4 From 7baf705b9cfeb63e1e4bb3134c9550d209822721 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 31 May 2022 06:21:35 +0200 Subject: [PATCH 261/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 778759f..71fcd43 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -77,7 +77,7 @@ libigdgmm1121.3.3+i643~u20.04 libjq11.6-1ubuntu0.20.04.1 libk5crypto31.17-6ubuntu4.1 libkeyutils11.6-6ubuntu1 -libkmod227-1ubuntu2 +libkmod227-1ubuntu2.1 libkrb5-26-heimdal7.7.0+dfsg-1ubuntu1 libkrb5-31.17-6ubuntu4.1 libkrb5support01.17-6ubuntu4.1 From f2b2b877b59b5898ce2ef31cf4574e224296c950 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 13 Jun 2022 23:39:29 -0500 Subject: [PATCH 262/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 71fcd43..e22c57a 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -76,7 +76,7 @@ libigdfcl11.0.10409+i699.3~u20.04 libigdgmm1121.3.3+i643~u20.04 libjq11.6-1ubuntu0.20.04.1 libk5crypto31.17-6ubuntu4.1 -libkeyutils11.6-6ubuntu1 +libkeyutils11.6-6ubuntu1.1 libkmod227-1ubuntu2.1 libkrb5-26-heimdal7.7.0+dfsg-1ubuntu1 libkrb5-31.17-6ubuntu4.1 From 64d7e31e0e0259a12bc1b2a8ce766dc9edc5f8df Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 14 Jun 2022 15:55:25 +0200 Subject: [PATCH 263/514] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index e22c57a..55ca018 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -6,7 +6,7 @@ base-passwd3.5.47 bash5.0-6ubuntu1.1 bsdutils1:2.34-0.1ubuntu9.3 bzip21.0.8-2 -ca-certificates20210119~20.04.2 +ca-certificates20211016~20.04.1 coreutils8.30-3ubuntu2 curl7.68.0-1ubuntu2.11 dash0.5.10.2-6 @@ -141,7 +141,7 @@ openssl1.1.1f-1ubuntu2.13 passwd1:4.8.1-1ubuntu5.20.04.1 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.26.2.5797-5bd057d2b +plexmediaserver1.27.0.5897-3940636f2 procps2:3.3.16-1ubuntu2.3 publicsuffix20200303.0012-1 readline-common8.0-4 From 29968a8d1c09cfea1ec415465ea25fc42855e973 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 23 Jun 2022 16:49:46 +0200 Subject: [PATCH 264/514] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 55ca018..f87b432 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,6 +1,6 @@ adduser3.118ubuntu2 -apt2.0.8 -apt-utils2.0.8 +apt2.0.9 +apt-utils2.0.9 base-files11ubuntu5.5 base-passwd3.5.47 bash5.0-6ubuntu1.1 @@ -38,7 +38,7 @@ intel-opencl-icd21.49.21786+i643~u20.04 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 -libapt-pkg6.02.0.8 +libapt-pkg6.02.0.9 libasn1-8-heimdal7.7.0+dfsg-1ubuntu1 libassuan02.5.3-7ubuntu2 libattr11:2.4.48-5 @@ -141,7 +141,7 @@ openssl1.1.1f-1ubuntu2.13 passwd1:4.8.1-1ubuntu5.20.04.1 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.27.0.5897-3940636f2 +plexmediaserver1.27.1.5916-6b0e31a64 procps2:3.3.16-1ubuntu2.3 publicsuffix20200303.0012-1 readline-common8.0-4 From d2303e43053c73eb586fe85a69acfbf8deabb6bc Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 5 Jul 2022 06:26:29 +0200 Subject: [PATCH 265/514] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index f87b432..3d8613d 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -8,7 +8,7 @@ bsdutils1:2.34-0.1ubuntu9.3 bzip21.0.8-2 ca-certificates20211016~20.04.1 coreutils8.30-3ubuntu2 -curl7.68.0-1ubuntu2.11 +curl7.68.0-1ubuntu2.12 dash0.5.10.2-6 debconf1.5.73 debianutils4.9.1 @@ -52,7 +52,7 @@ libcap-ng00.7.9-2.1build1 libc-bin2.31-0ubuntu9.7 libcom-err21.45.5-2ubuntu1 libcrypt11:4.4.10-10ubuntu4 -libcurl47.68.0-1ubuntu2.11 +libcurl47.68.0-1ubuntu2.12 libdb5.35.3.28+dfsg1-0.6ubuntu2 libdebconfclient00.251ubuntu1 libext2fs21.45.5-2ubuntu1 @@ -117,7 +117,7 @@ libsmartcols12.34-0.1ubuntu9.3 libsqlite3-03.31.1-4ubuntu0.3 libss21.45.5-2ubuntu1 libssh-40.9.3-2ubuntu2.2 -libssl1.11.1.1f-1ubuntu2.13 +libssl1.11.1.1f-1ubuntu2.15 libstdc++610.3.0-1ubuntu1~20.04 libsystemd0245.4-4ubuntu3.15 libtasn1-64.16.0-2 @@ -137,7 +137,7 @@ mount2.34-0.1ubuntu9.3 ncurses-base6.2-0ubuntu2 ncurses-bin6.2-0ubuntu2 ocl-icd-libopencl12.2.11-1ubuntu1 -openssl1.1.1f-1ubuntu2.13 +openssl1.1.1f-1ubuntu2.15 passwd1:4.8.1-1ubuntu5.20.04.1 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 From 62410eb7f7f989e75eadb40d19b76fe02fc13d22 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 5 Jul 2022 13:55:26 -0500 Subject: [PATCH 266/514] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 3d8613d..4a21f66 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -33,7 +33,7 @@ grep3.4-1 gzip1.10-0ubuntu4 hostname3.23 init-system-helpers1.57 -intel-igc-cm1.0.128+i699.3~u20.04 +intel-igc-cm1.0.160+i755~u20.04 intel-opencl-icd21.49.21786+i643~u20.04 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 @@ -71,8 +71,8 @@ libheimntlm0-heimdal7.7.0+dfsg-1ubuntu1 libhogweed53.5.1+really3.5.1-2ubuntu0.2 libhx509-5-heimdal7.7.0+dfsg-1ubuntu1 libidn2-02.2.0-2 -libigc11.0.10409+i699.3~u20.04 -libigdfcl11.0.10409+i699.3~u20.04 +libigc11.0.11378+i755~u20.04 +libigdfcl11.0.11378+i755~u20.04 libigdgmm1121.3.3+i643~u20.04 libjq11.6-1ubuntu0.20.04.1 libk5crypto31.17-6ubuntu4.1 @@ -141,7 +141,7 @@ openssl1.1.1f-1ubuntu2.15 passwd1:4.8.1-1ubuntu5.20.04.1 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.27.1.5916-6b0e31a64 +plexmediaserver1.27.2.5929-a806c5905 procps2:3.3.16-1ubuntu2.3 publicsuffix20200303.0012-1 readline-common8.0-4 From ad471a1057ad22d9b271505784300b5425490aed Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 12 Jul 2022 06:49:24 +0200 Subject: [PATCH 267/514] Bot Updating Package Versions --- package_versions.txt | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 4a21f66..54421a7 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -13,22 +13,22 @@ dash0.5.10.2-6 debconf1.5.73 debianutils4.9.1 diffutils1:3.7-3 -dirmngr2.2.19-3ubuntu2.1 +dirmngr2.2.19-3ubuntu2.2 dpkg1.19.7ubuntu3 e2fsprogs1.45.5-2ubuntu1 fdisk2.34-0.1ubuntu9.3 findutils4.7.0-1ubuntu1 gcc-10-base10.3.0-1ubuntu1~20.04 -gnupg2.2.19-3ubuntu2.1 -gnupg-l10n2.2.19-3ubuntu2.1 -gnupg-utils2.2.19-3ubuntu2.1 -gpg2.2.19-3ubuntu2.1 -gpg-agent2.2.19-3ubuntu2.1 -gpgconf2.2.19-3ubuntu2.1 -gpgsm2.2.19-3ubuntu2.1 -gpgv2.2.19-3ubuntu2.1 -gpg-wks-client2.2.19-3ubuntu2.1 -gpg-wks-server2.2.19-3ubuntu2.1 +gnupg2.2.19-3ubuntu2.2 +gnupg-l10n2.2.19-3ubuntu2.2 +gnupg-utils2.2.19-3ubuntu2.2 +gpg2.2.19-3ubuntu2.2 +gpg-agent2.2.19-3ubuntu2.2 +gpgconf2.2.19-3ubuntu2.2 +gpgsm2.2.19-3ubuntu2.2 +gpgv2.2.19-3ubuntu2.2 +gpg-wks-client2.2.19-3ubuntu2.2 +gpg-wks-server2.2.19-3ubuntu2.2 grep3.4-1 gzip1.10-0ubuntu4 hostname3.23 @@ -117,7 +117,7 @@ libsmartcols12.34-0.1ubuntu9.3 libsqlite3-03.31.1-4ubuntu0.3 libss21.45.5-2ubuntu1 libssh-40.9.3-2ubuntu2.2 -libssl1.11.1.1f-1ubuntu2.15 +libssl1.11.1.1f-1ubuntu2.16 libstdc++610.3.0-1ubuntu1~20.04 libsystemd0245.4-4ubuntu3.15 libtasn1-64.16.0-2 @@ -137,7 +137,7 @@ mount2.34-0.1ubuntu9.3 ncurses-base6.2-0ubuntu2 ncurses-bin6.2-0ubuntu2 ocl-icd-libopencl12.2.11-1ubuntu1 -openssl1.1.1f-1ubuntu2.15 +openssl1.1.1f-1ubuntu2.16 passwd1:4.8.1-1ubuntu5.20.04.1 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 From 1506ab201128940070dc0ddd60abac664bcb5a7f Mon Sep 17 00:00:00 2001 From: aptalca Date: Mon, 18 Jul 2022 10:07:39 -0400 Subject: [PATCH 268/514] pin all opencl related driver packages --- Dockerfile | 3 +++ README.md | 1 + readme-vars.yml | 1 + 3 files changed, 5 insertions(+) diff --git a/Dockerfile b/Dockerfile index b2ef6ce..1d54f7f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,7 +29,10 @@ RUN \ apt-get update && \ apt-get install -y \ jq \ + intel-igc-cm=1.0.128+i699.3~u20.04 \ intel-opencl-icd=21.49.21786+i643~u20.04 \ + libigdfcl1=1.0.10409+i699.3~u20.04 \ + libigdgmm11=21.3.3+i643~u20.04 \ udev \ unrar \ wget && \ diff --git a/README.md b/README.md index 295f394..b471958 100644 --- a/README.md +++ b/README.md @@ -299,6 +299,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **18.07.22:** - Pin all opencl related driver packages. * **16.05.22:** - Pin opencl version. * **04.03.22:** - Increase verbosity of video device permissions fix, attempt to fix missing group rw. * **25.12.21:** - Install Intel drivers from the official repo. diff --git a/readme-vars.yml b/readme-vars.yml index 5bf8d14..dc0718d 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -107,6 +107,7 @@ app_setup_block: | # changelog changelogs: + - { date: "18.07.22:", desc: "Pin all opencl related driver packages." } - { date: "16.05.22:", desc: "Pin opencl version." } - { date: "04.03.22:", desc: "Increase verbosity of video device permissions fix, attempt to fix missing group rw." } - { date: "25.12.21:", desc: "Install Intel drivers from the official repo." } From f2325f30fecb4f8da1c599969821ff85045ee557 Mon Sep 17 00:00:00 2001 From: aptalca Date: Mon, 18 Jul 2022 10:17:18 -0400 Subject: [PATCH 269/514] update formatting --- Dockerfile | 80 ++++++++--------- Dockerfile.aarch64 | 66 +++++++------- Dockerfile.armhf | 66 +++++++------- root/etc/cont-init.d/40-chown-files | 18 ++-- root/etc/cont-init.d/45-plex-claim | 130 ++++++++++++++-------------- root/etc/cont-init.d/60-plex-update | 78 ++++++++--------- root/etc/services.d/plex/run | 10 +-- 7 files changed, 221 insertions(+), 227 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1d54f7f..2136218 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,48 +12,48 @@ ENV NVIDIA_DRIVER_CAPABILITIES="compute,video,utility" # global environment settings ENV DEBIAN_FRONTEND="noninteractive" \ -PLEX_DOWNLOAD="https://downloads.plex.tv/plex-media-server-new" \ -PLEX_ARCH="amd64" \ -PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR="/config/Library/Application Support" \ -PLEX_MEDIA_SERVER_HOME="/usr/lib/plexmediaserver" \ -PLEX_MEDIA_SERVER_MAX_PLUGIN_PROCS="6" \ -PLEX_MEDIA_SERVER_USER="abc" \ -PLEX_MEDIA_SERVER_INFO_VENDOR="Docker" \ -PLEX_MEDIA_SERVER_INFO_DEVICE="Docker Container (LinuxServer.io)" + PLEX_DOWNLOAD="https://downloads.plex.tv/plex-media-server-new" \ + PLEX_ARCH="amd64" \ + PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR="/config/Library/Application Support" \ + PLEX_MEDIA_SERVER_HOME="/usr/lib/plexmediaserver" \ + PLEX_MEDIA_SERVER_MAX_PLUGIN_PROCS="6" \ + PLEX_MEDIA_SERVER_USER="abc" \ + PLEX_MEDIA_SERVER_INFO_VENDOR="Docker" \ + PLEX_MEDIA_SERVER_INFO_DEVICE="Docker Container (LinuxServer.io)" RUN \ - echo "**** add Intel repo ****" && \ - curl -sL https://repositories.intel.com/graphics/intel-graphics.key | apt-key add - && \ - echo 'deb [arch=amd64] https://repositories.intel.com/graphics/ubuntu focal main' > /etc/apt/sources.list.d/intel.list && \ - echo "**** install runtime packages ****" && \ - apt-get update && \ - apt-get install -y \ - jq \ - intel-igc-cm=1.0.128+i699.3~u20.04 \ - intel-opencl-icd=21.49.21786+i643~u20.04 \ - libigdfcl1=1.0.10409+i699.3~u20.04 \ - libigdgmm11=21.3.3+i643~u20.04 \ - 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'); \ - fi && \ - curl -o \ - /tmp/plexmediaserver.deb -L \ - "${PLEX_DOWNLOAD}/${PLEX_RELEASE}/debian/plexmediaserver_${PLEX_RELEASE}_${PLEX_ARCH}.deb" && \ - dpkg -i /tmp/plexmediaserver.deb && \ - echo "**** ensure abc user's home folder is /app ****" && \ - usermod -d /app abc && \ - echo "**** cleanup ****" && \ - apt-get clean && \ - rm -rf \ - /etc/default/plexmediaserver \ - /tmp/* \ - /var/lib/apt/lists/* \ - /var/tmp/* + echo "**** add Intel repo ****" && \ + curl -sL https://repositories.intel.com/graphics/intel-graphics.key | apt-key add - && \ + echo 'deb [arch=amd64] https://repositories.intel.com/graphics/ubuntu focal main' > /etc/apt/sources.list.d/intel.list && \ + echo "**** install runtime packages ****" && \ + apt-get update && \ + apt-get install -y \ + jq \ + intel-igc-cm=1.0.128+i699.3~u20.04 \ + intel-opencl-icd=21.49.21786+i643~u20.04 \ + libigdfcl1=1.0.10409+i699.3~u20.04 \ + libigdgmm11=21.3.3+i643~u20.04 \ + 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'); \ + fi && \ + curl -o \ + /tmp/plexmediaserver.deb -L \ + "${PLEX_DOWNLOAD}/${PLEX_RELEASE}/debian/plexmediaserver_${PLEX_RELEASE}_${PLEX_ARCH}.deb" && \ + dpkg -i /tmp/plexmediaserver.deb && \ + echo "**** ensure abc user's home folder is /app ****" && \ + usermod -d /app abc && \ + echo "**** cleanup ****" && \ + apt-get clean && \ + rm -rf \ + /etc/default/plexmediaserver \ + /tmp/* \ + /var/lib/apt/lists/* \ + /var/tmp/* # add local files COPY root/ / diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 1fe09cb..ffe9a7a 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -9,41 +9,41 @@ LABEL maintainer="thelamer" # global environment settings ENV DEBIAN_FRONTEND="noninteractive" \ -PLEX_DOWNLOAD="https://downloads.plex.tv/plex-media-server-new" \ -PLEX_ARCH="arm64" \ -PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR="/config/Library/Application Support" \ -PLEX_MEDIA_SERVER_HOME="/usr/lib/plexmediaserver" \ -PLEX_MEDIA_SERVER_MAX_PLUGIN_PROCS="6" \ -PLEX_MEDIA_SERVER_USER="abc" \ -PLEX_MEDIA_SERVER_INFO_VENDOR="Docker" \ -PLEX_MEDIA_SERVER_INFO_DEVICE="Docker Container (LinuxServer.io)" + PLEX_DOWNLOAD="https://downloads.plex.tv/plex-media-server-new" \ + PLEX_ARCH="arm64" \ + PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR="/config/Library/Application Support" \ + PLEX_MEDIA_SERVER_HOME="/usr/lib/plexmediaserver" \ + PLEX_MEDIA_SERVER_MAX_PLUGIN_PROCS="6" \ + PLEX_MEDIA_SERVER_USER="abc" \ + PLEX_MEDIA_SERVER_INFO_VENDOR="Docker" \ + PLEX_MEDIA_SERVER_INFO_DEVICE="Docker Container (LinuxServer.io)" 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'); \ - fi && \ - curl -o \ - /tmp/plexmediaserver.deb -L \ - "${PLEX_DOWNLOAD}/${PLEX_RELEASE}/debian/plexmediaserver_${PLEX_RELEASE}_${PLEX_ARCH}.deb" && \ - dpkg -i /tmp/plexmediaserver.deb && \ - echo "**** ensure abc user's home folder is /app ****" && \ - usermod -d /app abc && \ - echo "**** cleanup ****" && \ - apt-get clean && \ - rm -rf \ - /etc/default/plexmediaserver \ - /tmp/* \ - /var/lib/apt/lists/* \ - /var/tmp/* + 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'); \ + fi && \ + curl -o \ + /tmp/plexmediaserver.deb -L \ + "${PLEX_DOWNLOAD}/${PLEX_RELEASE}/debian/plexmediaserver_${PLEX_RELEASE}_${PLEX_ARCH}.deb" && \ + dpkg -i /tmp/plexmediaserver.deb && \ + echo "**** ensure abc user's home folder is /app ****" && \ + usermod -d /app abc && \ + echo "**** cleanup ****" && \ + apt-get clean && \ + rm -rf \ + /etc/default/plexmediaserver \ + /tmp/* \ + /var/lib/apt/lists/* \ + /var/tmp/* # add local files COPY root/ / diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 2c56acb..e4ce32e 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -9,41 +9,41 @@ LABEL maintainer="thelamer" # global environment settings ENV DEBIAN_FRONTEND="noninteractive" \ -PLEX_DOWNLOAD="https://downloads.plex.tv/plex-media-server-new" \ -PLEX_ARCH="armhf" \ -PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR="/config/Library/Application Support" \ -PLEX_MEDIA_SERVER_HOME="/usr/lib/plexmediaserver" \ -PLEX_MEDIA_SERVER_MAX_PLUGIN_PROCS="6" \ -PLEX_MEDIA_SERVER_USER="abc" \ -PLEX_MEDIA_SERVER_INFO_VENDOR="Docker" \ -PLEX_MEDIA_SERVER_INFO_DEVICE="Docker Container (LinuxServer.io)" + PLEX_DOWNLOAD="https://downloads.plex.tv/plex-media-server-new" \ + PLEX_ARCH="armhf" \ + PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR="/config/Library/Application Support" \ + PLEX_MEDIA_SERVER_HOME="/usr/lib/plexmediaserver" \ + PLEX_MEDIA_SERVER_MAX_PLUGIN_PROCS="6" \ + PLEX_MEDIA_SERVER_USER="abc" \ + PLEX_MEDIA_SERVER_INFO_VENDOR="Docker" \ + PLEX_MEDIA_SERVER_INFO_DEVICE="Docker Container (LinuxServer.io)" 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'); \ - fi && \ - curl -o \ - /tmp/plexmediaserver.deb -L \ - "${PLEX_DOWNLOAD}/${PLEX_RELEASE}/debian/plexmediaserver_${PLEX_RELEASE}_${PLEX_ARCH}.deb" && \ - dpkg -i /tmp/plexmediaserver.deb && \ - echo "**** ensure abc user's home folder is /app ****" && \ - usermod -d /app abc && \ - echo "**** cleanup ****" && \ - apt-get clean && \ - rm -rf \ - /etc/default/plexmediaserver \ - /tmp/* \ - /var/lib/apt/lists/* \ - /var/tmp/* + 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'); \ + fi && \ + curl -o \ + /tmp/plexmediaserver.deb -L \ + "${PLEX_DOWNLOAD}/${PLEX_RELEASE}/debian/plexmediaserver_${PLEX_RELEASE}_${PLEX_ARCH}.deb" && \ + dpkg -i /tmp/plexmediaserver.deb && \ + echo "**** ensure abc user's home folder is /app ****" && \ + usermod -d /app abc && \ + echo "**** cleanup ****" && \ + apt-get clean && \ + rm -rf \ + /etc/default/plexmediaserver \ + /tmp/* \ + /var/lib/apt/lists/* \ + /var/tmp/* # add local files COPY root/ / diff --git a/root/etc/cont-init.d/40-chown-files b/root/etc/cont-init.d/40-chown-files index 12b63b4..b2e3c31 100644 --- a/root/etc/cont-init.d/40-chown-files +++ b/root/etc/cont-init.d/40-chown-files @@ -2,24 +2,24 @@ # create folders if [ ! -d "${PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR}" ]; then \ -mkdir -p "${PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR}" -chown -R abc:abc /config + mkdir -p "${PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR}" + chown -R abc:abc /config fi # check Library permissions PUID=${PUID:-911} if [ ! "$(stat -c %u /config/Library)" = "$PUID" ]; then - echo "Change in ownership detected, please be patient while we chown existing files" - echo "This could take some time" - chown abc:abc -R \ - /config/Library + echo "Change in ownership detected, please be patient while we chown existing files" + echo "This could take some time" + chown abc:abc -R \ + /config/Library fi # remove plex pid after unclean stop [[ -f "/config/Library/Application Support/Plex Media Server/plexmediaserver.pid" ]] && \ - rm -f "/config/Library/Application Support/Plex Media Server/plexmediaserver.pid" +rm -f "/config/Library/Application Support/Plex Media Server/plexmediaserver.pid" # permissions (non-recursive) on config root and folders chown abc:abc \ - /config \ - /config/* + /config \ + /config/* diff --git a/root/etc/cont-init.d/45-plex-claim b/root/etc/cont-init.d/45-plex-claim index 6c546bf..7841f54 100644 --- a/root/etc/cont-init.d/45-plex-claim +++ b/root/etc/cont-init.d/45-plex-claim @@ -1,79 +1,79 @@ #!/usr/bin/with-contenv bash if grep -qs "PlexOnlineToken" "/config/Library/Application Support/Plex Media Server/Preferences.xml" || [ -z "$PLEX_CLAIM" ]; then - exit 0 + exit 0 fi PREFNAME="/config/Library/Application Support/Plex Media Server/Preferences.xml" if [ ! -f "${PREFNAME}" ]; then - UMASK_SET="${UMASK_SET:-022}" - umask "$UMASK_SET" - echo "Temporarily starting Plex Media Server." - export PLEX_MEDIA_SERVER_INFO_MODEL=$(uname -m) - export PLEX_MEDIA_SERVER_INFO_PLATFORM_VERSION=$(uname -r) - s6-setuidgid abc /bin/bash -c \ - 'LD_LIBRARY_PATH=/usr/lib/plexmediaserver:/usr/lib/plexmediaserver/lib /usr/lib/plexmediaserver/Plex\ Media\ Server' & PID=$! - echo "Waiting for Plex to generate its config" - DBNAME="/config/Library/Application Support/Plex Media Server/Plug-in Support/Databases/com.plexapp.plugins.library.db-wal" - until [ -f "${DBNAME}" ]; do - sleep 1 - done - while true; do - echo "Waiting for database creation to complete..." - if [ -z "${COMPARE_MD5+x}" ]; then - COMPARE_MD5=$(md5sum "${DBNAME}"| cut -c1-8) - sleep 3 - else - sleep 3 - CURRENT_MD5=$(md5sum "${DBNAME}"| cut -c1-8) - if [ "${CURRENT_MD5}" == "${COMPARE_MD5}" ]; then - break - else - COMPARE_MD5=$(md5sum "${DBNAME}"| cut -c1-8) - fi - fi - done - until grep -qs "ProcessedMachineIdentifier" "${PREFNAME}"; do - sleep 1 - done - while true; do - echo "Waiting for pref file creation to complete..." - if [ -z "${PREF_COMPARE_MD5+x}" ]; then - PREF_COMPARE_MD5=$(md5sum "${PREFNAME}"| cut -c1-8) - sleep 3 - else - sleep 3 - PREF_CURRENT_MD5=$(md5sum "${PREFNAME}"| cut -c1-8) - if [ "${PREF_CURRENT_MD5}" == "${PREF_COMPARE_MD5}" ]; then - break - else - PREF_COMPARE_MD5=$(md5sum "${PREFNAME}"| cut -c1-8) - fi - fi - done - echo "Stopping Plex to claim server" - while ps -p $PID > /dev/null; do - kill $PID - sleep 1 - done - echo "Plex stopped" + UMASK_SET="${UMASK_SET:-022}" + umask "$UMASK_SET" + echo "Temporarily starting Plex Media Server." + export PLEX_MEDIA_SERVER_INFO_MODEL=$(uname -m) + export PLEX_MEDIA_SERVER_INFO_PLATFORM_VERSION=$(uname -r) + s6-setuidgid abc /bin/bash -c \ + 'LD_LIBRARY_PATH=/usr/lib/plexmediaserver:/usr/lib/plexmediaserver/lib /usr/lib/plexmediaserver/Plex\ Media\ Server' & PID=$! + echo "Waiting for Plex to generate its config" + DBNAME="/config/Library/Application Support/Plex Media Server/Plug-in Support/Databases/com.plexapp.plugins.library.db-wal" + until [ -f "${DBNAME}" ]; do + sleep 1 + done + while true; do + echo "Waiting for database creation to complete..." + if [ -z "${COMPARE_MD5+x}" ]; then + COMPARE_MD5=$(md5sum "${DBNAME}"| cut -c1-8) + sleep 3 + else + sleep 3 + CURRENT_MD5=$(md5sum "${DBNAME}"| cut -c1-8) + if [ "${CURRENT_MD5}" == "${COMPARE_MD5}" ]; then + break + else + COMPARE_MD5=$(md5sum "${DBNAME}"| cut -c1-8) + fi + fi + done + until grep -qs "ProcessedMachineIdentifier" "${PREFNAME}"; do + sleep 1 + done + while true; do + echo "Waiting for pref file creation to complete..." + if [ -z "${PREF_COMPARE_MD5+x}" ]; then + PREF_COMPARE_MD5=$(md5sum "${PREFNAME}"| cut -c1-8) + sleep 3 + else + sleep 3 + PREF_CURRENT_MD5=$(md5sum "${PREFNAME}"| cut -c1-8) + if [ "${PREF_CURRENT_MD5}" == "${PREF_COMPARE_MD5}" ]; then + break + else + PREF_COMPARE_MD5=$(md5sum "${PREFNAME}"| cut -c1-8) + fi + fi + done + echo "Stopping Plex to claim server" + while ps -p $PID > /dev/null; do + kill $PID + sleep 1 + done + echo "Plex stopped" fi ProcessedMachineIdentifier=$(sed -n "s/^.*ProcessedMachineIdentifier=\"\([^\"]*\)\".*$/\1/p" "${PREFNAME}") PlexOnlineToken="$(curl -X POST \ - -H 'X-Plex-Client-Identifier: '"${ProcessedMachineIdentifier}" \ - -H 'X-Plex-Product: Plex Media Server'\ - -H 'X-Plex-Version: 1.1' \ - -H 'X-Plex-Provides: server' \ - -H 'X-Plex-Platform: Linux' \ - -H 'X-Plex-Platform-Version: 1.0' \ - -H 'X-Plex-Device-Name: PlexMediaServer' \ - -H 'X-Plex-Device: Linux' \ - "https://plex.tv/api/claim/exchange?token=${PLEX_CLAIM}" \ - | sed -n 's/.*\(.*\)<\/authentication-token>.*/\1/p')" + -H 'X-Plex-Client-Identifier: '"${ProcessedMachineIdentifier}" \ + -H 'X-Plex-Product: Plex Media Server'\ + -H 'X-Plex-Version: 1.1' \ + -H 'X-Plex-Provides: server' \ + -H 'X-Plex-Platform: Linux' \ + -H 'X-Plex-Platform-Version: 1.0' \ + -H 'X-Plex-Device-Name: PlexMediaServer' \ + -H 'X-Plex-Device: Linux' \ + "https://plex.tv/api/claim/exchange?token=${PLEX_CLAIM}" \ + | sed -n 's/.*\(.*\)<\/authentication-token>.*/\1/p')" if [ -n "$PlexOnlineToken" ]; then - echo "Server claimed successfully, navigate to http://serverip:32400/web to complete plex setup." - sed -i "s/\/>/ PlexOnlineToken=\"${PlexOnlineToken}\"\/>/g" "${PREFNAME}" + echo "Server claimed successfully, navigate to http://serverip:32400/web to complete plex setup." + sed -i "s/\/>/ PlexOnlineToken=\"${PlexOnlineToken}\"\/>/g" "${PREFNAME}" else - echo "Unable to claim Plex server. Either manually claim by connecting to http://serverip:32400/web from the same network subnet, or recreate container with a new claim token." + echo "Unable to claim Plex server. Either manually claim by connecting to http://serverip:32400/web from the same network subnet, or recreate container with a new claim token." fi \ No newline at end of file diff --git a/root/etc/cont-init.d/60-plex-update b/root/etc/cont-init.d/60-plex-update index 8df3bb5..6e0cf63 100755 --- a/root/etc/cont-init.d/60-plex-update +++ b/root/etc/cont-init.d/60-plex-update @@ -2,25 +2,25 @@ # If docker manages versioning exit if [ "${VERSION}" ] && [ "${VERSION}" == 'docker' ]; then - echo "Docker is used for versioning skip update check" - exit 0 + echo "Docker is used for versioning skip update check" + exit 0 fi # test if plex is installed and try re-pulling latest if not if (dpkg --get-selections plexmediaserver | grep -wq "install"); then -: + : else -echo "for some reason plex doesn't appear to be installed, pulling a new copy and exiting out of update script" -curl -o /tmp/plexmediaserver.deb -L \ - "${PLEX_DOWNLOAD}/${REMOTE_VERSION}/debian/plexmediaserver_${REMOTE_VERSION}_${PLEX_ARCH}.deb" && \ -dpkg -i --force-confold /tmp/plexmediaserver.deb -rm -f /tmp/plexmediaserver.deb -exit 0 + echo "for some reason plex doesn't appear to be installed, pulling a new copy and exiting out of update script" + curl -o /tmp/plexmediaserver.deb -L \ + "${PLEX_DOWNLOAD}/${REMOTE_VERSION}/debian/plexmediaserver_${REMOTE_VERSION}_${PLEX_ARCH}.deb" && \ + dpkg -i --force-confold /tmp/plexmediaserver.deb + rm -f /tmp/plexmediaserver.deb + exit 0 fi # set no update message [[ -e /tmp/no-version.nfo ]] && \ - rm /tmp/no-version.nfo + rm /tmp/no-version.nfo NOVERSION_SET='/tmp/no-version.nfo' cat > "${NOVERSION_SET}" <<-EOFVERSION ####################################################### @@ -33,7 +33,7 @@ EOFVERSION # set update failed message [[ -e /tmp/update_fail.nfo ]] && \ - rm /tmp/update_fail.nfo + rm /tmp/update_fail.nfo UPGRADE_FAIL='/tmp/update_fail.nfo' cat > "${UPGRADE_FAIL}" <<-EOFFAIL ######################################################## @@ -47,13 +47,13 @@ EOFFAIL # test for no version set or opt out for autoupdates if [[ -z "$VERSION" ]] || [[ "$VERSION" == "0" ]] || [[ -n "$ADVANCED_DISABLEUPDATES" ]]; then -printf '\n\n\n%s\n\n\n' "$( "${NOTOKEN_SET}" <<-EOFTOKEN ##################################################### @@ -63,27 +63,27 @@ EOFTOKEN # if preferences files doesn't exist, exit out if [ ! -e "/config/Library/Application Support/Plex Media Server/Preferences.xml" ]; then -cat >> "${NOTOKEN_SET}" <<-EOFTOKEN + cat >> "${NOTOKEN_SET}" <<-EOFTOKEN # preference file found, possibly first startup. # ##################################################### EOFTOKEN -printf '\n\n\n%s\n\n\n' "$(> "${NOTOKEN_SET}" <<-EOFTOKEN + cat >> "${NOTOKEN_SET}" <<-EOFTOKEN # plex token found in the preference file # ##################################################### EOFTOKEN -printf '\n\n\n%s\n\n\n' "$( Date: Mon, 18 Jul 2022 11:01:24 -0400 Subject: [PATCH 270/514] pin one more package --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 2136218..3204aed 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,6 +31,7 @@ RUN \ jq \ intel-igc-cm=1.0.128+i699.3~u20.04 \ intel-opencl-icd=21.49.21786+i643~u20.04 \ + libigc1=1.0.10409+i699.3~u20.04 \ libigdfcl1=1.0.10409+i699.3~u20.04 \ libigdgmm11=21.3.3+i643~u20.04 \ udev \ From fc9f64be5f7a47e2287af2b392713730971ea75f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 18 Jul 2022 12:45:44 -0500 Subject: [PATCH 271/514] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 54421a7..0b44ad2 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -33,7 +33,7 @@ grep3.4-1 gzip1.10-0ubuntu4 hostname3.23 init-system-helpers1.57 -intel-igc-cm1.0.160+i755~u20.04 +intel-igc-cm1.0.128+i699.3~u20.04 intel-opencl-icd21.49.21786+i643~u20.04 jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 @@ -71,8 +71,8 @@ libheimntlm0-heimdal7.7.0+dfsg-1ubuntu1 libhogweed53.5.1+really3.5.1-2ubuntu0.2 libhx509-5-heimdal7.7.0+dfsg-1ubuntu1 libidn2-02.2.0-2 -libigc11.0.11378+i755~u20.04 -libigdfcl11.0.11378+i755~u20.04 +libigc11.0.10409+i699.3~u20.04 +libigdfcl11.0.10409+i699.3~u20.04 libigdgmm1121.3.3+i643~u20.04 libjq11.6-1ubuntu0.20.04.1 libk5crypto31.17-6ubuntu4.1 From 69327b9f3a9d409bb5f916eab19859a70ca61310 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 1 Aug 2022 05:54:33 -0500 Subject: [PATCH 272/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 0b44ad2..3fdaa51 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -141,7 +141,7 @@ openssl1.1.1f-1ubuntu2.16 passwd1:4.8.1-1ubuntu5.20.04.1 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.27.2.5929-a806c5905 +plexmediaserver1.28.0.5999-97678ded3 procps2:3.3.16-1ubuntu2.3 publicsuffix20200303.0012-1 readline-common8.0-4 From b4222083e103accd5f1a8d92711b8cdcc6659990 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 17 Aug 2022 09:09:08 -0500 Subject: [PATCH 273/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 3fdaa51..f5b92c4 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -141,7 +141,7 @@ openssl1.1.1f-1ubuntu2.16 passwd1:4.8.1-1ubuntu5.20.04.1 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.28.0.5999-97678ded3 +plexmediaserver1.28.1.6092-87136b92b procps2:3.3.16-1ubuntu2.3 publicsuffix20200303.0012-1 readline-common8.0-4 From 36b5837ed9449529ed9cb784c2efd189a6127ac5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 17 Aug 2022 23:51:10 +0200 Subject: [PATCH 274/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index f5b92c4..428ba3d 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -141,7 +141,7 @@ openssl1.1.1f-1ubuntu2.16 passwd1:4.8.1-1ubuntu5.20.04.1 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.28.1.6092-87136b92b +plexmediaserver1.28.1.6104-788f82488 procps2:3.3.16-1ubuntu2.3 publicsuffix20200303.0012-1 readline-common8.0-4 From 362fe2b9b92b099a7d7540b07b41fc4b948fec80 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 29 Aug 2022 19:52:37 +0200 Subject: [PATCH 275/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 428ba3d..6d4805e 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -141,7 +141,7 @@ openssl1.1.1f-1ubuntu2.16 passwd1:4.8.1-1ubuntu5.20.04.1 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.28.1.6104-788f82488 +plexmediaserver1.28.2.6106-44a5bbd28 procps2:3.3.16-1ubuntu2.3 publicsuffix20200303.0012-1 readline-common8.0-4 From 5b71eb4c9ed030598a84b30563fb4cb8699d6837 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 30 Aug 2022 16:50:38 +0200 Subject: [PATCH 276/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 6d4805e..abb391b 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -141,7 +141,7 @@ openssl1.1.1f-1ubuntu2.16 passwd1:4.8.1-1ubuntu5.20.04.1 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.28.2.6106-44a5bbd28 +plexmediaserver1.28.2.6151-914ddd2b3 procps2:3.3.16-1ubuntu2.3 publicsuffix20200303.0012-1 readline-common8.0-4 From 383b7fb4617e0e377f3516266fabf73160490df5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 6 Sep 2022 00:21:15 -0500 Subject: [PATCH 277/514] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index abb391b..c8505c8 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -8,7 +8,7 @@ bsdutils1:2.34-0.1ubuntu9.3 bzip21.0.8-2 ca-certificates20211016~20.04.1 coreutils8.30-3ubuntu2 -curl7.68.0-1ubuntu2.12 +curl7.68.0-1ubuntu2.13 dash0.5.10.2-6 debconf1.5.73 debianutils4.9.1 @@ -52,7 +52,7 @@ libcap-ng00.7.9-2.1build1 libc-bin2.31-0ubuntu9.7 libcom-err21.45.5-2ubuntu1 libcrypt11:4.4.10-10ubuntu4 -libcurl47.68.0-1ubuntu2.12 +libcurl47.68.0-1ubuntu2.13 libdb5.35.3.28+dfsg1-0.6ubuntu2 libdebconfclient00.251ubuntu1 libext2fs21.45.5-2ubuntu1 @@ -149,7 +149,7 @@ sed4.7-1 sensible-utils0.0.12+nmu1 sysvinit-utils2.96-2.1ubuntu1 tar1.30+dfsg-7ubuntu0.20.04.2 -tzdata2022a-0ubuntu0.20.04 +tzdata2022c-0ubuntu0.20.04.0 ubuntu-keyring2020.02.11.4 udev245.4-4ubuntu3.17 unrar1:5.6.6-2build1 From 39fa2636f2c1d37026673611d128791ded9e8e93 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 20 Sep 2022 07:14:22 +0200 Subject: [PATCH 278/514] Bot Updating Templated Files --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 73d8893..2eb7b02 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -712,7 +712,7 @@ pipeline { -e DO_REGION="ams3" \ -e DO_BUCKET="lsio-ci" \ -t ghcr.io/linuxserver/ci:latest \ - python /ci/ci.py''' + python3 test_build.py''' } } } From 433718c7a454311fa9cdee2be2f47da47e0313f8 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 27 Sep 2022 07:11:27 +0200 Subject: [PATCH 279/514] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index c8505c8..78cf86a 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -114,7 +114,7 @@ libsemanage13.0-1build2 libsemanage-common3.0-1build2 libsepol13.0-1 libsmartcols12.34-0.1ubuntu9.3 -libsqlite3-03.31.1-4ubuntu0.3 +libsqlite3-03.31.1-4ubuntu0.4 libss21.45.5-2ubuntu1 libssh-40.9.3-2ubuntu2.2 libssl1.11.1.1f-1ubuntu2.16 @@ -122,7 +122,7 @@ libstdc++610.3.0-1ubuntu1~20.04 libsystemd0245.4-4ubuntu3.15 libtasn1-64.16.0-2 libtinfo66.2-0ubuntu2 -libudev1245.4-4ubuntu3.17 +libudev1245.4-4ubuntu3.18 libunistring20.9.10-2 libuuid12.34-0.1ubuntu9.3 libwind0-heimdal7.7.0+dfsg-1ubuntu1 @@ -151,7 +151,7 @@ sysvinit-utils2.96-2.1ubuntu1 tar1.30+dfsg-7ubuntu0.20.04.2 tzdata2022c-0ubuntu0.20.04.0 ubuntu-keyring2020.02.11.4 -udev245.4-4ubuntu3.17 +udev245.4-4ubuntu3.18 unrar1:5.6.6-2build1 util-linux2.34-0.1ubuntu9.3 wget1.20.3-1ubuntu2 From 12d7dc9c8ca674fbd5b8c8b704e65992b81741bc Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 28 Sep 2022 13:07:05 -0500 Subject: [PATCH 280/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 78cf86a..0378e2d 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -141,7 +141,7 @@ openssl1.1.1f-1ubuntu2.16 passwd1:4.8.1-1ubuntu5.20.04.1 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.28.2.6151-914ddd2b3 +plexmediaserver1.29.0.6244-819d3678c procps2:3.3.16-1ubuntu2.3 publicsuffix20200303.0012-1 readline-common8.0-4 From 3d443205d44f6a64b2519e78c30c36e9cdd47c21 Mon Sep 17 00:00:00 2001 From: aptalca Date: Sat, 15 Oct 2022 21:38:53 -0400 Subject: [PATCH 281/514] rebase plex to jammy, update to s6v3, remove opencl drivers --- Dockerfile | 10 +--------- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- README.md | 1 + readme-vars.yml | 1 + .../init-config-end/dependencies.d/init-plex-update | 0 .../s6-rc.d/init-plex-chown/dependencies.d/init-config | 0 .../s6-rc.d/init-plex-chown/run} | 5 +++-- root/etc/s6-overlay/s6-rc.d/init-plex-chown/type | 1 + root/etc/s6-overlay/s6-rc.d/init-plex-chown/up | 1 + .../init-plex-claim/dependencies.d/init-plex-chown | 0 .../s6-rc.d/init-plex-claim/run} | 8 ++++++-- root/etc/s6-overlay/s6-rc.d/init-plex-claim/type | 1 + root/etc/s6-overlay/s6-rc.d/init-plex-claim/up | 1 + .../init-plex-gid-video/dependencies.d/init-plex-claim | 0 .../s6-rc.d/init-plex-gid-video/run} | 0 root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/type | 1 + root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/up | 1 + .../dependencies.d/init-plex-gid-video | 0 .../s6-rc.d/init-plex-update/run} | 0 root/etc/s6-overlay/s6-rc.d/init-plex-update/type | 1 + root/etc/s6-overlay/s6-rc.d/init-plex-update/up | 1 + .../s6-rc.d/svc-plex/dependencies.d/init-services | 0 root/etc/s6-overlay/s6-rc.d/svc-plex/notification-fd | 1 + root/etc/s6-overlay/s6-rc.d/svc-plex/run | 8 ++++++++ root/etc/s6-overlay/s6-rc.d/svc-plex/type | 1 + .../s6-overlay/s6-rc.d/user/contents.d/init-plex-chown | 0 .../s6-overlay/s6-rc.d/user/contents.d/init-plex-claim | 0 .../s6-rc.d/user/contents.d/init-plex-gid-video | 0 .../s6-rc.d/user/contents.d/init-plex-update | 0 root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-plex | 0 root/etc/services.d/plex/run | 8 -------- 32 files changed, 32 insertions(+), 23 deletions(-) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-plex-update create mode 100644 root/etc/s6-overlay/s6-rc.d/init-plex-chown/dependencies.d/init-config rename root/etc/{cont-init.d/40-chown-files => s6-overlay/s6-rc.d/init-plex-chown/run} (77%) mode change 100644 => 100755 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-plex-chown/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-plex-chown/up create mode 100644 root/etc/s6-overlay/s6-rc.d/init-plex-claim/dependencies.d/init-plex-chown rename root/etc/{cont-init.d/45-plex-claim => s6-overlay/s6-rc.d/init-plex-claim/run} (93%) mode change 100644 => 100755 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-plex-claim/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-plex-claim/up create mode 100644 root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/dependencies.d/init-plex-claim rename root/etc/{cont-init.d/50-gid-video => s6-overlay/s6-rc.d/init-plex-gid-video/run} (100%) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/up create mode 100644 root/etc/s6-overlay/s6-rc.d/init-plex-update/dependencies.d/init-plex-gid-video rename root/etc/{cont-init.d/60-plex-update => s6-overlay/s6-rc.d/init-plex-update/run} (100%) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-plex-update/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-plex-update/up create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-plex/dependencies.d/init-services create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-plex/notification-fd create mode 100755 root/etc/s6-overlay/s6-rc.d/svc-plex/run create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-plex/type create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-plex-chown create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-plex-claim create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-plex-gid-video create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-plex-update create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-plex delete mode 100644 root/etc/services.d/plex/run diff --git a/Dockerfile b/Dockerfile index 3204aed..26a889b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:focal +FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy # set version label ARG BUILD_DATE @@ -22,18 +22,10 @@ ENV DEBIAN_FRONTEND="noninteractive" \ PLEX_MEDIA_SERVER_INFO_DEVICE="Docker Container (LinuxServer.io)" RUN \ - echo "**** add Intel repo ****" && \ - curl -sL https://repositories.intel.com/graphics/intel-graphics.key | apt-key add - && \ - echo 'deb [arch=amd64] https://repositories.intel.com/graphics/ubuntu focal main' > /etc/apt/sources.list.d/intel.list && \ echo "**** install runtime packages ****" && \ apt-get update && \ apt-get install -y \ jq \ - intel-igc-cm=1.0.128+i699.3~u20.04 \ - intel-opencl-icd=21.49.21786+i643~u20.04 \ - libigc1=1.0.10409+i699.3~u20.04 \ - libigdfcl1=1.0.10409+i699.3~u20.04 \ - libigdgmm11=21.3.3+i643~u20.04 \ udev \ unrar \ wget && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index ffe9a7a..a005fdd 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-focal +FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy # set version label ARG BUILD_DATE diff --git a/Dockerfile.armhf b/Dockerfile.armhf index e4ce32e..279bbe7 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-focal +FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-jammy # set version label ARG BUILD_DATE diff --git a/README.md b/README.md index b471958..f8578ce 100644 --- a/README.md +++ b/README.md @@ -299,6 +299,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **16.10.22:** - Rebase to jammy. Update to s6v3. Remove opencl packages (bundled with plex). * **18.07.22:** - Pin all opencl related driver packages. * **16.05.22:** - Pin opencl version. * **04.03.22:** - Increase verbosity of video device permissions fix, attempt to fix missing group rw. diff --git a/readme-vars.yml b/readme-vars.yml index dc0718d..9a1e7e2 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -107,6 +107,7 @@ app_setup_block: | # changelog changelogs: + - { date: "16.10.22:", desc: "Rebase to jammy. Update to s6v3. Remove opencl packages (bundled with plex)." } - { date: "18.07.22:", desc: "Pin all opencl related driver packages." } - { date: "16.05.22:", desc: "Pin opencl version." } - { date: "04.03.22:", desc: "Increase verbosity of video device permissions fix, attempt to fix missing group rw." } diff --git a/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-plex-update b/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-plex-update new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-chown/dependencies.d/init-config b/root/etc/s6-overlay/s6-rc.d/init-plex-chown/dependencies.d/init-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/cont-init.d/40-chown-files b/root/etc/s6-overlay/s6-rc.d/init-plex-chown/run old mode 100644 new mode 100755 similarity index 77% rename from root/etc/cont-init.d/40-chown-files rename to root/etc/s6-overlay/s6-rc.d/init-plex-chown/run index b2e3c31..b64fe98 --- a/root/etc/cont-init.d/40-chown-files +++ b/root/etc/s6-overlay/s6-rc.d/init-plex-chown/run @@ -16,8 +16,9 @@ if [ ! "$(stat -c %u /config/Library)" = "$PUID" ]; then fi # remove plex pid after unclean stop -[[ -f "/config/Library/Application Support/Plex Media Server/plexmediaserver.pid" ]] && \ -rm -f "/config/Library/Application Support/Plex Media Server/plexmediaserver.pid" +if [[ -f "/config/Library/Application Support/Plex Media Server/plexmediaserver.pid" ]]; then + rm -f "/config/Library/Application Support/Plex Media Server/plexmediaserver.pid" +fi # permissions (non-recursive) on config root and folders chown abc:abc \ diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-chown/type b/root/etc/s6-overlay/s6-rc.d/init-plex-chown/type new file mode 100644 index 0000000..3d92b15 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-plex-chown/type @@ -0,0 +1 @@ +oneshot \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-chown/up b/root/etc/s6-overlay/s6-rc.d/init-plex-chown/up new file mode 100644 index 0000000..2d5ad2f --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-plex-chown/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-plex-chown/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-claim/dependencies.d/init-plex-chown b/root/etc/s6-overlay/s6-rc.d/init-plex-claim/dependencies.d/init-plex-chown new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/cont-init.d/45-plex-claim b/root/etc/s6-overlay/s6-rc.d/init-plex-claim/run old mode 100644 new mode 100755 similarity index 93% rename from root/etc/cont-init.d/45-plex-claim rename to root/etc/s6-overlay/s6-rc.d/init-plex-claim/run index 7841f54..c597876 --- a/root/etc/cont-init.d/45-plex-claim +++ b/root/etc/s6-overlay/s6-rc.d/init-plex-claim/run @@ -1,6 +1,10 @@ #!/usr/bin/with-contenv bash -if grep -qs "PlexOnlineToken" "/config/Library/Application Support/Plex Media Server/Preferences.xml" || [ -z "$PLEX_CLAIM" ]; then +if grep -qs "PlexOnlineToken" "/config/Library/Application Support/Plex Media Server/Preferences.xml"; then + echo "**** Server already claimed ****" + exit 0 +elif [ -z "$PLEX_CLAIM" ]; then + echo "**** Server is unclaimed, but no claim token has been set ****" exit 0 fi PREFNAME="/config/Library/Application Support/Plex Media Server/Preferences.xml" @@ -76,4 +80,4 @@ if [ -n "$PlexOnlineToken" ]; then sed -i "s/\/>/ PlexOnlineToken=\"${PlexOnlineToken}\"\/>/g" "${PREFNAME}" else echo "Unable to claim Plex server. Either manually claim by connecting to http://serverip:32400/web from the same network subnet, or recreate container with a new claim token." -fi \ No newline at end of file +fi diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-claim/type b/root/etc/s6-overlay/s6-rc.d/init-plex-claim/type new file mode 100644 index 0000000..3d92b15 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-plex-claim/type @@ -0,0 +1 @@ +oneshot \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-claim/up b/root/etc/s6-overlay/s6-rc.d/init-plex-claim/up new file mode 100644 index 0000000..56750b8 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-plex-claim/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-plex-claim/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/dependencies.d/init-plex-claim b/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/dependencies.d/init-plex-claim new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/cont-init.d/50-gid-video b/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/run similarity index 100% rename from root/etc/cont-init.d/50-gid-video rename to root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/run diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/type b/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/type new file mode 100644 index 0000000..3d92b15 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/type @@ -0,0 +1 @@ +oneshot \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/up b/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/up new file mode 100644 index 0000000..05f6fde --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-plex-gid-video/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-update/dependencies.d/init-plex-gid-video b/root/etc/s6-overlay/s6-rc.d/init-plex-update/dependencies.d/init-plex-gid-video new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/cont-init.d/60-plex-update b/root/etc/s6-overlay/s6-rc.d/init-plex-update/run similarity index 100% rename from root/etc/cont-init.d/60-plex-update rename to root/etc/s6-overlay/s6-rc.d/init-plex-update/run diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-update/type b/root/etc/s6-overlay/s6-rc.d/init-plex-update/type new file mode 100644 index 0000000..3d92b15 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-plex-update/type @@ -0,0 +1 @@ +oneshot \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-update/up b/root/etc/s6-overlay/s6-rc.d/init-plex-update/up new file mode 100644 index 0000000..6b6b164 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-plex-update/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-plex-update/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/svc-plex/dependencies.d/init-services b/root/etc/s6-overlay/s6-rc.d/svc-plex/dependencies.d/init-services new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-plex/notification-fd b/root/etc/s6-overlay/s6-rc.d/svc-plex/notification-fd new file mode 100644 index 0000000..e440e5c --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-plex/notification-fd @@ -0,0 +1 @@ +3 \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/svc-plex/run b/root/etc/s6-overlay/s6-rc.d/svc-plex/run new file mode 100755 index 0000000..ba42c34 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-plex/run @@ -0,0 +1,8 @@ +#!/usr/bin/with-contenv bash + +echo "Starting Plex Media Server. . . (you can ignore the libusb_init error)" +export PLEX_MEDIA_SERVER_INFO_MODEL=$(uname -m) +export PLEX_MEDIA_SERVER_INFO_PLATFORM_VERSION=$(uname -r) +exec \ + s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z 127.0.0.1 32400" \ + s6-setuidgid abc "/usr/lib/plexmediaserver/Plex Media Server" diff --git a/root/etc/s6-overlay/s6-rc.d/svc-plex/type b/root/etc/s6-overlay/s6-rc.d/svc-plex/type new file mode 100644 index 0000000..1780f9f --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-plex/type @@ -0,0 +1 @@ +longrun \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-plex-chown b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-plex-chown new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-plex-claim b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-plex-claim new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-plex-gid-video b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-plex-gid-video new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-plex-update b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-plex-update new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-plex b/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-plex new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/services.d/plex/run b/root/etc/services.d/plex/run deleted file mode 100644 index 9db8cdc..0000000 --- a/root/etc/services.d/plex/run +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/with-contenv bash - -echo "Starting Plex Media Server." -export PLEX_MEDIA_SERVER_INFO_MODEL=$(uname -m) -export PLEX_MEDIA_SERVER_INFO_PLATFORM_VERSION=$(uname -r) -exec \ - s6-setuidgid abc \ - /usr/lib/plexmediaserver/Plex\ Media\ Server From b0fcf7a86c79ba6e3c591e9a67a4619e4ad14bc1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 19 Oct 2022 08:43:58 -0500 Subject: [PATCH 282/514] Bot Updating Package Versions --- package_versions.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 0378e2d..fd457ee 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -39,7 +39,7 @@ jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 libacl12.2.53-6 libapt-pkg6.02.0.9 -libasn1-8-heimdal7.7.0+dfsg-1ubuntu1 +libasn1-8-heimdal7.7.0+dfsg-1ubuntu1.1 libassuan02.5.3-7ubuntu2 libattr11:2.4.48-5 libaudit11:2.8.5-2ubuntu6 @@ -63,13 +63,13 @@ libgcrypt201.8.5-5ubuntu1.1 libgmp102:6.2.0+dfsg-4 libgnutls303.6.13-2ubuntu1.6 libgpg-error01.37-1 -libgssapi3-heimdal7.7.0+dfsg-1ubuntu1 +libgssapi3-heimdal7.7.0+dfsg-1ubuntu1.1 libgssapi-krb5-21.17-6ubuntu4.1 -libhcrypto4-heimdal7.7.0+dfsg-1ubuntu1 -libheimbase1-heimdal7.7.0+dfsg-1ubuntu1 -libheimntlm0-heimdal7.7.0+dfsg-1ubuntu1 +libhcrypto4-heimdal7.7.0+dfsg-1ubuntu1.1 +libheimbase1-heimdal7.7.0+dfsg-1ubuntu1.1 +libheimntlm0-heimdal7.7.0+dfsg-1ubuntu1.1 libhogweed53.5.1+really3.5.1-2ubuntu0.2 -libhx509-5-heimdal7.7.0+dfsg-1ubuntu1 +libhx509-5-heimdal7.7.0+dfsg-1ubuntu1.1 libidn2-02.2.0-2 libigc11.0.10409+i699.3~u20.04 libigdfcl11.0.10409+i699.3~u20.04 @@ -78,7 +78,7 @@ libjq11.6-1ubuntu0.20.04.1 libk5crypto31.17-6ubuntu4.1 libkeyutils11.6-6ubuntu1.1 libkmod227-1ubuntu2.1 -libkrb5-26-heimdal7.7.0+dfsg-1ubuntu1 +libkrb5-26-heimdal7.7.0+dfsg-1ubuntu1.1 libkrb5-31.17-6ubuntu4.1 libkrb5support01.17-6ubuntu4.1 libksba81.3.5-2 @@ -103,7 +103,7 @@ libpcre32:8.39-12build1 libprocps82:3.3.16-1ubuntu2.3 libpsl50.21.0-1ubuntu1 libreadline88.0-4 -libroken18-heimdal7.7.0+dfsg-1ubuntu1 +libroken18-heimdal7.7.0+dfsg-1ubuntu1.1 librtmp12.4+20151223.gitfa8646d.1-2build1 libsasl2-22.1.27+dfsg-2ubuntu0.1 libsasl2-modules2.1.27+dfsg-2ubuntu0.1 @@ -125,7 +125,7 @@ libtinfo66.2-0ubuntu2 libudev1245.4-4ubuntu3.18 libunistring20.9.10-2 libuuid12.34-0.1ubuntu9.3 -libwind0-heimdal7.7.0+dfsg-1ubuntu1 +libwind0-heimdal7.7.0+dfsg-1ubuntu1.1 libz3-44.8.7-4build1 libzstd11.4.4+dfsg-3ubuntu0.1 locales2.31-0ubuntu9.9 @@ -141,7 +141,7 @@ openssl1.1.1f-1ubuntu2.16 passwd1:4.8.1-1ubuntu5.20.04.1 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.29.0.6244-819d3678c +plexmediaserver1.29.1.6313-f4cdfea9c procps2:3.3.16-1ubuntu2.3 publicsuffix20200303.0012-1 readline-common8.0-4 From 40743bbeb1e20faad24f2728c02193a42f70d566 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 19 Oct 2022 16:24:51 +0200 Subject: [PATCH 283/514] Bot Updating Package Versions --- package_versions.txt | 307 +++++++++++++++++++++---------------------- 1 file changed, 149 insertions(+), 158 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index fd457ee..538f54a 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,158 +1,149 @@ -adduser3.118ubuntu2 -apt2.0.9 -apt-utils2.0.9 -base-files11ubuntu5.5 -base-passwd3.5.47 -bash5.0-6ubuntu1.1 -bsdutils1:2.34-0.1ubuntu9.3 -bzip21.0.8-2 -ca-certificates20211016~20.04.1 -coreutils8.30-3ubuntu2 -curl7.68.0-1ubuntu2.13 -dash0.5.10.2-6 -debconf1.5.73 -debianutils4.9.1 -diffutils1:3.7-3 -dirmngr2.2.19-3ubuntu2.2 -dpkg1.19.7ubuntu3 -e2fsprogs1.45.5-2ubuntu1 -fdisk2.34-0.1ubuntu9.3 -findutils4.7.0-1ubuntu1 -gcc-10-base10.3.0-1ubuntu1~20.04 -gnupg2.2.19-3ubuntu2.2 -gnupg-l10n2.2.19-3ubuntu2.2 -gnupg-utils2.2.19-3ubuntu2.2 -gpg2.2.19-3ubuntu2.2 -gpg-agent2.2.19-3ubuntu2.2 -gpgconf2.2.19-3ubuntu2.2 -gpgsm2.2.19-3ubuntu2.2 -gpgv2.2.19-3ubuntu2.2 -gpg-wks-client2.2.19-3ubuntu2.2 -gpg-wks-server2.2.19-3ubuntu2.2 -grep3.4-1 -gzip1.10-0ubuntu4 -hostname3.23 -init-system-helpers1.57 -intel-igc-cm1.0.128+i699.3~u20.04 -intel-opencl-icd21.49.21786+i643~u20.04 -jq1.6-1ubuntu0.20.04.1 -krb5-locales1.17-6ubuntu4.1 -libacl12.2.53-6 -libapt-pkg6.02.0.9 -libasn1-8-heimdal7.7.0+dfsg-1ubuntu1.1 -libassuan02.5.3-7ubuntu2 -libattr11:2.4.48-5 -libaudit11:2.8.5-2ubuntu6 -libaudit-common1:2.8.5-2ubuntu6 -libblkid12.34-0.1ubuntu9.3 -libbrotli11.0.7-6ubuntu0.1 -libbz2-1.01.0.8-2 -libc62.31-0ubuntu9.7 -libcap-ng00.7.9-2.1build1 -libc-bin2.31-0ubuntu9.7 -libcom-err21.45.5-2ubuntu1 -libcrypt11:4.4.10-10ubuntu4 -libcurl47.68.0-1ubuntu2.13 -libdb5.35.3.28+dfsg1-0.6ubuntu2 -libdebconfclient00.251ubuntu1 -libext2fs21.45.5-2ubuntu1 -libfdisk12.34-0.1ubuntu9.3 -libffi73.3-4 -libgcc-s110.3.0-1ubuntu1~20.04 -libgcrypt201.8.5-5ubuntu1.1 -libgmp102:6.2.0+dfsg-4 -libgnutls303.6.13-2ubuntu1.6 -libgpg-error01.37-1 -libgssapi3-heimdal7.7.0+dfsg-1ubuntu1.1 -libgssapi-krb5-21.17-6ubuntu4.1 -libhcrypto4-heimdal7.7.0+dfsg-1ubuntu1.1 -libheimbase1-heimdal7.7.0+dfsg-1ubuntu1.1 -libheimntlm0-heimdal7.7.0+dfsg-1ubuntu1.1 -libhogweed53.5.1+really3.5.1-2ubuntu0.2 -libhx509-5-heimdal7.7.0+dfsg-1ubuntu1.1 -libidn2-02.2.0-2 -libigc11.0.10409+i699.3~u20.04 -libigdfcl11.0.10409+i699.3~u20.04 -libigdgmm1121.3.3+i643~u20.04 -libjq11.6-1ubuntu0.20.04.1 -libk5crypto31.17-6ubuntu4.1 -libkeyutils11.6-6ubuntu1.1 -libkmod227-1ubuntu2.1 -libkrb5-26-heimdal7.7.0+dfsg-1ubuntu1.1 -libkrb5-31.17-6ubuntu4.1 -libkrb5support01.17-6ubuntu4.1 -libksba81.3.5-2 -libldap-2.4-22.4.49+dfsg-2ubuntu1.9 -libldap-common2.4.49+dfsg-2ubuntu1.9 -liblz4-11.9.2-2ubuntu0.20.04.1 -liblzma55.2.4-1ubuntu1 -libmount12.34-0.1ubuntu9.3 -libncurses66.2-0ubuntu2 -libncursesw66.2-0ubuntu2 -libnettle73.5.1+really3.5.1-2ubuntu0.2 -libnghttp2-141.40.0-1build1 -libnpth01.6-1 -libonig56.9.4-1 -libp11-kit00.23.20-1ubuntu0.1 -libpam0g1.3.1-5ubuntu4.3 -libpam-modules1.3.1-5ubuntu4.3 -libpam-modules-bin1.3.1-5ubuntu4.3 -libpam-runtime1.3.1-5ubuntu4.3 -libpcre2-8-010.34-7 -libpcre32:8.39-12build1 -libprocps82:3.3.16-1ubuntu2.3 -libpsl50.21.0-1ubuntu1 -libreadline88.0-4 -libroken18-heimdal7.7.0+dfsg-1ubuntu1.1 -librtmp12.4+20151223.gitfa8646d.1-2build1 -libsasl2-22.1.27+dfsg-2ubuntu0.1 -libsasl2-modules2.1.27+dfsg-2ubuntu0.1 -libsasl2-modules-db2.1.27+dfsg-2ubuntu0.1 -libseccomp22.5.1-1ubuntu1~20.04.2 -libselinux13.0-1build2 -libsemanage13.0-1build2 -libsemanage-common3.0-1build2 -libsepol13.0-1 -libsmartcols12.34-0.1ubuntu9.3 -libsqlite3-03.31.1-4ubuntu0.4 -libss21.45.5-2ubuntu1 -libssh-40.9.3-2ubuntu2.2 -libssl1.11.1.1f-1ubuntu2.16 -libstdc++610.3.0-1ubuntu1~20.04 -libsystemd0245.4-4ubuntu3.15 -libtasn1-64.16.0-2 -libtinfo66.2-0ubuntu2 -libudev1245.4-4ubuntu3.18 -libunistring20.9.10-2 -libuuid12.34-0.1ubuntu9.3 -libwind0-heimdal7.7.0+dfsg-1ubuntu1.1 -libz3-44.8.7-4build1 -libzstd11.4.4+dfsg-3ubuntu0.1 -locales2.31-0ubuntu9.9 -login1:4.8.1-1ubuntu5.20.04.1 -logsave1.45.5-2ubuntu1 -lsb-base11.1.0ubuntu2 -mawk1.3.4.20200120-2 -mount2.34-0.1ubuntu9.3 -ncurses-base6.2-0ubuntu2 -ncurses-bin6.2-0ubuntu2 -ocl-icd-libopencl12.2.11-1ubuntu1 -openssl1.1.1f-1ubuntu2.16 -passwd1:4.8.1-1ubuntu5.20.04.1 -perl-base5.30.0-9ubuntu0.2 -pinentry-curses1.1.0-3build1 -plexmediaserver1.29.1.6313-f4cdfea9c -procps2:3.3.16-1ubuntu2.3 -publicsuffix20200303.0012-1 -readline-common8.0-4 -sed4.7-1 -sensible-utils0.0.12+nmu1 -sysvinit-utils2.96-2.1ubuntu1 -tar1.30+dfsg-7ubuntu0.20.04.2 -tzdata2022c-0ubuntu0.20.04.0 -ubuntu-keyring2020.02.11.4 -udev245.4-4ubuntu3.18 -unrar1:5.6.6-2build1 -util-linux2.34-0.1ubuntu9.3 -wget1.20.3-1ubuntu2 -zlib1g1:1.2.11.dfsg-2ubuntu1.2 +adduser3.118ubuntu5 +apt2.4.8 +apt-utils2.4.8 +base-files12ubuntu4.2 +base-passwd3.5.52build1 +bash5.1-6ubuntu1 +bsdutils1:2.37.2-4ubuntu3 +ca-certificates20211016 +coreutils8.32-4.1ubuntu1 +curl7.81.0-1ubuntu1.4 +dash0.5.11+git20210903+057cd650a4ed-3build1 +debconf1.5.79ubuntu1 +debianutils5.5-1ubuntu2 +diffutils1:3.8-0ubuntu2 +dirmngr2.2.27-3ubuntu2.1 +dpkg1.21.1ubuntu2.1 +e2fsprogs1.46.5-2ubuntu1.1 +findutils4.8.0-1ubuntu3 +gcc-12-base12.1.0-2ubuntu1~22.04 +gnupg2.2.27-3ubuntu2.1 +gnupg-l10n2.2.27-3ubuntu2.1 +gnupg-utils2.2.27-3ubuntu2.1 +gpg2.2.27-3ubuntu2.1 +gpg-agent2.2.27-3ubuntu2.1 +gpgconf2.2.27-3ubuntu2.1 +gpgsm2.2.27-3ubuntu2.1 +gpgv2.2.27-3ubuntu2.1 +gpg-wks-client2.2.27-3ubuntu2.1 +gpg-wks-server2.2.27-3ubuntu2.1 +grep3.7-1build1 +gzip1.10-4ubuntu4.1 +hostname3.23ubuntu2 +init-system-helpers1.62 +jq1.6-2.1ubuntu3 +libacl12.3.1-1 +libapt-pkg6.02.4.8 +libassuan02.5.5-1build1 +libattr11:2.5.1-1build1 +libaudit11:3.0.7-1build1 +libaudit-common1:3.0.7-1build1 +libblkid12.37.2-4ubuntu3 +libbrotli11.0.9-2build6 +libbsd00.11.5-1 +libbz2-1.01.0.8-5build1 +libc62.35-0ubuntu3.1 +libcap21:2.44-1build3 +libcap-ng00.7.9-2.2build3 +libc-bin2.35-0ubuntu3.1 +libcom-err21.46.5-2ubuntu1.1 +libcrypt11:4.4.27-1 +libcurl47.81.0-1ubuntu1.4 +libdb5.35.3.28+dfsg1-0.8ubuntu3 +libdebconfclient00.261ubuntu1 +libext2fs21.46.5-2ubuntu1.1 +libffi83.4.2-4 +libgcc-s112.1.0-2ubuntu1~22.04 +libgcrypt201.9.4-3ubuntu3 +libgmp102:6.2.1+dfsg-3ubuntu1 +libgnutls303.7.3-4ubuntu1.1 +libgpg-error01.43-3 +libgssapi-krb5-21.19.2-2 +libhogweed63.7.3-1build2 +libidn2-02.3.2-2build1 +libjq11.6-2.1ubuntu3 +libk5crypto31.19.2-2 +libkeyutils11.6.1-2ubuntu3 +libkmod229-1ubuntu1 +libkrb5-31.19.2-2 +libkrb5support01.19.2-2 +libksba81.6.0-2build1 +libldap-2.5-02.5.13+dfsg-0ubuntu0.22.04.1 +libldap-common2.5.13+dfsg-0ubuntu0.22.04.1 +liblz4-11.9.3-2build2 +liblzma55.2.5-2ubuntu1 +libmd01.0.4-1build1 +libmount12.37.2-4ubuntu3 +libncurses66.3-2 +libncursesw66.3-2 +libnettle83.7.3-1build2 +libnghttp2-141.43.0-1build3 +libnpth01.6-3build2 +libnsl21.3.0-2build2 +libonig56.9.7.1-2build1 +libp11-kit00.24.0-6build1 +libpam0g1.4.0-11ubuntu2 +libpam-modules1.4.0-11ubuntu2 +libpam-modules-bin1.4.0-11ubuntu2 +libpam-runtime1.4.0-11ubuntu2 +libpcre2-8-010.39-3ubuntu0.1 +libpcre32:8.39-13ubuntu0.22.04.1 +libprocps82:3.3.17-6ubuntu2 +libpsl50.21.0-1.2build2 +libreadline88.1.2-1 +librtmp12.4+20151223.gitfa8646d.1-2build4 +libsasl2-22.1.27+dfsg2-3ubuntu1 +libsasl2-modules2.1.27+dfsg2-3ubuntu1 +libsasl2-modules-db2.1.27+dfsg2-3ubuntu1 +libseccomp22.5.3-2ubuntu2 +libselinux13.3-1build2 +libsemanage23.3-1build2 +libsemanage-common3.3-1build2 +libsepol23.3-1build1 +libsmartcols12.37.2-4ubuntu3 +libsqlite3-03.37.2-2 +libss21.46.5-2ubuntu1.1 +libssh-40.9.6-2build1 +libssl33.0.2-0ubuntu1.6 +libstdc++612.1.0-2ubuntu1~22.04 +libsystemd0249.11-0ubuntu3.6 +libtasn1-64.18.0-4build1 +libtinfo66.3-2 +libtirpc31.3.2-2ubuntu0.1 +libtirpc-common1.3.2-2ubuntu0.1 +libudev1249.11-0ubuntu3.6 +libunistring21.0-1 +libuuid12.37.2-4ubuntu3 +libxxhash00.8.1-1 +libzstd11.4.8+dfsg-3build1 +locales2.35-0ubuntu3.1 +login1:4.8.1-2ubuntu2 +logsave1.46.5-2ubuntu1.1 +lsb-base11.1.0ubuntu4 +mawk1.3.4.20200120-3 +mount2.37.2-4ubuntu3 +ncurses-base6.3-2 +ncurses-bin6.3-2 +netcat1.218-4ubuntu1 +netcat-openbsd1.218-4ubuntu1 +openssl3.0.2-0ubuntu1.6 +passwd1:4.8.1-2ubuntu2 +perl-base5.34.0-3ubuntu1 +pinentry-curses1.1.1-1build2 +plexmediaserver1.29.0.6244-819d3678c +procps2:3.3.17-6ubuntu2 +publicsuffix20211207.1025-1 +readline-common8.1.2-1 +sed4.8-1ubuntu2 +sensible-utils0.0.17 +systemd-hwe-hwdb249.11.1 +sysvinit-utils3.01-1ubuntu1 +tar1.34+dfsg-1build3 +tzdata2022c-0ubuntu0.22.04.0 +ubuntu-keyring2021.03.26 +udev249.11-0ubuntu3.6 +unrar1:6.1.5-1 +usrmerge25ubuntu2 +util-linux2.37.2-4ubuntu3 +wget1.21.2-2ubuntu1 +zlib1g1:1.2.11.dfsg-2ubuntu9.1 From 42744a60e0facbd84af63b4c4188f899fb888865 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Wed, 19 Oct 2022 09:43:27 -0500 Subject: [PATCH 284/514] Revert "rebase plex to jammy, update to s6v3, remove opencl drivers" --- Dockerfile | 10 +++++++++- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- README.md | 1 - readme-vars.yml | 1 - .../init-plex-chown/run => cont-init.d/40-chown-files} | 5 ++--- .../init-plex-claim/run => cont-init.d/45-plex-claim} | 8 ++------ .../run => cont-init.d/50-gid-video} | 0 .../run => cont-init.d/60-plex-update} | 0 .../init-config-end/dependencies.d/init-plex-update | 0 .../s6-rc.d/init-plex-chown/dependencies.d/init-config | 0 root/etc/s6-overlay/s6-rc.d/init-plex-chown/type | 1 - root/etc/s6-overlay/s6-rc.d/init-plex-chown/up | 1 - .../init-plex-claim/dependencies.d/init-plex-chown | 0 root/etc/s6-overlay/s6-rc.d/init-plex-claim/type | 1 - root/etc/s6-overlay/s6-rc.d/init-plex-claim/up | 1 - .../init-plex-gid-video/dependencies.d/init-plex-claim | 0 root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/type | 1 - root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/up | 1 - .../dependencies.d/init-plex-gid-video | 0 root/etc/s6-overlay/s6-rc.d/init-plex-update/type | 1 - root/etc/s6-overlay/s6-rc.d/init-plex-update/up | 1 - .../s6-rc.d/svc-plex/dependencies.d/init-services | 0 root/etc/s6-overlay/s6-rc.d/svc-plex/notification-fd | 1 - root/etc/s6-overlay/s6-rc.d/svc-plex/run | 8 -------- root/etc/s6-overlay/s6-rc.d/svc-plex/type | 1 - .../s6-overlay/s6-rc.d/user/contents.d/init-plex-chown | 0 .../s6-overlay/s6-rc.d/user/contents.d/init-plex-claim | 0 .../s6-rc.d/user/contents.d/init-plex-gid-video | 0 .../s6-rc.d/user/contents.d/init-plex-update | 0 root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-plex | 0 root/etc/services.d/plex/run | 8 ++++++++ 32 files changed, 23 insertions(+), 32 deletions(-) rename root/etc/{s6-overlay/s6-rc.d/init-plex-chown/run => cont-init.d/40-chown-files} (77%) mode change 100755 => 100644 rename root/etc/{s6-overlay/s6-rc.d/init-plex-claim/run => cont-init.d/45-plex-claim} (93%) mode change 100755 => 100644 rename root/etc/{s6-overlay/s6-rc.d/init-plex-gid-video/run => cont-init.d/50-gid-video} (100%) rename root/etc/{s6-overlay/s6-rc.d/init-plex-update/run => cont-init.d/60-plex-update} (100%) delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-plex-update delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-plex-chown/dependencies.d/init-config delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-plex-chown/type delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-plex-chown/up delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-plex-claim/dependencies.d/init-plex-chown delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-plex-claim/type delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-plex-claim/up delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/dependencies.d/init-plex-claim delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/type delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/up delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-plex-update/dependencies.d/init-plex-gid-video delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-plex-update/type delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-plex-update/up delete mode 100644 root/etc/s6-overlay/s6-rc.d/svc-plex/dependencies.d/init-services delete mode 100644 root/etc/s6-overlay/s6-rc.d/svc-plex/notification-fd delete mode 100755 root/etc/s6-overlay/s6-rc.d/svc-plex/run delete mode 100644 root/etc/s6-overlay/s6-rc.d/svc-plex/type delete mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-plex-chown delete mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-plex-claim delete mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-plex-gid-video delete mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-plex-update delete mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-plex create mode 100644 root/etc/services.d/plex/run diff --git a/Dockerfile b/Dockerfile index 26a889b..3204aed 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy +FROM ghcr.io/linuxserver/baseimage-ubuntu:focal # set version label ARG BUILD_DATE @@ -22,10 +22,18 @@ ENV DEBIAN_FRONTEND="noninteractive" \ PLEX_MEDIA_SERVER_INFO_DEVICE="Docker Container (LinuxServer.io)" RUN \ + echo "**** add Intel repo ****" && \ + curl -sL https://repositories.intel.com/graphics/intel-graphics.key | apt-key add - && \ + echo 'deb [arch=amd64] https://repositories.intel.com/graphics/ubuntu focal main' > /etc/apt/sources.list.d/intel.list && \ echo "**** install runtime packages ****" && \ apt-get update && \ apt-get install -y \ jq \ + intel-igc-cm=1.0.128+i699.3~u20.04 \ + intel-opencl-icd=21.49.21786+i643~u20.04 \ + libigc1=1.0.10409+i699.3~u20.04 \ + libigdfcl1=1.0.10409+i699.3~u20.04 \ + libigdgmm11=21.3.3+i643~u20.04 \ udev \ unrar \ wget && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index a005fdd..ffe9a7a 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy +FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-focal # set version label ARG BUILD_DATE diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 279bbe7..e4ce32e 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-jammy +FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-focal # set version label ARG BUILD_DATE diff --git a/README.md b/README.md index f8578ce..b471958 100644 --- a/README.md +++ b/README.md @@ -299,7 +299,6 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions -* **16.10.22:** - Rebase to jammy. Update to s6v3. Remove opencl packages (bundled with plex). * **18.07.22:** - Pin all opencl related driver packages. * **16.05.22:** - Pin opencl version. * **04.03.22:** - Increase verbosity of video device permissions fix, attempt to fix missing group rw. diff --git a/readme-vars.yml b/readme-vars.yml index 9a1e7e2..dc0718d 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -107,7 +107,6 @@ app_setup_block: | # changelog changelogs: - - { date: "16.10.22:", desc: "Rebase to jammy. Update to s6v3. Remove opencl packages (bundled with plex)." } - { date: "18.07.22:", desc: "Pin all opencl related driver packages." } - { date: "16.05.22:", desc: "Pin opencl version." } - { date: "04.03.22:", desc: "Increase verbosity of video device permissions fix, attempt to fix missing group rw." } diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-chown/run b/root/etc/cont-init.d/40-chown-files old mode 100755 new mode 100644 similarity index 77% rename from root/etc/s6-overlay/s6-rc.d/init-plex-chown/run rename to root/etc/cont-init.d/40-chown-files index b64fe98..b2e3c31 --- a/root/etc/s6-overlay/s6-rc.d/init-plex-chown/run +++ b/root/etc/cont-init.d/40-chown-files @@ -16,9 +16,8 @@ if [ ! "$(stat -c %u /config/Library)" = "$PUID" ]; then fi # remove plex pid after unclean stop -if [[ -f "/config/Library/Application Support/Plex Media Server/plexmediaserver.pid" ]]; then - rm -f "/config/Library/Application Support/Plex Media Server/plexmediaserver.pid" -fi +[[ -f "/config/Library/Application Support/Plex Media Server/plexmediaserver.pid" ]] && \ +rm -f "/config/Library/Application Support/Plex Media Server/plexmediaserver.pid" # permissions (non-recursive) on config root and folders chown abc:abc \ diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-claim/run b/root/etc/cont-init.d/45-plex-claim old mode 100755 new mode 100644 similarity index 93% rename from root/etc/s6-overlay/s6-rc.d/init-plex-claim/run rename to root/etc/cont-init.d/45-plex-claim index c597876..7841f54 --- a/root/etc/s6-overlay/s6-rc.d/init-plex-claim/run +++ b/root/etc/cont-init.d/45-plex-claim @@ -1,10 +1,6 @@ #!/usr/bin/with-contenv bash -if grep -qs "PlexOnlineToken" "/config/Library/Application Support/Plex Media Server/Preferences.xml"; then - echo "**** Server already claimed ****" - exit 0 -elif [ -z "$PLEX_CLAIM" ]; then - echo "**** Server is unclaimed, but no claim token has been set ****" +if grep -qs "PlexOnlineToken" "/config/Library/Application Support/Plex Media Server/Preferences.xml" || [ -z "$PLEX_CLAIM" ]; then exit 0 fi PREFNAME="/config/Library/Application Support/Plex Media Server/Preferences.xml" @@ -80,4 +76,4 @@ if [ -n "$PlexOnlineToken" ]; then sed -i "s/\/>/ PlexOnlineToken=\"${PlexOnlineToken}\"\/>/g" "${PREFNAME}" else echo "Unable to claim Plex server. Either manually claim by connecting to http://serverip:32400/web from the same network subnet, or recreate container with a new claim token." -fi +fi \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/run b/root/etc/cont-init.d/50-gid-video similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/run rename to root/etc/cont-init.d/50-gid-video diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-update/run b/root/etc/cont-init.d/60-plex-update similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-plex-update/run rename to root/etc/cont-init.d/60-plex-update diff --git a/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-plex-update b/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-plex-update deleted file mode 100644 index e69de29..0000000 diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-chown/dependencies.d/init-config b/root/etc/s6-overlay/s6-rc.d/init-plex-chown/dependencies.d/init-config deleted file mode 100644 index e69de29..0000000 diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-chown/type b/root/etc/s6-overlay/s6-rc.d/init-plex-chown/type deleted file mode 100644 index 3d92b15..0000000 --- a/root/etc/s6-overlay/s6-rc.d/init-plex-chown/type +++ /dev/null @@ -1 +0,0 @@ -oneshot \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-chown/up b/root/etc/s6-overlay/s6-rc.d/init-plex-chown/up deleted file mode 100644 index 2d5ad2f..0000000 --- a/root/etc/s6-overlay/s6-rc.d/init-plex-chown/up +++ /dev/null @@ -1 +0,0 @@ -/etc/s6-overlay/s6-rc.d/init-plex-chown/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-claim/dependencies.d/init-plex-chown b/root/etc/s6-overlay/s6-rc.d/init-plex-claim/dependencies.d/init-plex-chown deleted file mode 100644 index e69de29..0000000 diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-claim/type b/root/etc/s6-overlay/s6-rc.d/init-plex-claim/type deleted file mode 100644 index 3d92b15..0000000 --- a/root/etc/s6-overlay/s6-rc.d/init-plex-claim/type +++ /dev/null @@ -1 +0,0 @@ -oneshot \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-claim/up b/root/etc/s6-overlay/s6-rc.d/init-plex-claim/up deleted file mode 100644 index 56750b8..0000000 --- a/root/etc/s6-overlay/s6-rc.d/init-plex-claim/up +++ /dev/null @@ -1 +0,0 @@ -/etc/s6-overlay/s6-rc.d/init-plex-claim/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/dependencies.d/init-plex-claim b/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/dependencies.d/init-plex-claim deleted file mode 100644 index e69de29..0000000 diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/type b/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/type deleted file mode 100644 index 3d92b15..0000000 --- a/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/type +++ /dev/null @@ -1 +0,0 @@ -oneshot \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/up b/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/up deleted file mode 100644 index 05f6fde..0000000 --- a/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/up +++ /dev/null @@ -1 +0,0 @@ -/etc/s6-overlay/s6-rc.d/init-plex-gid-video/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-update/dependencies.d/init-plex-gid-video b/root/etc/s6-overlay/s6-rc.d/init-plex-update/dependencies.d/init-plex-gid-video deleted file mode 100644 index e69de29..0000000 diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-update/type b/root/etc/s6-overlay/s6-rc.d/init-plex-update/type deleted file mode 100644 index 3d92b15..0000000 --- a/root/etc/s6-overlay/s6-rc.d/init-plex-update/type +++ /dev/null @@ -1 +0,0 @@ -oneshot \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-update/up b/root/etc/s6-overlay/s6-rc.d/init-plex-update/up deleted file mode 100644 index 6b6b164..0000000 --- a/root/etc/s6-overlay/s6-rc.d/init-plex-update/up +++ /dev/null @@ -1 +0,0 @@ -/etc/s6-overlay/s6-rc.d/init-plex-update/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/svc-plex/dependencies.d/init-services b/root/etc/s6-overlay/s6-rc.d/svc-plex/dependencies.d/init-services deleted file mode 100644 index e69de29..0000000 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-plex/notification-fd b/root/etc/s6-overlay/s6-rc.d/svc-plex/notification-fd deleted file mode 100644 index e440e5c..0000000 --- a/root/etc/s6-overlay/s6-rc.d/svc-plex/notification-fd +++ /dev/null @@ -1 +0,0 @@ -3 \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/svc-plex/run b/root/etc/s6-overlay/s6-rc.d/svc-plex/run deleted file mode 100755 index ba42c34..0000000 --- a/root/etc/s6-overlay/s6-rc.d/svc-plex/run +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/with-contenv bash - -echo "Starting Plex Media Server. . . (you can ignore the libusb_init error)" -export PLEX_MEDIA_SERVER_INFO_MODEL=$(uname -m) -export PLEX_MEDIA_SERVER_INFO_PLATFORM_VERSION=$(uname -r) -exec \ - s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z 127.0.0.1 32400" \ - s6-setuidgid abc "/usr/lib/plexmediaserver/Plex Media Server" diff --git a/root/etc/s6-overlay/s6-rc.d/svc-plex/type b/root/etc/s6-overlay/s6-rc.d/svc-plex/type deleted file mode 100644 index 1780f9f..0000000 --- a/root/etc/s6-overlay/s6-rc.d/svc-plex/type +++ /dev/null @@ -1 +0,0 @@ -longrun \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-plex-chown b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-plex-chown deleted file mode 100644 index e69de29..0000000 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-plex-claim b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-plex-claim deleted file mode 100644 index e69de29..0000000 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-plex-gid-video b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-plex-gid-video deleted file mode 100644 index e69de29..0000000 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-plex-update b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-plex-update deleted file mode 100644 index e69de29..0000000 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-plex b/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-plex deleted file mode 100644 index e69de29..0000000 diff --git a/root/etc/services.d/plex/run b/root/etc/services.d/plex/run new file mode 100644 index 0000000..9db8cdc --- /dev/null +++ b/root/etc/services.d/plex/run @@ -0,0 +1,8 @@ +#!/usr/bin/with-contenv bash + +echo "Starting Plex Media Server." +export PLEX_MEDIA_SERVER_INFO_MODEL=$(uname -m) +export PLEX_MEDIA_SERVER_INFO_PLATFORM_VERSION=$(uname -r) +exec \ + s6-setuidgid abc \ + /usr/lib/plexmediaserver/Plex\ Media\ Server From c1cded90302d78d9c6497f8b6e9af593bcec816a Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Wed, 19 Oct 2022 10:17:56 -0500 Subject: [PATCH 285/514] Revert "Revert "rebase plex to jammy, update to s6v3, remove opencl drivers"" --- Dockerfile | 10 +--------- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- README.md | 1 + readme-vars.yml | 1 + .../init-config-end/dependencies.d/init-plex-update | 0 .../s6-rc.d/init-plex-chown/dependencies.d/init-config | 0 .../s6-rc.d/init-plex-chown/run} | 5 +++-- root/etc/s6-overlay/s6-rc.d/init-plex-chown/type | 1 + root/etc/s6-overlay/s6-rc.d/init-plex-chown/up | 1 + .../init-plex-claim/dependencies.d/init-plex-chown | 0 .../s6-rc.d/init-plex-claim/run} | 8 ++++++-- root/etc/s6-overlay/s6-rc.d/init-plex-claim/type | 1 + root/etc/s6-overlay/s6-rc.d/init-plex-claim/up | 1 + .../init-plex-gid-video/dependencies.d/init-plex-claim | 0 .../s6-rc.d/init-plex-gid-video/run} | 0 root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/type | 1 + root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/up | 1 + .../dependencies.d/init-plex-gid-video | 0 .../s6-rc.d/init-plex-update/run} | 0 root/etc/s6-overlay/s6-rc.d/init-plex-update/type | 1 + root/etc/s6-overlay/s6-rc.d/init-plex-update/up | 1 + .../s6-rc.d/svc-plex/dependencies.d/init-services | 0 root/etc/s6-overlay/s6-rc.d/svc-plex/notification-fd | 1 + root/etc/s6-overlay/s6-rc.d/svc-plex/run | 8 ++++++++ root/etc/s6-overlay/s6-rc.d/svc-plex/type | 1 + .../s6-overlay/s6-rc.d/user/contents.d/init-plex-chown | 0 .../s6-overlay/s6-rc.d/user/contents.d/init-plex-claim | 0 .../s6-rc.d/user/contents.d/init-plex-gid-video | 0 .../s6-rc.d/user/contents.d/init-plex-update | 0 root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-plex | 0 root/etc/services.d/plex/run | 8 -------- 32 files changed, 32 insertions(+), 23 deletions(-) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-plex-update create mode 100644 root/etc/s6-overlay/s6-rc.d/init-plex-chown/dependencies.d/init-config rename root/etc/{cont-init.d/40-chown-files => s6-overlay/s6-rc.d/init-plex-chown/run} (77%) mode change 100644 => 100755 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-plex-chown/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-plex-chown/up create mode 100644 root/etc/s6-overlay/s6-rc.d/init-plex-claim/dependencies.d/init-plex-chown rename root/etc/{cont-init.d/45-plex-claim => s6-overlay/s6-rc.d/init-plex-claim/run} (93%) mode change 100644 => 100755 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-plex-claim/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-plex-claim/up create mode 100644 root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/dependencies.d/init-plex-claim rename root/etc/{cont-init.d/50-gid-video => s6-overlay/s6-rc.d/init-plex-gid-video/run} (100%) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/up create mode 100644 root/etc/s6-overlay/s6-rc.d/init-plex-update/dependencies.d/init-plex-gid-video rename root/etc/{cont-init.d/60-plex-update => s6-overlay/s6-rc.d/init-plex-update/run} (100%) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-plex-update/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-plex-update/up create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-plex/dependencies.d/init-services create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-plex/notification-fd create mode 100755 root/etc/s6-overlay/s6-rc.d/svc-plex/run create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-plex/type create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-plex-chown create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-plex-claim create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-plex-gid-video create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-plex-update create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-plex delete mode 100644 root/etc/services.d/plex/run diff --git a/Dockerfile b/Dockerfile index 3204aed..26a889b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:focal +FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy # set version label ARG BUILD_DATE @@ -22,18 +22,10 @@ ENV DEBIAN_FRONTEND="noninteractive" \ PLEX_MEDIA_SERVER_INFO_DEVICE="Docker Container (LinuxServer.io)" RUN \ - echo "**** add Intel repo ****" && \ - curl -sL https://repositories.intel.com/graphics/intel-graphics.key | apt-key add - && \ - echo 'deb [arch=amd64] https://repositories.intel.com/graphics/ubuntu focal main' > /etc/apt/sources.list.d/intel.list && \ echo "**** install runtime packages ****" && \ apt-get update && \ apt-get install -y \ jq \ - intel-igc-cm=1.0.128+i699.3~u20.04 \ - intel-opencl-icd=21.49.21786+i643~u20.04 \ - libigc1=1.0.10409+i699.3~u20.04 \ - libigdfcl1=1.0.10409+i699.3~u20.04 \ - libigdgmm11=21.3.3+i643~u20.04 \ udev \ unrar \ wget && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index ffe9a7a..a005fdd 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-focal +FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy # set version label ARG BUILD_DATE diff --git a/Dockerfile.armhf b/Dockerfile.armhf index e4ce32e..279bbe7 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-focal +FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-jammy # set version label ARG BUILD_DATE diff --git a/README.md b/README.md index b471958..f8578ce 100644 --- a/README.md +++ b/README.md @@ -299,6 +299,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **16.10.22:** - Rebase to jammy. Update to s6v3. Remove opencl packages (bundled with plex). * **18.07.22:** - Pin all opencl related driver packages. * **16.05.22:** - Pin opencl version. * **04.03.22:** - Increase verbosity of video device permissions fix, attempt to fix missing group rw. diff --git a/readme-vars.yml b/readme-vars.yml index dc0718d..9a1e7e2 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -107,6 +107,7 @@ app_setup_block: | # changelog changelogs: + - { date: "16.10.22:", desc: "Rebase to jammy. Update to s6v3. Remove opencl packages (bundled with plex)." } - { date: "18.07.22:", desc: "Pin all opencl related driver packages." } - { date: "16.05.22:", desc: "Pin opencl version." } - { date: "04.03.22:", desc: "Increase verbosity of video device permissions fix, attempt to fix missing group rw." } diff --git a/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-plex-update b/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-plex-update new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-chown/dependencies.d/init-config b/root/etc/s6-overlay/s6-rc.d/init-plex-chown/dependencies.d/init-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/cont-init.d/40-chown-files b/root/etc/s6-overlay/s6-rc.d/init-plex-chown/run old mode 100644 new mode 100755 similarity index 77% rename from root/etc/cont-init.d/40-chown-files rename to root/etc/s6-overlay/s6-rc.d/init-plex-chown/run index b2e3c31..b64fe98 --- a/root/etc/cont-init.d/40-chown-files +++ b/root/etc/s6-overlay/s6-rc.d/init-plex-chown/run @@ -16,8 +16,9 @@ if [ ! "$(stat -c %u /config/Library)" = "$PUID" ]; then fi # remove plex pid after unclean stop -[[ -f "/config/Library/Application Support/Plex Media Server/plexmediaserver.pid" ]] && \ -rm -f "/config/Library/Application Support/Plex Media Server/plexmediaserver.pid" +if [[ -f "/config/Library/Application Support/Plex Media Server/plexmediaserver.pid" ]]; then + rm -f "/config/Library/Application Support/Plex Media Server/plexmediaserver.pid" +fi # permissions (non-recursive) on config root and folders chown abc:abc \ diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-chown/type b/root/etc/s6-overlay/s6-rc.d/init-plex-chown/type new file mode 100644 index 0000000..3d92b15 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-plex-chown/type @@ -0,0 +1 @@ +oneshot \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-chown/up b/root/etc/s6-overlay/s6-rc.d/init-plex-chown/up new file mode 100644 index 0000000..2d5ad2f --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-plex-chown/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-plex-chown/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-claim/dependencies.d/init-plex-chown b/root/etc/s6-overlay/s6-rc.d/init-plex-claim/dependencies.d/init-plex-chown new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/cont-init.d/45-plex-claim b/root/etc/s6-overlay/s6-rc.d/init-plex-claim/run old mode 100644 new mode 100755 similarity index 93% rename from root/etc/cont-init.d/45-plex-claim rename to root/etc/s6-overlay/s6-rc.d/init-plex-claim/run index 7841f54..c597876 --- a/root/etc/cont-init.d/45-plex-claim +++ b/root/etc/s6-overlay/s6-rc.d/init-plex-claim/run @@ -1,6 +1,10 @@ #!/usr/bin/with-contenv bash -if grep -qs "PlexOnlineToken" "/config/Library/Application Support/Plex Media Server/Preferences.xml" || [ -z "$PLEX_CLAIM" ]; then +if grep -qs "PlexOnlineToken" "/config/Library/Application Support/Plex Media Server/Preferences.xml"; then + echo "**** Server already claimed ****" + exit 0 +elif [ -z "$PLEX_CLAIM" ]; then + echo "**** Server is unclaimed, but no claim token has been set ****" exit 0 fi PREFNAME="/config/Library/Application Support/Plex Media Server/Preferences.xml" @@ -76,4 +80,4 @@ if [ -n "$PlexOnlineToken" ]; then sed -i "s/\/>/ PlexOnlineToken=\"${PlexOnlineToken}\"\/>/g" "${PREFNAME}" else echo "Unable to claim Plex server. Either manually claim by connecting to http://serverip:32400/web from the same network subnet, or recreate container with a new claim token." -fi \ No newline at end of file +fi diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-claim/type b/root/etc/s6-overlay/s6-rc.d/init-plex-claim/type new file mode 100644 index 0000000..3d92b15 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-plex-claim/type @@ -0,0 +1 @@ +oneshot \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-claim/up b/root/etc/s6-overlay/s6-rc.d/init-plex-claim/up new file mode 100644 index 0000000..56750b8 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-plex-claim/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-plex-claim/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/dependencies.d/init-plex-claim b/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/dependencies.d/init-plex-claim new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/cont-init.d/50-gid-video b/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/run similarity index 100% rename from root/etc/cont-init.d/50-gid-video rename to root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/run diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/type b/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/type new file mode 100644 index 0000000..3d92b15 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/type @@ -0,0 +1 @@ +oneshot \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/up b/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/up new file mode 100644 index 0000000..05f6fde --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-plex-gid-video/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-update/dependencies.d/init-plex-gid-video b/root/etc/s6-overlay/s6-rc.d/init-plex-update/dependencies.d/init-plex-gid-video new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/cont-init.d/60-plex-update b/root/etc/s6-overlay/s6-rc.d/init-plex-update/run similarity index 100% rename from root/etc/cont-init.d/60-plex-update rename to root/etc/s6-overlay/s6-rc.d/init-plex-update/run diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-update/type b/root/etc/s6-overlay/s6-rc.d/init-plex-update/type new file mode 100644 index 0000000..3d92b15 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-plex-update/type @@ -0,0 +1 @@ +oneshot \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-update/up b/root/etc/s6-overlay/s6-rc.d/init-plex-update/up new file mode 100644 index 0000000..6b6b164 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-plex-update/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-plex-update/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/svc-plex/dependencies.d/init-services b/root/etc/s6-overlay/s6-rc.d/svc-plex/dependencies.d/init-services new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-plex/notification-fd b/root/etc/s6-overlay/s6-rc.d/svc-plex/notification-fd new file mode 100644 index 0000000..e440e5c --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-plex/notification-fd @@ -0,0 +1 @@ +3 \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/svc-plex/run b/root/etc/s6-overlay/s6-rc.d/svc-plex/run new file mode 100755 index 0000000..ba42c34 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-plex/run @@ -0,0 +1,8 @@ +#!/usr/bin/with-contenv bash + +echo "Starting Plex Media Server. . . (you can ignore the libusb_init error)" +export PLEX_MEDIA_SERVER_INFO_MODEL=$(uname -m) +export PLEX_MEDIA_SERVER_INFO_PLATFORM_VERSION=$(uname -r) +exec \ + s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z 127.0.0.1 32400" \ + s6-setuidgid abc "/usr/lib/plexmediaserver/Plex Media Server" diff --git a/root/etc/s6-overlay/s6-rc.d/svc-plex/type b/root/etc/s6-overlay/s6-rc.d/svc-plex/type new file mode 100644 index 0000000..1780f9f --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-plex/type @@ -0,0 +1 @@ +longrun \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-plex-chown b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-plex-chown new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-plex-claim b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-plex-claim new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-plex-gid-video b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-plex-gid-video new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-plex-update b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-plex-update new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-plex b/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-plex new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/services.d/plex/run b/root/etc/services.d/plex/run deleted file mode 100644 index 9db8cdc..0000000 --- a/root/etc/services.d/plex/run +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/with-contenv bash - -echo "Starting Plex Media Server." -export PLEX_MEDIA_SERVER_INFO_MODEL=$(uname -m) -export PLEX_MEDIA_SERVER_INFO_PLATFORM_VERSION=$(uname -r) -exec \ - s6-setuidgid abc \ - /usr/lib/plexmediaserver/Plex\ Media\ Server From ed6eba980f7ccd0644a0b3743879f6e32c70228b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 19 Oct 2022 17:26:56 +0200 Subject: [PATCH 286/514] Bot Updating Package Versions --- package_versions.txt | 305 ++++++++++++++++++++++--------------------- 1 file changed, 157 insertions(+), 148 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 538f54a..13aacf5 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,149 +1,158 @@ -adduser3.118ubuntu5 -apt2.4.8 -apt-utils2.4.8 -base-files12ubuntu4.2 -base-passwd3.5.52build1 -bash5.1-6ubuntu1 -bsdutils1:2.37.2-4ubuntu3 -ca-certificates20211016 -coreutils8.32-4.1ubuntu1 -curl7.81.0-1ubuntu1.4 -dash0.5.11+git20210903+057cd650a4ed-3build1 -debconf1.5.79ubuntu1 -debianutils5.5-1ubuntu2 -diffutils1:3.8-0ubuntu2 -dirmngr2.2.27-3ubuntu2.1 -dpkg1.21.1ubuntu2.1 -e2fsprogs1.46.5-2ubuntu1.1 -findutils4.8.0-1ubuntu3 -gcc-12-base12.1.0-2ubuntu1~22.04 -gnupg2.2.27-3ubuntu2.1 -gnupg-l10n2.2.27-3ubuntu2.1 -gnupg-utils2.2.27-3ubuntu2.1 -gpg2.2.27-3ubuntu2.1 -gpg-agent2.2.27-3ubuntu2.1 -gpgconf2.2.27-3ubuntu2.1 -gpgsm2.2.27-3ubuntu2.1 -gpgv2.2.27-3ubuntu2.1 -gpg-wks-client2.2.27-3ubuntu2.1 -gpg-wks-server2.2.27-3ubuntu2.1 -grep3.7-1build1 -gzip1.10-4ubuntu4.1 -hostname3.23ubuntu2 -init-system-helpers1.62 -jq1.6-2.1ubuntu3 -libacl12.3.1-1 -libapt-pkg6.02.4.8 -libassuan02.5.5-1build1 -libattr11:2.5.1-1build1 -libaudit11:3.0.7-1build1 -libaudit-common1:3.0.7-1build1 -libblkid12.37.2-4ubuntu3 -libbrotli11.0.9-2build6 -libbsd00.11.5-1 -libbz2-1.01.0.8-5build1 -libc62.35-0ubuntu3.1 -libcap21:2.44-1build3 -libcap-ng00.7.9-2.2build3 -libc-bin2.35-0ubuntu3.1 -libcom-err21.46.5-2ubuntu1.1 -libcrypt11:4.4.27-1 -libcurl47.81.0-1ubuntu1.4 -libdb5.35.3.28+dfsg1-0.8ubuntu3 -libdebconfclient00.261ubuntu1 -libext2fs21.46.5-2ubuntu1.1 -libffi83.4.2-4 -libgcc-s112.1.0-2ubuntu1~22.04 -libgcrypt201.9.4-3ubuntu3 -libgmp102:6.2.1+dfsg-3ubuntu1 -libgnutls303.7.3-4ubuntu1.1 -libgpg-error01.43-3 -libgssapi-krb5-21.19.2-2 -libhogweed63.7.3-1build2 -libidn2-02.3.2-2build1 -libjq11.6-2.1ubuntu3 -libk5crypto31.19.2-2 -libkeyutils11.6.1-2ubuntu3 -libkmod229-1ubuntu1 -libkrb5-31.19.2-2 -libkrb5support01.19.2-2 -libksba81.6.0-2build1 -libldap-2.5-02.5.13+dfsg-0ubuntu0.22.04.1 -libldap-common2.5.13+dfsg-0ubuntu0.22.04.1 -liblz4-11.9.3-2build2 -liblzma55.2.5-2ubuntu1 -libmd01.0.4-1build1 -libmount12.37.2-4ubuntu3 -libncurses66.3-2 -libncursesw66.3-2 -libnettle83.7.3-1build2 -libnghttp2-141.43.0-1build3 -libnpth01.6-3build2 -libnsl21.3.0-2build2 -libonig56.9.7.1-2build1 -libp11-kit00.24.0-6build1 -libpam0g1.4.0-11ubuntu2 -libpam-modules1.4.0-11ubuntu2 -libpam-modules-bin1.4.0-11ubuntu2 -libpam-runtime1.4.0-11ubuntu2 -libpcre2-8-010.39-3ubuntu0.1 -libpcre32:8.39-13ubuntu0.22.04.1 -libprocps82:3.3.17-6ubuntu2 -libpsl50.21.0-1.2build2 -libreadline88.1.2-1 -librtmp12.4+20151223.gitfa8646d.1-2build4 -libsasl2-22.1.27+dfsg2-3ubuntu1 -libsasl2-modules2.1.27+dfsg2-3ubuntu1 -libsasl2-modules-db2.1.27+dfsg2-3ubuntu1 -libseccomp22.5.3-2ubuntu2 -libselinux13.3-1build2 -libsemanage23.3-1build2 -libsemanage-common3.3-1build2 -libsepol23.3-1build1 -libsmartcols12.37.2-4ubuntu3 -libsqlite3-03.37.2-2 -libss21.46.5-2ubuntu1.1 -libssh-40.9.6-2build1 -libssl33.0.2-0ubuntu1.6 -libstdc++612.1.0-2ubuntu1~22.04 -libsystemd0249.11-0ubuntu3.6 -libtasn1-64.18.0-4build1 -libtinfo66.3-2 -libtirpc31.3.2-2ubuntu0.1 -libtirpc-common1.3.2-2ubuntu0.1 -libudev1249.11-0ubuntu3.6 -libunistring21.0-1 -libuuid12.37.2-4ubuntu3 -libxxhash00.8.1-1 -libzstd11.4.8+dfsg-3build1 -locales2.35-0ubuntu3.1 -login1:4.8.1-2ubuntu2 -logsave1.46.5-2ubuntu1.1 -lsb-base11.1.0ubuntu4 -mawk1.3.4.20200120-3 -mount2.37.2-4ubuntu3 -ncurses-base6.3-2 -ncurses-bin6.3-2 -netcat1.218-4ubuntu1 -netcat-openbsd1.218-4ubuntu1 -openssl3.0.2-0ubuntu1.6 -passwd1:4.8.1-2ubuntu2 -perl-base5.34.0-3ubuntu1 -pinentry-curses1.1.1-1build2 +adduser3.118ubuntu2 +apt2.0.9 +apt-utils2.0.9 +base-files11ubuntu5.5 +base-passwd3.5.47 +bash5.0-6ubuntu1.1 +bsdutils1:2.34-0.1ubuntu9.3 +bzip21.0.8-2 +ca-certificates20211016~20.04.1 +coreutils8.30-3ubuntu2 +curl7.68.0-1ubuntu2.13 +dash0.5.10.2-6 +debconf1.5.73 +debianutils4.9.1 +diffutils1:3.7-3 +dirmngr2.2.19-3ubuntu2.2 +dpkg1.19.7ubuntu3 +e2fsprogs1.45.5-2ubuntu1 +fdisk2.34-0.1ubuntu9.3 +findutils4.7.0-1ubuntu1 +gcc-10-base10.3.0-1ubuntu1~20.04 +gnupg2.2.19-3ubuntu2.2 +gnupg-l10n2.2.19-3ubuntu2.2 +gnupg-utils2.2.19-3ubuntu2.2 +gpg2.2.19-3ubuntu2.2 +gpg-agent2.2.19-3ubuntu2.2 +gpgconf2.2.19-3ubuntu2.2 +gpgsm2.2.19-3ubuntu2.2 +gpgv2.2.19-3ubuntu2.2 +gpg-wks-client2.2.19-3ubuntu2.2 +gpg-wks-server2.2.19-3ubuntu2.2 +grep3.4-1 +gzip1.10-0ubuntu4 +hostname3.23 +init-system-helpers1.57 +intel-igc-cm1.0.128+i699.3~u20.04 +intel-opencl-icd21.49.21786+i643~u20.04 +jq1.6-1ubuntu0.20.04.1 +krb5-locales1.17-6ubuntu4.1 +libacl12.2.53-6 +libapt-pkg6.02.0.9 +libasn1-8-heimdal7.7.0+dfsg-1ubuntu1.1 +libassuan02.5.3-7ubuntu2 +libattr11:2.4.48-5 +libaudit11:2.8.5-2ubuntu6 +libaudit-common1:2.8.5-2ubuntu6 +libblkid12.34-0.1ubuntu9.3 +libbrotli11.0.7-6ubuntu0.1 +libbz2-1.01.0.8-2 +libc62.31-0ubuntu9.7 +libcap-ng00.7.9-2.1build1 +libc-bin2.31-0ubuntu9.7 +libcom-err21.45.5-2ubuntu1 +libcrypt11:4.4.10-10ubuntu4 +libcurl47.68.0-1ubuntu2.13 +libdb5.35.3.28+dfsg1-0.6ubuntu2 +libdebconfclient00.251ubuntu1 +libext2fs21.45.5-2ubuntu1 +libfdisk12.34-0.1ubuntu9.3 +libffi73.3-4 +libgcc-s110.3.0-1ubuntu1~20.04 +libgcrypt201.8.5-5ubuntu1.1 +libgmp102:6.2.0+dfsg-4 +libgnutls303.6.13-2ubuntu1.6 +libgpg-error01.37-1 +libgssapi3-heimdal7.7.0+dfsg-1ubuntu1.1 +libgssapi-krb5-21.17-6ubuntu4.1 +libhcrypto4-heimdal7.7.0+dfsg-1ubuntu1.1 +libheimbase1-heimdal7.7.0+dfsg-1ubuntu1.1 +libheimntlm0-heimdal7.7.0+dfsg-1ubuntu1.1 +libhogweed53.5.1+really3.5.1-2ubuntu0.2 +libhx509-5-heimdal7.7.0+dfsg-1ubuntu1.1 +libidn2-02.2.0-2 +libigc11.0.10409+i699.3~u20.04 +libigdfcl11.0.10409+i699.3~u20.04 +libigdgmm1121.3.3+i643~u20.04 +libjq11.6-1ubuntu0.20.04.1 +libk5crypto31.17-6ubuntu4.1 +libkeyutils11.6-6ubuntu1.1 +libkmod227-1ubuntu2.1 +libkrb5-26-heimdal7.7.0+dfsg-1ubuntu1.1 +libkrb5-31.17-6ubuntu4.1 +libkrb5support01.17-6ubuntu4.1 +libksba81.3.5-2 +libldap-2.4-22.4.49+dfsg-2ubuntu1.9 +libldap-common2.4.49+dfsg-2ubuntu1.9 +liblz4-11.9.2-2ubuntu0.20.04.1 +liblzma55.2.4-1ubuntu1 +libmount12.34-0.1ubuntu9.3 +libncurses66.2-0ubuntu2 +libncursesw66.2-0ubuntu2 +libnettle73.5.1+really3.5.1-2ubuntu0.2 +libnghttp2-141.40.0-1build1 +libnpth01.6-1 +libonig56.9.4-1 +libp11-kit00.23.20-1ubuntu0.1 +libpam0g1.3.1-5ubuntu4.3 +libpam-modules1.3.1-5ubuntu4.3 +libpam-modules-bin1.3.1-5ubuntu4.3 +libpam-runtime1.3.1-5ubuntu4.3 +libpcre2-8-010.34-7 +libpcre32:8.39-12build1 +libprocps82:3.3.16-1ubuntu2.3 +libpsl50.21.0-1ubuntu1 +libreadline88.0-4 +libroken18-heimdal7.7.0+dfsg-1ubuntu1.1 +librtmp12.4+20151223.gitfa8646d.1-2build1 +libsasl2-22.1.27+dfsg-2ubuntu0.1 +libsasl2-modules2.1.27+dfsg-2ubuntu0.1 +libsasl2-modules-db2.1.27+dfsg-2ubuntu0.1 +libseccomp22.5.1-1ubuntu1~20.04.2 +libselinux13.0-1build2 +libsemanage13.0-1build2 +libsemanage-common3.0-1build2 +libsepol13.0-1 +libsmartcols12.34-0.1ubuntu9.3 +libsqlite3-03.31.1-4ubuntu0.4 +libss21.45.5-2ubuntu1 +libssh-40.9.3-2ubuntu2.2 +libssl1.11.1.1f-1ubuntu2.16 +libstdc++610.3.0-1ubuntu1~20.04 +libsystemd0245.4-4ubuntu3.15 +libtasn1-64.16.0-2 +libtinfo66.2-0ubuntu2 +libudev1245.4-4ubuntu3.18 +libunistring20.9.10-2 +libuuid12.34-0.1ubuntu9.3 +libwind0-heimdal7.7.0+dfsg-1ubuntu1.1 +libz3-44.8.7-4build1 +libzstd11.4.4+dfsg-3ubuntu0.1 +locales2.31-0ubuntu9.9 +login1:4.8.1-1ubuntu5.20.04.1 +logsave1.45.5-2ubuntu1 +lsb-base11.1.0ubuntu2 +mawk1.3.4.20200120-2 +mount2.34-0.1ubuntu9.3 +ncurses-base6.2-0ubuntu2 +ncurses-bin6.2-0ubuntu2 +ocl-icd-libopencl12.2.11-1ubuntu1 +openssl1.1.1f-1ubuntu2.16 +passwd1:4.8.1-1ubuntu5.20.04.1 +perl-base5.30.0-9ubuntu0.2 +pinentry-curses1.1.0-3build1 plexmediaserver1.29.0.6244-819d3678c -procps2:3.3.17-6ubuntu2 -publicsuffix20211207.1025-1 -readline-common8.1.2-1 -sed4.8-1ubuntu2 -sensible-utils0.0.17 -systemd-hwe-hwdb249.11.1 -sysvinit-utils3.01-1ubuntu1 -tar1.34+dfsg-1build3 -tzdata2022c-0ubuntu0.22.04.0 -ubuntu-keyring2021.03.26 -udev249.11-0ubuntu3.6 -unrar1:6.1.5-1 -usrmerge25ubuntu2 -util-linux2.37.2-4ubuntu3 -wget1.21.2-2ubuntu1 -zlib1g1:1.2.11.dfsg-2ubuntu9.1 +procps2:3.3.16-1ubuntu2.3 +publicsuffix20200303.0012-1 +readline-common8.0-4 +sed4.7-1 +sensible-utils0.0.12+nmu1 +sysvinit-utils2.96-2.1ubuntu1 +tar1.30+dfsg-7ubuntu0.20.04.2 +tzdata2022c-0ubuntu0.20.04.0 +ubuntu-keyring2020.02.11.4 +udev245.4-4ubuntu3.18 +unrar1:5.6.6-2build1 +util-linux2.34-0.1ubuntu9.3 +wget1.20.3-1ubuntu2 +zlib1g1:1.2.11.dfsg-2ubuntu1.2 From b4c73629c6f361093f79c284d962d4249274d53d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 20 Oct 2022 20:24:49 +0200 Subject: [PATCH 287/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 13aacf5..388196f 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -141,7 +141,7 @@ openssl1.1.1f-1ubuntu2.16 passwd1:4.8.1-1ubuntu5.20.04.1 perl-base5.30.0-9ubuntu0.2 pinentry-curses1.1.0-3build1 -plexmediaserver1.29.0.6244-819d3678c +plexmediaserver1.29.1.6316-f4cdfea9c procps2:3.3.16-1ubuntu2.3 publicsuffix20200303.0012-1 readline-common8.0-4 From 0c17a07f26ba446b1066bf10fafeb063b1e4ae65 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 21 Oct 2022 01:13:55 +0200 Subject: [PATCH 288/514] Bot Updating Package Versions --- package_versions.txt | 305 +++++++++++++++++++++---------------------- 1 file changed, 148 insertions(+), 157 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 388196f..2c20079 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,158 +1,149 @@ -adduser3.118ubuntu2 -apt2.0.9 -apt-utils2.0.9 -base-files11ubuntu5.5 -base-passwd3.5.47 -bash5.0-6ubuntu1.1 -bsdutils1:2.34-0.1ubuntu9.3 -bzip21.0.8-2 -ca-certificates20211016~20.04.1 -coreutils8.30-3ubuntu2 -curl7.68.0-1ubuntu2.13 -dash0.5.10.2-6 -debconf1.5.73 -debianutils4.9.1 -diffutils1:3.7-3 -dirmngr2.2.19-3ubuntu2.2 -dpkg1.19.7ubuntu3 -e2fsprogs1.45.5-2ubuntu1 -fdisk2.34-0.1ubuntu9.3 -findutils4.7.0-1ubuntu1 -gcc-10-base10.3.0-1ubuntu1~20.04 -gnupg2.2.19-3ubuntu2.2 -gnupg-l10n2.2.19-3ubuntu2.2 -gnupg-utils2.2.19-3ubuntu2.2 -gpg2.2.19-3ubuntu2.2 -gpg-agent2.2.19-3ubuntu2.2 -gpgconf2.2.19-3ubuntu2.2 -gpgsm2.2.19-3ubuntu2.2 -gpgv2.2.19-3ubuntu2.2 -gpg-wks-client2.2.19-3ubuntu2.2 -gpg-wks-server2.2.19-3ubuntu2.2 -grep3.4-1 -gzip1.10-0ubuntu4 -hostname3.23 -init-system-helpers1.57 -intel-igc-cm1.0.128+i699.3~u20.04 -intel-opencl-icd21.49.21786+i643~u20.04 -jq1.6-1ubuntu0.20.04.1 -krb5-locales1.17-6ubuntu4.1 -libacl12.2.53-6 -libapt-pkg6.02.0.9 -libasn1-8-heimdal7.7.0+dfsg-1ubuntu1.1 -libassuan02.5.3-7ubuntu2 -libattr11:2.4.48-5 -libaudit11:2.8.5-2ubuntu6 -libaudit-common1:2.8.5-2ubuntu6 -libblkid12.34-0.1ubuntu9.3 -libbrotli11.0.7-6ubuntu0.1 -libbz2-1.01.0.8-2 -libc62.31-0ubuntu9.7 -libcap-ng00.7.9-2.1build1 -libc-bin2.31-0ubuntu9.7 -libcom-err21.45.5-2ubuntu1 -libcrypt11:4.4.10-10ubuntu4 -libcurl47.68.0-1ubuntu2.13 -libdb5.35.3.28+dfsg1-0.6ubuntu2 -libdebconfclient00.251ubuntu1 -libext2fs21.45.5-2ubuntu1 -libfdisk12.34-0.1ubuntu9.3 -libffi73.3-4 -libgcc-s110.3.0-1ubuntu1~20.04 -libgcrypt201.8.5-5ubuntu1.1 -libgmp102:6.2.0+dfsg-4 -libgnutls303.6.13-2ubuntu1.6 -libgpg-error01.37-1 -libgssapi3-heimdal7.7.0+dfsg-1ubuntu1.1 -libgssapi-krb5-21.17-6ubuntu4.1 -libhcrypto4-heimdal7.7.0+dfsg-1ubuntu1.1 -libheimbase1-heimdal7.7.0+dfsg-1ubuntu1.1 -libheimntlm0-heimdal7.7.0+dfsg-1ubuntu1.1 -libhogweed53.5.1+really3.5.1-2ubuntu0.2 -libhx509-5-heimdal7.7.0+dfsg-1ubuntu1.1 -libidn2-02.2.0-2 -libigc11.0.10409+i699.3~u20.04 -libigdfcl11.0.10409+i699.3~u20.04 -libigdgmm1121.3.3+i643~u20.04 -libjq11.6-1ubuntu0.20.04.1 -libk5crypto31.17-6ubuntu4.1 -libkeyutils11.6-6ubuntu1.1 -libkmod227-1ubuntu2.1 -libkrb5-26-heimdal7.7.0+dfsg-1ubuntu1.1 -libkrb5-31.17-6ubuntu4.1 -libkrb5support01.17-6ubuntu4.1 -libksba81.3.5-2 -libldap-2.4-22.4.49+dfsg-2ubuntu1.9 -libldap-common2.4.49+dfsg-2ubuntu1.9 -liblz4-11.9.2-2ubuntu0.20.04.1 -liblzma55.2.4-1ubuntu1 -libmount12.34-0.1ubuntu9.3 -libncurses66.2-0ubuntu2 -libncursesw66.2-0ubuntu2 -libnettle73.5.1+really3.5.1-2ubuntu0.2 -libnghttp2-141.40.0-1build1 -libnpth01.6-1 -libonig56.9.4-1 -libp11-kit00.23.20-1ubuntu0.1 -libpam0g1.3.1-5ubuntu4.3 -libpam-modules1.3.1-5ubuntu4.3 -libpam-modules-bin1.3.1-5ubuntu4.3 -libpam-runtime1.3.1-5ubuntu4.3 -libpcre2-8-010.34-7 -libpcre32:8.39-12build1 -libprocps82:3.3.16-1ubuntu2.3 -libpsl50.21.0-1ubuntu1 -libreadline88.0-4 -libroken18-heimdal7.7.0+dfsg-1ubuntu1.1 -librtmp12.4+20151223.gitfa8646d.1-2build1 -libsasl2-22.1.27+dfsg-2ubuntu0.1 -libsasl2-modules2.1.27+dfsg-2ubuntu0.1 -libsasl2-modules-db2.1.27+dfsg-2ubuntu0.1 -libseccomp22.5.1-1ubuntu1~20.04.2 -libselinux13.0-1build2 -libsemanage13.0-1build2 -libsemanage-common3.0-1build2 -libsepol13.0-1 -libsmartcols12.34-0.1ubuntu9.3 -libsqlite3-03.31.1-4ubuntu0.4 -libss21.45.5-2ubuntu1 -libssh-40.9.3-2ubuntu2.2 -libssl1.11.1.1f-1ubuntu2.16 -libstdc++610.3.0-1ubuntu1~20.04 -libsystemd0245.4-4ubuntu3.15 -libtasn1-64.16.0-2 -libtinfo66.2-0ubuntu2 -libudev1245.4-4ubuntu3.18 -libunistring20.9.10-2 -libuuid12.34-0.1ubuntu9.3 -libwind0-heimdal7.7.0+dfsg-1ubuntu1.1 -libz3-44.8.7-4build1 -libzstd11.4.4+dfsg-3ubuntu0.1 -locales2.31-0ubuntu9.9 -login1:4.8.1-1ubuntu5.20.04.1 -logsave1.45.5-2ubuntu1 -lsb-base11.1.0ubuntu2 -mawk1.3.4.20200120-2 -mount2.34-0.1ubuntu9.3 -ncurses-base6.2-0ubuntu2 -ncurses-bin6.2-0ubuntu2 -ocl-icd-libopencl12.2.11-1ubuntu1 -openssl1.1.1f-1ubuntu2.16 -passwd1:4.8.1-1ubuntu5.20.04.1 -perl-base5.30.0-9ubuntu0.2 -pinentry-curses1.1.0-3build1 +adduser3.118ubuntu5 +apt2.4.8 +apt-utils2.4.8 +base-files12ubuntu4.2 +base-passwd3.5.52build1 +bash5.1-6ubuntu1 +bsdutils1:2.37.2-4ubuntu3 +ca-certificates20211016 +coreutils8.32-4.1ubuntu1 +curl7.81.0-1ubuntu1.4 +dash0.5.11+git20210903+057cd650a4ed-3build1 +debconf1.5.79ubuntu1 +debianutils5.5-1ubuntu2 +diffutils1:3.8-0ubuntu2 +dirmngr2.2.27-3ubuntu2.1 +dpkg1.21.1ubuntu2.1 +e2fsprogs1.46.5-2ubuntu1.1 +findutils4.8.0-1ubuntu3 +gcc-12-base12.1.0-2ubuntu1~22.04 +gnupg2.2.27-3ubuntu2.1 +gnupg-l10n2.2.27-3ubuntu2.1 +gnupg-utils2.2.27-3ubuntu2.1 +gpg2.2.27-3ubuntu2.1 +gpg-agent2.2.27-3ubuntu2.1 +gpgconf2.2.27-3ubuntu2.1 +gpgsm2.2.27-3ubuntu2.1 +gpgv2.2.27-3ubuntu2.1 +gpg-wks-client2.2.27-3ubuntu2.1 +gpg-wks-server2.2.27-3ubuntu2.1 +grep3.7-1build1 +gzip1.10-4ubuntu4.1 +hostname3.23ubuntu2 +init-system-helpers1.62 +jq1.6-2.1ubuntu3 +libacl12.3.1-1 +libapt-pkg6.02.4.8 +libassuan02.5.5-1build1 +libattr11:2.5.1-1build1 +libaudit11:3.0.7-1build1 +libaudit-common1:3.0.7-1build1 +libblkid12.37.2-4ubuntu3 +libbrotli11.0.9-2build6 +libbsd00.11.5-1 +libbz2-1.01.0.8-5build1 +libc62.35-0ubuntu3.1 +libcap21:2.44-1build3 +libcap-ng00.7.9-2.2build3 +libc-bin2.35-0ubuntu3.1 +libcom-err21.46.5-2ubuntu1.1 +libcrypt11:4.4.27-1 +libcurl47.81.0-1ubuntu1.4 +libdb5.35.3.28+dfsg1-0.8ubuntu3 +libdebconfclient00.261ubuntu1 +libext2fs21.46.5-2ubuntu1.1 +libffi83.4.2-4 +libgcc-s112.1.0-2ubuntu1~22.04 +libgcrypt201.9.4-3ubuntu3 +libgmp102:6.2.1+dfsg-3ubuntu1 +libgnutls303.7.3-4ubuntu1.1 +libgpg-error01.43-3 +libgssapi-krb5-21.19.2-2 +libhogweed63.7.3-1build2 +libidn2-02.3.2-2build1 +libjq11.6-2.1ubuntu3 +libk5crypto31.19.2-2 +libkeyutils11.6.1-2ubuntu3 +libkmod229-1ubuntu1 +libkrb5-31.19.2-2 +libkrb5support01.19.2-2 +libksba81.6.0-2build1 +libldap-2.5-02.5.13+dfsg-0ubuntu0.22.04.1 +libldap-common2.5.13+dfsg-0ubuntu0.22.04.1 +liblz4-11.9.3-2build2 +liblzma55.2.5-2ubuntu1 +libmd01.0.4-1build1 +libmount12.37.2-4ubuntu3 +libncurses66.3-2 +libncursesw66.3-2 +libnettle83.7.3-1build2 +libnghttp2-141.43.0-1build3 +libnpth01.6-3build2 +libnsl21.3.0-2build2 +libonig56.9.7.1-2build1 +libp11-kit00.24.0-6build1 +libpam0g1.4.0-11ubuntu2 +libpam-modules1.4.0-11ubuntu2 +libpam-modules-bin1.4.0-11ubuntu2 +libpam-runtime1.4.0-11ubuntu2 +libpcre2-8-010.39-3ubuntu0.1 +libpcre32:8.39-13ubuntu0.22.04.1 +libprocps82:3.3.17-6ubuntu2 +libpsl50.21.0-1.2build2 +libreadline88.1.2-1 +librtmp12.4+20151223.gitfa8646d.1-2build4 +libsasl2-22.1.27+dfsg2-3ubuntu1 +libsasl2-modules2.1.27+dfsg2-3ubuntu1 +libsasl2-modules-db2.1.27+dfsg2-3ubuntu1 +libseccomp22.5.3-2ubuntu2 +libselinux13.3-1build2 +libsemanage23.3-1build2 +libsemanage-common3.3-1build2 +libsepol23.3-1build1 +libsmartcols12.37.2-4ubuntu3 +libsqlite3-03.37.2-2 +libss21.46.5-2ubuntu1.1 +libssh-40.9.6-2build1 +libssl33.0.2-0ubuntu1.6 +libstdc++612.1.0-2ubuntu1~22.04 +libsystemd0249.11-0ubuntu3.6 +libtasn1-64.18.0-4build1 +libtinfo66.3-2 +libtirpc31.3.2-2ubuntu0.1 +libtirpc-common1.3.2-2ubuntu0.1 +libudev1249.11-0ubuntu3.6 +libunistring21.0-1 +libuuid12.37.2-4ubuntu3 +libxxhash00.8.1-1 +libzstd11.4.8+dfsg-3build1 +locales2.35-0ubuntu3.1 +login1:4.8.1-2ubuntu2 +logsave1.46.5-2ubuntu1.1 +lsb-base11.1.0ubuntu4 +mawk1.3.4.20200120-3 +mount2.37.2-4ubuntu3 +ncurses-base6.3-2 +ncurses-bin6.3-2 +netcat1.218-4ubuntu1 +netcat-openbsd1.218-4ubuntu1 +openssl3.0.2-0ubuntu1.6 +passwd1:4.8.1-2ubuntu2 +perl-base5.34.0-3ubuntu1 +pinentry-curses1.1.1-1build2 plexmediaserver1.29.1.6316-f4cdfea9c -procps2:3.3.16-1ubuntu2.3 -publicsuffix20200303.0012-1 -readline-common8.0-4 -sed4.7-1 -sensible-utils0.0.12+nmu1 -sysvinit-utils2.96-2.1ubuntu1 -tar1.30+dfsg-7ubuntu0.20.04.2 -tzdata2022c-0ubuntu0.20.04.0 -ubuntu-keyring2020.02.11.4 -udev245.4-4ubuntu3.18 -unrar1:5.6.6-2build1 -util-linux2.34-0.1ubuntu9.3 -wget1.20.3-1ubuntu2 -zlib1g1:1.2.11.dfsg-2ubuntu1.2 +procps2:3.3.17-6ubuntu2 +publicsuffix20211207.1025-1 +readline-common8.1.2-1 +sed4.8-1ubuntu2 +sensible-utils0.0.17 +systemd-hwe-hwdb249.11.1 +sysvinit-utils3.01-1ubuntu1 +tar1.34+dfsg-1build3 +tzdata2022c-0ubuntu0.22.04.0 +ubuntu-keyring2021.03.26 +udev249.11-0ubuntu3.6 +unrar1:6.1.5-1 +usrmerge25ubuntu2 +util-linux2.37.2-4ubuntu3 +wget1.21.2-2ubuntu1 +zlib1g1:1.2.11.dfsg-2ubuntu9.1 From df7c0867e88e0f03c0c6ab3189d2a7cf94364e3e Mon Sep 17 00:00:00 2001 From: TheSpad Date: Sat, 22 Oct 2022 10:19:54 +0100 Subject: [PATCH 289/514] Use localhost instead of 127.0.0.1 for readiness check --- root/etc/s6-overlay/s6-rc.d/svc-plex/run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/s6-overlay/s6-rc.d/svc-plex/run b/root/etc/s6-overlay/s6-rc.d/svc-plex/run index ba42c34..8486676 100755 --- a/root/etc/s6-overlay/s6-rc.d/svc-plex/run +++ b/root/etc/s6-overlay/s6-rc.d/svc-plex/run @@ -4,5 +4,5 @@ echo "Starting Plex Media Server. . . (you can ignore the libusb_init error)" export PLEX_MEDIA_SERVER_INFO_MODEL=$(uname -m) export PLEX_MEDIA_SERVER_INFO_PLATFORM_VERSION=$(uname -r) exec \ - s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z 127.0.0.1 32400" \ + s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 32400" \ s6-setuidgid abc "/usr/lib/plexmediaserver/Plex Media Server" From 8647fb17c40a45c79db07039e5afaf91369a008a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 1 Nov 2022 00:05:35 -0500 Subject: [PATCH 290/514] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 2c20079..e023394 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -7,7 +7,7 @@ bash5.1-6ubuntu1 bsdutils1:2.37.2-4ubuntu3 ca-certificates20211016 coreutils8.32-4.1ubuntu1 -curl7.81.0-1ubuntu1.4 +curl7.81.0-1ubuntu1.6 dash0.5.11+git20210903+057cd650a4ed-3build1 debconf1.5.79ubuntu1 debianutils5.5-1ubuntu2 @@ -48,7 +48,7 @@ libcap-ng00.7.9-2.2build3 libc-bin2.35-0ubuntu3.1 libcom-err21.46.5-2ubuntu1.1 libcrypt11:4.4.27-1 -libcurl47.81.0-1ubuntu1.4 +libcurl47.81.0-1ubuntu1.6 libdb5.35.3.28+dfsg1-0.8ubuntu3 libdebconfclient00.261ubuntu1 libext2fs21.46.5-2ubuntu1.1 @@ -67,7 +67,7 @@ libkeyutils11.6.1-2ubuntu3 libkmod229-1ubuntu1 libkrb5-31.19.2-2 libkrb5support01.19.2-2 -libksba81.6.0-2build1 +libksba81.6.0-2ubuntu0.1 libldap-2.5-02.5.13+dfsg-0ubuntu0.22.04.1 libldap-common2.5.13+dfsg-0ubuntu0.22.04.1 liblz4-11.9.3-2build2 @@ -128,7 +128,7 @@ netcat1.218-4ubuntu1 netcat-openbsd1.218-4ubuntu1 openssl3.0.2-0ubuntu1.6 passwd1:4.8.1-2ubuntu2 -perl-base5.34.0-3ubuntu1 +perl-base5.34.0-3ubuntu1.1 pinentry-curses1.1.1-1build2 plexmediaserver1.29.1.6316-f4cdfea9c procps2:3.3.17-6ubuntu2 @@ -139,11 +139,11 @@ sensible-utils0.0.17 systemd-hwe-hwdb249.11.1 sysvinit-utils3.01-1ubuntu1 tar1.34+dfsg-1build3 -tzdata2022c-0ubuntu0.22.04.0 +tzdata2022e-0ubuntu0.22.04.0 ubuntu-keyring2021.03.26 udev249.11-0ubuntu3.6 unrar1:6.1.5-1 usrmerge25ubuntu2 util-linux2.37.2-4ubuntu3 wget1.21.2-2ubuntu1 -zlib1g1:1.2.11.dfsg-2ubuntu9.1 +zlib1g1:1.2.11.dfsg-2ubuntu9.2 From 6311d9cc5a26e5f6351a416b606e63592c339655 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 3 Nov 2022 18:38:41 -0500 Subject: [PATCH 291/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index e023394..c1138fb 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -126,7 +126,7 @@ ncurses-base6.3-2 ncurses-bin6.3-2 netcat1.218-4ubuntu1 netcat-openbsd1.218-4ubuntu1 -openssl3.0.2-0ubuntu1.6 +openssl3.0.2-0ubuntu1.7 passwd1:4.8.1-2ubuntu2 perl-base5.34.0-3ubuntu1.1 pinentry-curses1.1.1-1build2 From 7f00a8058ea146e1aa91e699ad4b6079552947bc Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 8 Nov 2022 09:56:22 +0100 Subject: [PATCH 292/514] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index c1138fb..e29a5da 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -101,10 +101,10 @@ libsemanage23.3-1build2 libsemanage-common3.3-1build2 libsepol23.3-1build1 libsmartcols12.37.2-4ubuntu3 -libsqlite3-03.37.2-2 +libsqlite3-03.37.2-2ubuntu0.1 libss21.46.5-2ubuntu1.1 libssh-40.9.6-2build1 -libssl33.0.2-0ubuntu1.6 +libssl33.0.2-0ubuntu1.7 libstdc++612.1.0-2ubuntu1~22.04 libsystemd0249.11-0ubuntu3.6 libtasn1-64.18.0-4build1 @@ -130,7 +130,7 @@ openssl3.0.2-0ubuntu1.7 passwd1:4.8.1-2ubuntu2 perl-base5.34.0-3ubuntu1.1 pinentry-curses1.1.1-1build2 -plexmediaserver1.29.1.6316-f4cdfea9c +plexmediaserver1.29.2.6364-6d72b0cf6 procps2:3.3.17-6ubuntu2 publicsuffix20211207.1025-1 readline-common8.1.2-1 @@ -139,7 +139,7 @@ sensible-utils0.0.17 systemd-hwe-hwdb249.11.1 sysvinit-utils3.01-1ubuntu1 tar1.34+dfsg-1build3 -tzdata2022e-0ubuntu0.22.04.0 +tzdata2022f-0ubuntu0.22.04.0 ubuntu-keyring2021.03.26 udev249.11-0ubuntu3.6 unrar1:6.1.5-1 From 7076b29ba0e8fd435738af54d76b21bd495bb0ec Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 15 Nov 2022 05:10:46 +0100 Subject: [PATCH 293/514] Bot Updating Templated Files --- .github/workflows/external_trigger.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 2a84271..7a12446 100644 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -48,8 +48,12 @@ jobs: | jq -r '.config.digest') image_info=$(curl -sL \ --header "Authorization: Bearer ${token}" \ - "https://ghcr.io/v2/${image}/blobs/${digest}" \ - | jq -r '.container_config') + "https://ghcr.io/v2/${image}/blobs/${digest}") + if [[ $(echo $image_info | jq -r '.container_config') == "null" ]]; then + image_info=$(echo $image_info | jq -r '.config') + else + image_info=$(echo $image_info | jq -r '.container_config') + fi IMAGE_RELEASE=$(echo ${image_info} | jq -r '.Labels.build_version' | awk '{print $3}') IMAGE_VERSION=$(echo ${IMAGE_RELEASE} | awk -F'-ls' '{print $1}') if [ -z "${IMAGE_VERSION}" ]; then From 0214985f7eba6af640c21af40615b704231c54d7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 28 Nov 2022 21:56:47 -0600 Subject: [PATCH 294/514] Bot Updating Templated Files --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2eb7b02..7d6f13a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -58,7 +58,7 @@ pipeline { env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/' env.PULL_REQUEST = env.CHANGE_ID - env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.md ./.github/ISSUE_TEMPLATE/issue.feature.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml' + env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml' } script{ env.LS_RELEASE_NUMBER = sh( @@ -279,7 +279,7 @@ pipeline { echo "Jenkinsfile is up to date." fi # Stage 2 - Delete old templates - OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md" + OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md\n.github/ISSUE_TEMPLATE/issue.bug.md\n.github/ISSUE_TEMPLATE/issue.feature.md" for i in ${OLD_TEMPLATES}; do if [[ -f "${i}" ]]; then TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}" From be419939e81b4fb2496d46a7c70841b0c56b9dee Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 28 Nov 2022 21:58:03 -0600 Subject: [PATCH 295/514] Bot Updating Templated Files --- .github/ISSUE_TEMPLATE/issue.bug.md | 40 ------------------------- .github/ISSUE_TEMPLATE/issue.feature.md | 25 ---------------- 2 files changed, 65 deletions(-) delete mode 100755 .github/ISSUE_TEMPLATE/issue.bug.md delete mode 100755 .github/ISSUE_TEMPLATE/issue.feature.md diff --git a/.github/ISSUE_TEMPLATE/issue.bug.md b/.github/ISSUE_TEMPLATE/issue.bug.md deleted file mode 100755 index 0130f86..0000000 --- a/.github/ISSUE_TEMPLATE/issue.bug.md +++ /dev/null @@ -1,40 +0,0 @@ ---- -name: Bug report -about: Create a report to help us improve - ---- -[linuxserverurl]: https://linuxserver.io -[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl] - - - - - ------------------------------- - -## Expected Behavior - - -## Current Behavior - - -## Steps to Reproduce - - -1. -2. -3. -4. - -## Environment -**OS:** -**CPU architecture:** x86_64/arm32/arm64 -**How docker service was installed:** - - - -## Command used to create docker container (run/create/compose/screenshot) - - -## Docker logs - diff --git a/.github/ISSUE_TEMPLATE/issue.feature.md b/.github/ISSUE_TEMPLATE/issue.feature.md deleted file mode 100755 index 20a91fd..0000000 --- a/.github/ISSUE_TEMPLATE/issue.feature.md +++ /dev/null @@ -1,25 +0,0 @@ ---- -name: Feature request -about: Suggest an idea for this project - ---- -[linuxserverurl]: https://linuxserver.io -[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl] - - - - - - - - ------------------------------- - -## Desired Behavior - - -## Current Behavior - - -## Alternatives Considered - From 0e690219f92b47f3f074ffc01d39e456d6933c71 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 28 Nov 2022 21:59:18 -0600 Subject: [PATCH 296/514] Bot Updating Templated Files --- .github/ISSUE_TEMPLATE/issue.bug.yml | 77 +++++++++++++++++++ .github/ISSUE_TEMPLATE/issue.feature.yml | 31 ++++++++ .github/workflows/external_trigger.yml | 2 +- .../workflows/external_trigger_scheduler.yml | 2 +- .github/workflows/greetings.yml | 2 +- .github/workflows/package_trigger.yml | 2 +- .../workflows/package_trigger_scheduler.yml | 2 +- .github/workflows/stale.yml | 2 +- 8 files changed, 114 insertions(+), 6 deletions(-) create mode 100755 .github/ISSUE_TEMPLATE/issue.bug.yml create mode 100755 .github/ISSUE_TEMPLATE/issue.feature.yml diff --git a/.github/ISSUE_TEMPLATE/issue.bug.yml b/.github/ISSUE_TEMPLATE/issue.bug.yml new file mode 100755 index 0000000..59a10f5 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/issue.bug.yml @@ -0,0 +1,77 @@ +# Based on the issue template +name: Bug report +description: Create a report to help us improve +title: "[BUG] " +labels: [Bug] +body: + - type: checkboxes + attributes: + label: Is there an existing issue for this? + description: Please search to see if an issue already exists for the bug you encountered. + options: + - label: I have searched the existing issues + required: true + - type: textarea + attributes: + label: Current Behavior + description: Tell us what happens instead of the expected behavior. + validations: + required: true + - type: textarea + attributes: + label: Expected Behavior + description: Tell us what should happen. + validations: + required: false + - type: textarea + attributes: + label: Steps To Reproduce + description: Steps to reproduce the behavior. + placeholder: | + 1. In this environment... + 2. With this config... + 3. Run '...' + 4. See error... + validations: + required: true + - type: textarea + attributes: + label: Environment + description: | + examples: + - **OS**: Ubuntu 20.04 + - **How docker service was installed**: distro's packagemanager + value: | + - OS: + - How docker service was installed: + render: markdown + validations: + required: false + - type: dropdown + attributes: + label: CPU architecture + options: + - x86-64 + - arm64 + - armhf + validations: + required: true + - type: textarea + attributes: + label: Docker creation + description: | + Command used to create docker container + Provide your docker create/run command or compose yaml snippet, or a screenshot of settings if using a gui to create the container + render: bash + validations: + required: true + - type: textarea + attributes: + description: | + Provide a full docker log, output of "docker logs linuxserver.io" + label: Container logs + placeholder: | + Output of `docker logs linuxserver.io` + render: bash + validations: + required: true diff --git a/.github/ISSUE_TEMPLATE/issue.feature.yml b/.github/ISSUE_TEMPLATE/issue.feature.yml new file mode 100755 index 0000000..099dcdb --- /dev/null +++ b/.github/ISSUE_TEMPLATE/issue.feature.yml @@ -0,0 +1,31 @@ +# Based on the issue template +name: Feature request +description: Suggest an idea for this project +title: "[FEAT] <title>" +labels: [enhancement] +body: + - type: checkboxes + attributes: + label: Is this a new feature request? + description: Please search to see if a feature request already exists. + options: + - label: I have searched the existing issues + required: true + - type: textarea + attributes: + label: Wanted change + description: Tell us what you want to happen. + validations: + required: true + - type: textarea + attributes: + label: Reason for change + description: Justify your request, why do you want it, what is the benefit. + validations: + required: true + - type: textarea + attributes: + label: Proposed code change + description: Do you have a potential code change in mind? + validations: + required: false diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 7a12446..597ec73 100644 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -7,7 +7,7 @@ jobs: external-trigger-master: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.3 + - uses: actions/checkout@v3.1.0 - name: External Trigger if: github.ref == 'refs/heads/master' diff --git a/.github/workflows/external_trigger_scheduler.yml b/.github/workflows/external_trigger_scheduler.yml index ca37175..c64d369 100644 --- a/.github/workflows/external_trigger_scheduler.yml +++ b/.github/workflows/external_trigger_scheduler.yml @@ -9,7 +9,7 @@ jobs: external-trigger-scheduler: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.3 + - uses: actions/checkout@v3.1.0 with: fetch-depth: '0' diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml index 468e09a..fd4b50e 100755 --- a/.github/workflows/greetings.yml +++ b/.github/workflows/greetings.yml @@ -8,6 +8,6 @@ jobs: steps: - uses: actions/first-interaction@v1 with: - issue-message: 'Thanks for opening your first issue here! Be sure to follow the [bug](https://github.com/linuxserver/docker-plex/blob/master/.github/ISSUE_TEMPLATE/issue.bug.md) or [feature](https://github.com/linuxserver/docker-plex/blob/master/.github/ISSUE_TEMPLATE/issue.feature.md) issue templates!' + issue-message: 'Thanks for opening your first issue here! Be sure to follow the [bug](https://github.com/linuxserver/docker-plex/blob/master/.github/ISSUE_TEMPLATE/issue.bug.yml) or [feature](https://github.com/linuxserver/docker-plex/blob/master/.github/ISSUE_TEMPLATE/issue.feature.yml) issue templates!' pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-plex/blob/master/.github/PULL_REQUEST_TEMPLATE.md)!' repo-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/package_trigger.yml b/.github/workflows/package_trigger.yml index 41b039b..46c638a 100644 --- a/.github/workflows/package_trigger.yml +++ b/.github/workflows/package_trigger.yml @@ -7,7 +7,7 @@ jobs: package-trigger-master: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.3 + - uses: actions/checkout@v3.1.0 - name: Package Trigger if: github.ref == 'refs/heads/master' diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml index 651ca0c..fbd8e8f 100644 --- a/.github/workflows/package_trigger_scheduler.yml +++ b/.github/workflows/package_trigger_scheduler.yml @@ -9,7 +9,7 @@ jobs: package-trigger-scheduler: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.3 + - uses: actions/checkout@v3.1.0 with: fetch-depth: '0' diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 3b3846e..73dfe45 100755 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/stale@v3 + - uses: actions/stale@v6.0.1 with: stale-issue-message: "This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions." stale-pr-message: "This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions." From 7ff02692193fbacbe42b237258e5044261de38e7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 28 Nov 2022 22:02:44 -0600 Subject: [PATCH 297/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index e29a5da..033ad79 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -139,7 +139,7 @@ sensible-utils0.0.17 systemd-hwe-hwdb249.11.1 sysvinit-utils3.01-1ubuntu1 tar1.34+dfsg-1build3 -tzdata2022f-0ubuntu0.22.04.0 +tzdata2022f-0ubuntu0.22.04.1 ubuntu-keyring2021.03.26 udev249.11-0ubuntu3.6 unrar1:6.1.5-1 From 1baab3974bca5b167bd366fa0d049a033db709f8 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 13 Dec 2022 04:57:30 +0100 Subject: [PATCH 298/514] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 033ad79..d9dcec0 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -5,7 +5,7 @@ base-files12ubuntu4.2 base-passwd3.5.52build1 bash5.1-6ubuntu1 bsdutils1:2.37.2-4ubuntu3 -ca-certificates20211016 +ca-certificates20211016ubuntu0.22.04.1 coreutils8.32-4.1ubuntu1 curl7.81.0-1ubuntu1.6 dash0.5.11+git20210903+057cd650a4ed-3build1 @@ -117,7 +117,7 @@ libuuid12.37.2-4ubuntu3 libxxhash00.8.1-1 libzstd11.4.8+dfsg-3build1 locales2.35-0ubuntu3.1 -login1:4.8.1-2ubuntu2 +login1:4.8.1-2ubuntu2.1 logsave1.46.5-2ubuntu1.1 lsb-base11.1.0ubuntu4 mawk1.3.4.20200120-3 @@ -127,7 +127,7 @@ ncurses-bin6.3-2 netcat1.218-4ubuntu1 netcat-openbsd1.218-4ubuntu1 openssl3.0.2-0ubuntu1.7 -passwd1:4.8.1-2ubuntu2 +passwd1:4.8.1-2ubuntu2.1 perl-base5.34.0-3ubuntu1.1 pinentry-curses1.1.1-1build2 plexmediaserver1.29.2.6364-6d72b0cf6 From cb6b6a23724269a18bb6ef11b3483e9caed9cceb Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 13 Dec 2022 10:49:09 +0100 Subject: [PATCH 299/514] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index d9dcec0..4ebe27c 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -130,7 +130,7 @@ openssl3.0.2-0ubuntu1.7 passwd1:4.8.1-2ubuntu2.1 perl-base5.34.0-3ubuntu1.1 pinentry-curses1.1.1-1build2 -plexmediaserver1.29.2.6364-6d72b0cf6 +plexmediaserver1.30.0.6486-629d58034 procps2:3.3.17-6ubuntu2 publicsuffix20211207.1025-1 readline-common8.1.2-1 @@ -139,7 +139,7 @@ sensible-utils0.0.17 systemd-hwe-hwdb249.11.1 sysvinit-utils3.01-1ubuntu1 tar1.34+dfsg-1build3 -tzdata2022f-0ubuntu0.22.04.1 +tzdata2022g-0ubuntu0.22.04.1 ubuntu-keyring2021.03.26 udev249.11-0ubuntu3.6 unrar1:6.1.5-1 From 8d73aa5c12d2eb00438f9cbf05bae0bbc6463840 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 10 Jan 2023 21:49:27 +0100 Subject: [PATCH 300/514] Bot Updating Package Versions --- package_versions.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 4ebe27c..3db96cd 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -7,7 +7,7 @@ bash5.1-6ubuntu1 bsdutils1:2.37.2-4ubuntu3 ca-certificates20211016ubuntu0.22.04.1 coreutils8.32-4.1ubuntu1 -curl7.81.0-1ubuntu1.6 +curl7.81.0-1ubuntu1.7 dash0.5.11+git20210903+057cd650a4ed-3build1 debconf1.5.79ubuntu1 debianutils5.5-1ubuntu2 @@ -48,7 +48,7 @@ libcap-ng00.7.9-2.2build3 libc-bin2.35-0ubuntu3.1 libcom-err21.46.5-2ubuntu1.1 libcrypt11:4.4.27-1 -libcurl47.81.0-1ubuntu1.6 +libcurl47.81.0-1ubuntu1.7 libdb5.35.3.28+dfsg1-0.8ubuntu3 libdebconfclient00.261ubuntu1 libext2fs21.46.5-2ubuntu1.1 @@ -67,7 +67,7 @@ libkeyutils11.6.1-2ubuntu3 libkmod229-1ubuntu1 libkrb5-31.19.2-2 libkrb5support01.19.2-2 -libksba81.6.0-2ubuntu0.1 +libksba81.6.0-2ubuntu0.2 libldap-2.5-02.5.13+dfsg-0ubuntu0.22.04.1 libldap-common2.5.13+dfsg-0ubuntu0.22.04.1 liblz4-11.9.3-2build2 @@ -92,9 +92,9 @@ libprocps82:3.3.17-6ubuntu2 libpsl50.21.0-1.2build2 libreadline88.1.2-1 librtmp12.4+20151223.gitfa8646d.1-2build4 -libsasl2-22.1.27+dfsg2-3ubuntu1 -libsasl2-modules2.1.27+dfsg2-3ubuntu1 -libsasl2-modules-db2.1.27+dfsg2-3ubuntu1 +libsasl2-22.1.27+dfsg2-3ubuntu1.1 +libsasl2-modules2.1.27+dfsg2-3ubuntu1.1 +libsasl2-modules-db2.1.27+dfsg2-3ubuntu1.1 libseccomp22.5.3-2ubuntu2 libselinux13.3-1build2 libsemanage23.3-1build2 @@ -130,7 +130,7 @@ openssl3.0.2-0ubuntu1.7 passwd1:4.8.1-2ubuntu2.1 perl-base5.34.0-3ubuntu1.1 pinentry-curses1.1.1-1build2 -plexmediaserver1.30.0.6486-629d58034 +plexmediaserver1.30.1.6562-915986d62 procps2:3.3.17-6ubuntu2 publicsuffix20211207.1025-1 readline-common8.1.2-1 From f337baaff3004725415a52c337a2dcad262b4f07 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 24 Jan 2023 04:57:27 +0100 Subject: [PATCH 301/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 3db96cd..b7e8e90 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -136,7 +136,7 @@ publicsuffix20211207.1025-1 readline-common8.1.2-1 sed4.8-1ubuntu2 sensible-utils0.0.17 -systemd-hwe-hwdb249.11.1 +systemd-hwe-hwdb249.11.2 sysvinit-utils3.01-1ubuntu1 tar1.34+dfsg-1build3 tzdata2022g-0ubuntu0.22.04.1 From c97eaea17602928e6f1260b449f7779ab0cb9d03 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Wed, 25 Jan 2023 06:49:17 +0100 Subject: [PATCH 302/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index b7e8e90..f556703 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -130,7 +130,7 @@ openssl3.0.2-0ubuntu1.7 passwd1:4.8.1-2ubuntu2.1 perl-base5.34.0-3ubuntu1.1 pinentry-curses1.1.1-1build2 -plexmediaserver1.30.1.6562-915986d62 +plexmediaserver1.30.2.6563-3d4dc0cce procps2:3.3.17-6ubuntu2 publicsuffix20211207.1025-1 readline-common8.1.2-1 From aec85facc76b95c7af3811f18232190064cb999a Mon Sep 17 00:00:00 2001 From: TheSpad <git@spad.co.uk> Date: Thu, 9 Feb 2023 19:51:46 +0000 Subject: [PATCH 303/514] Remove reference to legacy bionic tag --- .github/workflows/call_invalid_helper.yml | 12 ++++++++++++ README.md | 9 --------- readme-vars.yml | 8 ++------ 3 files changed, 14 insertions(+), 15 deletions(-) create mode 100644 .github/workflows/call_invalid_helper.yml diff --git a/.github/workflows/call_invalid_helper.yml b/.github/workflows/call_invalid_helper.yml new file mode 100644 index 0000000..773767c --- /dev/null +++ b/.github/workflows/call_invalid_helper.yml @@ -0,0 +1,12 @@ +name: Comment on invalid interaction +on: + issues: + types: + - labeled +jobs: + add-comment-on-invalid: + if: github.event.label.name == 'invalid' + permissions: + issues: write + uses: linuxserver/github-workflows/.github/workflows/invalid-interaction-helper.yml@v1 + secrets: inherit diff --git a/README.md b/README.md index f8578ce..8104bf8 100644 --- a/README.md +++ b/README.md @@ -58,15 +58,6 @@ The architectures supported by this image are: | arm64 | ✅ | arm64v8-\<version tag\> | | armhf| ✅ | arm32v7-\<version tag\> | -## Version Tags - -This image provides various versions that are available via tags. Please read the descriptions carefully and exercise caution when using unstable or development tags. - -| Tag | Available | Description | -| :----: | :----: |--- | -| latest | ✅ | Stable releases with Focal baseimage | -| bionic | ✅ | DEPRECATED - Stable releases with Bionic baseimage | - ## Application Setup Webui can be found at `<your-ip>:32400/web` diff --git a/readme-vars.yml b/readme-vars.yml index 9a1e7e2..478af0d 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -15,10 +15,7 @@ available_architectures: - { arch: "{{ arch_armhf }}", tag: "arm32v7-latest"} # development version -development_versions: true -development_versions_items: - - { tag: "latest", desc: "Stable releases with Focal baseimage" } - - { tag: "bionic", desc: "DEPRECATED - Stable releases with Bionic baseimage" } +development_versions: false # container parameters common_param_env_vars_enabled: true #PGID, PUID, etc @@ -131,8 +128,7 @@ changelogs: - { date: "09.12.17:", desc: "Fix continuation lines." } - { date: "12.07.17:", desc: "Add inspect commands to README, move to jenkins build and push." } - { date: "28.05.17:", desc: "Add unrar package as per requests, for subzero plugin." } - - { date: "11.01.17:", desc: "Use Plex environment variables from pms docker, - change abc home folder to /app to alleviate usermod chowning library" } + - { date: "11.01.17:", desc: "Use Plex environment variables from pms docker, change abc home folder to /app to alleviate usermod chowning library" } - { date: "03.01.17:", desc: "Use case insensitive version variable matching rather than export and make lowercase." } - { date: "17.10.16:", desc: "Allow use of uppercase version variable" } - { date: "01.10.16:", desc: "Add TZ info to README." } From 21e86230ff155ef9b429e00b347729f21e8093c0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 13 Feb 2023 15:48:27 -0600 Subject: [PATCH 304/514] Bot Updating Templated Files --- Jenkinsfile | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7d6f13a..e712f94 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -58,7 +58,7 @@ pipeline { env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/' env.PULL_REQUEST = env.CHANGE_ID - env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml' + env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/call_invalid_helper.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml' } script{ env.LS_RELEASE_NUMBER = sh( @@ -807,19 +807,19 @@ pipeline { echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin if [ "${CI}" == "false" ]; then docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} - docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG} + docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} fi for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} - docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} - docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-latest - docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-latest - docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} + docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} + docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-latest docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} + docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} + docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} if [ -n "${SEMVER}" ]; then docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER} @@ -827,13 +827,13 @@ pipeline { docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER} fi docker push ${MANIFESTIMAGE}:amd64-${META_TAG} - docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG} - docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} - docker push ${MANIFESTIMAGE}:amd64-latest - docker push ${MANIFESTIMAGE}:arm32v7-latest - docker push ${MANIFESTIMAGE}:arm64v8-latest docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} + docker push ${MANIFESTIMAGE}:amd64-latest + docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG} + docker push ${MANIFESTIMAGE}:arm32v7-latest docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} + docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} + docker push ${MANIFESTIMAGE}:arm64v8-latest docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} if [ -n "${SEMVER}" ]; then docker push ${MANIFESTIMAGE}:amd64-${SEMVER} @@ -979,12 +979,12 @@ pipeline { sh 'echo "build aborted"' } else if (currentBuild.currentResult == "SUCCESS"){ - sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 1681177,\ + sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"color": 1681177,\ "description": "**Build:** '${BUILD_NUMBER}'\\n**CI Results:** '${CI_URL}'\\n**ShellCheck Results:** '${SHELLCHECK_URL}'\\n**Status:** Success\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\ "username": "Jenkins"}' ${BUILDS_DISCORD} ''' } else { - sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 16711680,\ + sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"color": 16711680,\ "description": "**Build:** '${BUILD_NUMBER}'\\n**CI Results:** '${CI_URL}'\\n**ShellCheck Results:** '${SHELLCHECK_URL}'\\n**Status:** failure\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\ "username": "Jenkins"}' ${BUILDS_DISCORD} ''' } From 4a7dbd8e86a6e88fd527040ffc0224498332fe19 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 13 Feb 2023 15:49:53 -0600 Subject: [PATCH 305/514] Bot Updating Templated Files --- .editorconfig | 2 +- .github/workflows/greetings.yml | 2 +- .github/workflows/permissions.yml | 9 +++++++++ README.md | 6 +++++- 4 files changed, 16 insertions(+), 3 deletions(-) create mode 100755 .github/workflows/permissions.yml diff --git a/.editorconfig b/.editorconfig index a92f7df..5f150f3 100755 --- a/.editorconfig +++ b/.editorconfig @@ -15,6 +15,6 @@ trim_trailing_whitespace = false indent_style = space indent_size = 2 -[{**.sh,root/etc/cont-init.d/**,root/etc/services.d/**}] +[{**.sh,root/etc/s6-overlay/s6-rc.d/**,root/etc/cont-init.d/**,root/etc/services.d/**}] indent_style = space indent_size = 4 diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml index fd4b50e..7a82d14 100755 --- a/.github/workflows/greetings.yml +++ b/.github/workflows/greetings.yml @@ -8,6 +8,6 @@ jobs: steps: - uses: actions/first-interaction@v1 with: - issue-message: 'Thanks for opening your first issue here! Be sure to follow the [bug](https://github.com/linuxserver/docker-plex/blob/master/.github/ISSUE_TEMPLATE/issue.bug.yml) or [feature](https://github.com/linuxserver/docker-plex/blob/master/.github/ISSUE_TEMPLATE/issue.feature.yml) issue templates!' + issue-message: 'Thanks for opening your first issue here! Be sure to follow the relevant issue templates, or risk having this issue marked as invalid.' pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-plex/blob/master/.github/PULL_REQUEST_TEMPLATE.md)!' repo-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/permissions.yml b/.github/workflows/permissions.yml new file mode 100755 index 0000000..2df6b61 --- /dev/null +++ b/.github/workflows/permissions.yml @@ -0,0 +1,9 @@ +name: Permission check +on: + pull_request: + paths: + - '**/run' + - '**/finish' +jobs: + permission_check: + uses: linuxserver/github-workflows/.github/workflows/init-svc-executable-permissions.yml@v1 diff --git a/README.md b/README.md index 8104bf8..cbb400f 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ The architectures supported by this image are: | :----: | :----: | ---- | | x86-64 | ✅ | amd64-\<version tag\> | | arm64 | ✅ | arm64v8-\<version tag\> | -| armhf| ✅ | arm32v7-\<version tag\> | +| armhf | ✅ | arm32v7-\<version tag\> | ## Application Setup @@ -112,6 +112,7 @@ services: environment: - PUID=1000 - PGID=1000 + - TZ=Etc/UTC - VERSION=docker - PLEX_CLAIM= #optional volumes: @@ -129,6 +130,7 @@ docker run -d \ --net=host \ -e PUID=1000 \ -e PGID=1000 \ + -e TZ=Etc/UTC \ -e VERSION=docker \ -e PLEX_CLAIM= `#optional` \ -v /path/to/library:/config \ @@ -136,6 +138,7 @@ docker run -d \ -v /path/to/movies:/movies \ --restart unless-stopped \ lscr.io/linuxserver/plex:latest + ``` ## Parameters @@ -147,6 +150,7 @@ Container images are configured using parameters passed at runtime (such as thos | `--net=host` | Use Host Networking | | `-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). | | `-e VERSION=docker` | Set whether to update plex or not - see Application Setup section. | | `-e PLEX_CLAIM=` | Optionally you can obtain a claim token from https://plex.tv/claim and input here. Keep in mind that the claim tokens expire within 4 minutes. | | `-v /config` | Plex library location. *This can grow very large, 50gb+ is likely for a large collection.* | From bf3aae7ec9b4a9f2e6f4a43de53528d9a92963d7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 13 Feb 2023 15:52:29 -0600 Subject: [PATCH 306/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index f556703..437c6c9 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -130,7 +130,7 @@ openssl3.0.2-0ubuntu1.7 passwd1:4.8.1-2ubuntu2.1 perl-base5.34.0-3ubuntu1.1 pinentry-curses1.1.1-1build2 -plexmediaserver1.30.2.6563-3d4dc0cce +plexmediaserver1.31.0.6654-02189b09f procps2:3.3.17-6ubuntu2 publicsuffix20211207.1025-1 readline-common8.1.2-1 From 154f00f6dc15e4e532301044c7986aa2f440c50d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 21 Feb 2023 04:57:38 +0100 Subject: [PATCH 307/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 437c6c9..0a73f0d 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -126,7 +126,7 @@ ncurses-base6.3-2 ncurses-bin6.3-2 netcat1.218-4ubuntu1 netcat-openbsd1.218-4ubuntu1 -openssl3.0.2-0ubuntu1.7 +openssl3.0.2-0ubuntu1.8 passwd1:4.8.1-2ubuntu2.1 perl-base5.34.0-3ubuntu1.1 pinentry-curses1.1.1-1build2 From 351eeae2ab5bc07129007edbfa361b1fcf428a6b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 27 Feb 2023 12:51:25 -0600 Subject: [PATCH 308/514] Bot Updating Package Versions --- package_versions.txt | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 0a73f0d..0bdd23d 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,7 +1,7 @@ adduser3.118ubuntu5 apt2.4.8 apt-utils2.4.8 -base-files12ubuntu4.2 +base-files12ubuntu4.3 base-passwd3.5.52build1 bash5.1-6ubuntu1 bsdutils1:2.37.2-4ubuntu3 @@ -58,15 +58,15 @@ libgcrypt201.9.4-3ubuntu3 libgmp102:6.2.1+dfsg-3ubuntu1 libgnutls303.7.3-4ubuntu1.1 libgpg-error01.43-3 -libgssapi-krb5-21.19.2-2 +libgssapi-krb5-21.19.2-2ubuntu0.1 libhogweed63.7.3-1build2 libidn2-02.3.2-2build1 libjq11.6-2.1ubuntu3 -libk5crypto31.19.2-2 +libk5crypto31.19.2-2ubuntu0.1 libkeyutils11.6.1-2ubuntu3 libkmod229-1ubuntu1 -libkrb5-31.19.2-2 -libkrb5support01.19.2-2 +libkrb5-31.19.2-2ubuntu0.1 +libkrb5support01.19.2-2ubuntu0.1 libksba81.6.0-2ubuntu0.2 libldap-2.5-02.5.13+dfsg-0ubuntu0.22.04.1 libldap-common2.5.13+dfsg-0ubuntu0.22.04.1 @@ -82,10 +82,10 @@ libnpth01.6-3build2 libnsl21.3.0-2build2 libonig56.9.7.1-2build1 libp11-kit00.24.0-6build1 -libpam0g1.4.0-11ubuntu2 -libpam-modules1.4.0-11ubuntu2 -libpam-modules-bin1.4.0-11ubuntu2 -libpam-runtime1.4.0-11ubuntu2 +libpam0g1.4.0-11ubuntu2.3 +libpam-modules1.4.0-11ubuntu2.3 +libpam-modules-bin1.4.0-11ubuntu2.3 +libpam-runtime1.4.0-11ubuntu2.3 libpcre2-8-010.39-3ubuntu0.1 libpcre32:8.39-13ubuntu0.22.04.1 libprocps82:3.3.17-6ubuntu2 @@ -104,7 +104,7 @@ libsmartcols12.37.2-4ubuntu3 libsqlite3-03.37.2-2ubuntu0.1 libss21.46.5-2ubuntu1.1 libssh-40.9.6-2build1 -libssl33.0.2-0ubuntu1.7 +libssl33.0.2-0ubuntu1.8 libstdc++612.1.0-2ubuntu1~22.04 libsystemd0249.11-0ubuntu3.6 libtasn1-64.18.0-4build1 @@ -130,7 +130,7 @@ openssl3.0.2-0ubuntu1.8 passwd1:4.8.1-2ubuntu2.1 perl-base5.34.0-3ubuntu1.1 pinentry-curses1.1.1-1build2 -plexmediaserver1.31.0.6654-02189b09f +plexmediaserver1.31.1.6733-bc0674160 procps2:3.3.17-6ubuntu2 publicsuffix20211207.1025-1 readline-common8.1.2-1 From e33f93518b7af17174cf27892a59614b3250ec2e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 7 Mar 2023 04:57:22 +0100 Subject: [PATCH 309/514] Bot Updating Templated Files --- Jenkinsfile | 46 ++++++++++++++++++---------------------------- 1 file changed, 18 insertions(+), 28 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e712f94..69ba944 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -444,7 +444,8 @@ pipeline { } steps { echo "Running on node: ${NODE_NAME}" - sh "docker build \ + sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile" + sh "docker buildx build \ --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \ --label \"org.opencontainers.image.authors=linuxserver.io\" \ --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-plex/packages\" \ @@ -457,7 +458,7 @@ pipeline { --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ --label \"org.opencontainers.image.title=Plex\" \ --label \"org.opencontainers.image.description=[Plex](https://plex.tv) organizes video, music and photos from personal media libraries and streams them to smart TVs, streaming boxes and mobile devices. This container is packaged as a standalone Plex Media Server. has always been a top priority. Straightforward design and bulk actions mean getting things done faster.\" \ - --no-cache --pull -t ${IMAGE}:${META_TAG} \ + --no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." } } @@ -474,7 +475,8 @@ pipeline { stage('Build X86') { steps { echo "Running on node: ${NODE_NAME}" - sh "docker build \ + sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile" + sh "docker buildx build \ --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \ --label \"org.opencontainers.image.authors=linuxserver.io\" \ --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-plex/packages\" \ @@ -487,7 +489,7 @@ pipeline { --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ --label \"org.opencontainers.image.title=Plex\" \ --label \"org.opencontainers.image.description=[Plex](https://plex.tv) organizes video, music and photos from personal media libraries and streams them to smart TVs, streaming boxes and mobile devices. This container is packaged as a standalone Plex Media Server. has always been a top priority. Straightforward design and bulk actions mean getting things done faster.\" \ - --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} \ + --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." } } @@ -501,7 +503,8 @@ pipeline { sh '''#! /bin/bash echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin ''' - sh "docker build \ + sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile.armhf" + sh "docker buildx build \ --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \ --label \"org.opencontainers.image.authors=linuxserver.io\" \ --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-plex/packages\" \ @@ -514,7 +517,7 @@ pipeline { --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ --label \"org.opencontainers.image.title=Plex\" \ --label \"org.opencontainers.image.description=[Plex](https://plex.tv) organizes video, music and photos from personal media libraries and streams them to smart TVs, streaming boxes and mobile devices. This container is packaged as a standalone Plex Media Server. has always been a top priority. Straightforward design and bulk actions mean getting things done faster.\" \ - --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \ + --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} --platform=linux/arm/v7 \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" retry(5) { @@ -535,7 +538,8 @@ pipeline { sh '''#! /bin/bash echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin ''' - sh "docker build \ + sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile.aarch64" + sh "docker buildx build \ --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \ --label \"org.opencontainers.image.authors=linuxserver.io\" \ --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-plex/packages\" \ @@ -548,7 +552,7 @@ pipeline { --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ --label \"org.opencontainers.image.title=Plex\" \ --label \"org.opencontainers.image.description=[Plex](https://plex.tv) organizes video, music and photos from personal media libraries and streams them to smart TVs, streaming boxes and mobile devices. This container is packaged as a standalone Plex Media Server. has always been a top priority. Straightforward design and bulk actions mean getting things done faster.\" \ - --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \ + --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" retry(5) { @@ -577,26 +581,12 @@ pipeline { else LOCAL_CONTAINER=${IMAGE}:${META_TAG} fi - if [ "${DIST_IMAGE}" == "alpine" ]; then - docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\ - apk info -v > /tmp/package_versions.txt && \ - sort -o /tmp/package_versions.txt /tmp/package_versions.txt && \ - chmod 777 /tmp/package_versions.txt' - elif [ "${DIST_IMAGE}" == "ubuntu" ]; then - docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\ - apt list -qq --installed | sed "s#/.*now ##g" | cut -d" " -f1 > /tmp/package_versions.txt && \ - sort -o /tmp/package_versions.txt /tmp/package_versions.txt && \ - chmod 777 /tmp/package_versions.txt' - elif [ "${DIST_IMAGE}" == "fedora" ]; then - docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\ - rpm -qa > /tmp/package_versions.txt && \ - sort -o /tmp/package_versions.txt /tmp/package_versions.txt && \ - chmod 777 /tmp/package_versions.txt' - elif [ "${DIST_IMAGE}" == "arch" ]; then - docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\ - pacman -Q > /tmp/package_versions.txt && \ - chmod 777 /tmp/package_versions.txt' - fi + touch ${TEMPDIR}/package_versions.txt + docker run --rm \ + -v /var/run/docker.sock:/var/run/docker.sock:ro \ + -v ${TEMPDIR}:/tmp \ + ghcr.io/anchore/syft:latest \ + ${LOCAL_CONTAINER} -o table=/tmp/package_versions.txt NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 ) echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github" if [ "${NEW_PACKAGE_TAG}" != "${PACKAGE_TAG}" ]; then From dab85ed67bcec1a63366eebe363020b5268b43ed Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 7 Mar 2023 05:00:42 +0100 Subject: [PATCH 310/514] Bot Updating Package Versions --- package_versions.txt | 299 ++++++++++++++++++++++--------------------- 1 file changed, 150 insertions(+), 149 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 0bdd23d..add5f0e 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,149 +1,150 @@ -adduser3.118ubuntu5 -apt2.4.8 -apt-utils2.4.8 -base-files12ubuntu4.3 -base-passwd3.5.52build1 -bash5.1-6ubuntu1 -bsdutils1:2.37.2-4ubuntu3 -ca-certificates20211016ubuntu0.22.04.1 -coreutils8.32-4.1ubuntu1 -curl7.81.0-1ubuntu1.7 -dash0.5.11+git20210903+057cd650a4ed-3build1 -debconf1.5.79ubuntu1 -debianutils5.5-1ubuntu2 -diffutils1:3.8-0ubuntu2 -dirmngr2.2.27-3ubuntu2.1 -dpkg1.21.1ubuntu2.1 -e2fsprogs1.46.5-2ubuntu1.1 -findutils4.8.0-1ubuntu3 -gcc-12-base12.1.0-2ubuntu1~22.04 -gnupg2.2.27-3ubuntu2.1 -gnupg-l10n2.2.27-3ubuntu2.1 -gnupg-utils2.2.27-3ubuntu2.1 -gpg2.2.27-3ubuntu2.1 -gpg-agent2.2.27-3ubuntu2.1 -gpgconf2.2.27-3ubuntu2.1 -gpgsm2.2.27-3ubuntu2.1 -gpgv2.2.27-3ubuntu2.1 -gpg-wks-client2.2.27-3ubuntu2.1 -gpg-wks-server2.2.27-3ubuntu2.1 -grep3.7-1build1 -gzip1.10-4ubuntu4.1 -hostname3.23ubuntu2 -init-system-helpers1.62 -jq1.6-2.1ubuntu3 -libacl12.3.1-1 -libapt-pkg6.02.4.8 -libassuan02.5.5-1build1 -libattr11:2.5.1-1build1 -libaudit11:3.0.7-1build1 -libaudit-common1:3.0.7-1build1 -libblkid12.37.2-4ubuntu3 -libbrotli11.0.9-2build6 -libbsd00.11.5-1 -libbz2-1.01.0.8-5build1 -libc62.35-0ubuntu3.1 -libcap21:2.44-1build3 -libcap-ng00.7.9-2.2build3 -libc-bin2.35-0ubuntu3.1 -libcom-err21.46.5-2ubuntu1.1 -libcrypt11:4.4.27-1 -libcurl47.81.0-1ubuntu1.7 -libdb5.35.3.28+dfsg1-0.8ubuntu3 -libdebconfclient00.261ubuntu1 -libext2fs21.46.5-2ubuntu1.1 -libffi83.4.2-4 -libgcc-s112.1.0-2ubuntu1~22.04 -libgcrypt201.9.4-3ubuntu3 -libgmp102:6.2.1+dfsg-3ubuntu1 -libgnutls303.7.3-4ubuntu1.1 -libgpg-error01.43-3 -libgssapi-krb5-21.19.2-2ubuntu0.1 -libhogweed63.7.3-1build2 -libidn2-02.3.2-2build1 -libjq11.6-2.1ubuntu3 -libk5crypto31.19.2-2ubuntu0.1 -libkeyutils11.6.1-2ubuntu3 -libkmod229-1ubuntu1 -libkrb5-31.19.2-2ubuntu0.1 -libkrb5support01.19.2-2ubuntu0.1 -libksba81.6.0-2ubuntu0.2 -libldap-2.5-02.5.13+dfsg-0ubuntu0.22.04.1 -libldap-common2.5.13+dfsg-0ubuntu0.22.04.1 -liblz4-11.9.3-2build2 -liblzma55.2.5-2ubuntu1 -libmd01.0.4-1build1 -libmount12.37.2-4ubuntu3 -libncurses66.3-2 -libncursesw66.3-2 -libnettle83.7.3-1build2 -libnghttp2-141.43.0-1build3 -libnpth01.6-3build2 -libnsl21.3.0-2build2 -libonig56.9.7.1-2build1 -libp11-kit00.24.0-6build1 -libpam0g1.4.0-11ubuntu2.3 -libpam-modules1.4.0-11ubuntu2.3 -libpam-modules-bin1.4.0-11ubuntu2.3 -libpam-runtime1.4.0-11ubuntu2.3 -libpcre2-8-010.39-3ubuntu0.1 -libpcre32:8.39-13ubuntu0.22.04.1 -libprocps82:3.3.17-6ubuntu2 -libpsl50.21.0-1.2build2 -libreadline88.1.2-1 -librtmp12.4+20151223.gitfa8646d.1-2build4 -libsasl2-22.1.27+dfsg2-3ubuntu1.1 -libsasl2-modules2.1.27+dfsg2-3ubuntu1.1 -libsasl2-modules-db2.1.27+dfsg2-3ubuntu1.1 -libseccomp22.5.3-2ubuntu2 -libselinux13.3-1build2 -libsemanage23.3-1build2 -libsemanage-common3.3-1build2 -libsepol23.3-1build1 -libsmartcols12.37.2-4ubuntu3 -libsqlite3-03.37.2-2ubuntu0.1 -libss21.46.5-2ubuntu1.1 -libssh-40.9.6-2build1 -libssl33.0.2-0ubuntu1.8 -libstdc++612.1.0-2ubuntu1~22.04 -libsystemd0249.11-0ubuntu3.6 -libtasn1-64.18.0-4build1 -libtinfo66.3-2 -libtirpc31.3.2-2ubuntu0.1 -libtirpc-common1.3.2-2ubuntu0.1 -libudev1249.11-0ubuntu3.6 -libunistring21.0-1 -libuuid12.37.2-4ubuntu3 -libxxhash00.8.1-1 -libzstd11.4.8+dfsg-3build1 -locales2.35-0ubuntu3.1 -login1:4.8.1-2ubuntu2.1 -logsave1.46.5-2ubuntu1.1 -lsb-base11.1.0ubuntu4 -mawk1.3.4.20200120-3 -mount2.37.2-4ubuntu3 -ncurses-base6.3-2 -ncurses-bin6.3-2 -netcat1.218-4ubuntu1 -netcat-openbsd1.218-4ubuntu1 -openssl3.0.2-0ubuntu1.8 -passwd1:4.8.1-2ubuntu2.1 -perl-base5.34.0-3ubuntu1.1 -pinentry-curses1.1.1-1build2 -plexmediaserver1.31.1.6733-bc0674160 -procps2:3.3.17-6ubuntu2 -publicsuffix20211207.1025-1 -readline-common8.1.2-1 -sed4.8-1ubuntu2 -sensible-utils0.0.17 -systemd-hwe-hwdb249.11.2 -sysvinit-utils3.01-1ubuntu1 -tar1.34+dfsg-1build3 -tzdata2022g-0ubuntu0.22.04.1 -ubuntu-keyring2021.03.26 -udev249.11-0ubuntu3.6 -unrar1:6.1.5-1 -usrmerge25ubuntu2 -util-linux2.37.2-4ubuntu3 -wget1.21.2-2ubuntu1 -zlib1g1:1.2.11.dfsg-2ubuntu9.2 +NAME VERSION TYPE +adduser 3.118ubuntu5 deb +apt 2.4.8 deb +apt-utils 2.4.8 deb +base-files 12ubuntu4.3 deb +base-passwd 3.5.52build1 deb +bash 5.1-6ubuntu1 deb +bsdutils 1:2.37.2-4ubuntu3 deb +ca-certificates 20211016ubuntu0.22.04.1 deb +coreutils 8.32-4.1ubuntu1 deb +curl 7.81.0-1ubuntu1.8 deb +dash 0.5.11+git20210903+057cd650a4ed-3build1 deb +debconf 1.5.79ubuntu1 deb +debianutils 5.5-1ubuntu2 deb +diffutils 1:3.8-0ubuntu2 deb +dirmngr 2.2.27-3ubuntu2.1 deb +dpkg 1.21.1ubuntu2.1 deb +e2fsprogs 1.46.5-2ubuntu1.1 deb +findutils 4.8.0-1ubuntu3 deb +gcc-12-base 12.1.0-2ubuntu1~22.04 deb +gnupg 2.2.27-3ubuntu2.1 deb +gnupg-l10n 2.2.27-3ubuntu2.1 deb +gnupg-utils 2.2.27-3ubuntu2.1 deb +gpg 2.2.27-3ubuntu2.1 deb +gpg-agent 2.2.27-3ubuntu2.1 deb +gpg-wks-client 2.2.27-3ubuntu2.1 deb +gpg-wks-server 2.2.27-3ubuntu2.1 deb +gpgconf 2.2.27-3ubuntu2.1 deb +gpgsm 2.2.27-3ubuntu2.1 deb +gpgv 2.2.27-3ubuntu2.1 deb +grep 3.7-1build1 deb +gzip 1.10-4ubuntu4.1 deb +hostname 3.23ubuntu2 deb +init-system-helpers 1.62 deb +jq 1.6-2.1ubuntu3 deb +libacl1 2.3.1-1 deb +libapt-pkg6.0 2.4.8 deb +libassuan0 2.5.5-1build1 deb +libattr1 1:2.5.1-1build1 deb +libaudit-common 1:3.0.7-1build1 deb +libaudit1 1:3.0.7-1build1 deb +libblkid1 2.37.2-4ubuntu3 deb +libbrotli1 1.0.9-2build6 deb +libbsd0 0.11.5-1 deb +libbz2-1.0 1.0.8-5build1 deb +libc-bin 2.35-0ubuntu3.1 deb +libc6 2.35-0ubuntu3.1 deb +libcap-ng0 0.7.9-2.2build3 deb +libcap2 1:2.44-1build3 deb +libcom-err2 1.46.5-2ubuntu1.1 deb +libcrypt1 1:4.4.27-1 deb +libcurl4 7.81.0-1ubuntu1.8 deb +libdb5.3 5.3.28+dfsg1-0.8ubuntu3 deb +libdebconfclient0 0.261ubuntu1 deb +libext2fs2 1.46.5-2ubuntu1.1 deb +libffi8 3.4.2-4 deb +libgcc-s1 12.1.0-2ubuntu1~22.04 deb +libgcrypt20 1.9.4-3ubuntu3 deb +libgmp10 2:6.2.1+dfsg-3ubuntu1 deb +libgnutls30 3.7.3-4ubuntu1.1 deb +libgpg-error0 1.43-3 deb +libgssapi-krb5-2 1.19.2-2ubuntu0.1 deb +libhogweed6 3.7.3-1build2 deb +libidn2-0 2.3.2-2build1 deb +libjq1 1.6-2.1ubuntu3 deb +libk5crypto3 1.19.2-2ubuntu0.1 deb +libkeyutils1 1.6.1-2ubuntu3 deb +libkmod2 29-1ubuntu1 deb +libkrb5-3 1.19.2-2ubuntu0.1 deb +libkrb5support0 1.19.2-2ubuntu0.1 deb +libksba8 1.6.0-2ubuntu0.2 deb +libldap-2.5-0 2.5.13+dfsg-0ubuntu0.22.04.1 deb +libldap-common 2.5.13+dfsg-0ubuntu0.22.04.1 deb +liblz4-1 1.9.3-2build2 deb +liblzma5 5.2.5-2ubuntu1 deb +libmd0 1.0.4-1build1 deb +libmount1 2.37.2-4ubuntu3 deb +libncurses6 6.3-2 deb +libncursesw6 6.3-2 deb +libnettle8 3.7.3-1build2 deb +libnghttp2-14 1.43.0-1build3 deb +libnpth0 1.6-3build2 deb +libnsl2 1.3.0-2build2 deb +libonig5 6.9.7.1-2build1 deb +libp11-kit0 0.24.0-6build1 deb +libpam-modules 1.4.0-11ubuntu2.3 deb +libpam-modules-bin 1.4.0-11ubuntu2.3 deb +libpam-runtime 1.4.0-11ubuntu2.3 deb +libpam0g 1.4.0-11ubuntu2.3 deb +libpcre2-8-0 10.39-3ubuntu0.1 deb +libpcre3 2:8.39-13ubuntu0.22.04.1 deb +libprocps8 2:3.3.17-6ubuntu2 deb +libpsl5 0.21.0-1.2build2 deb +libreadline8 8.1.2-1 deb +librtmp1 2.4+20151223.gitfa8646d.1-2build4 deb +libsasl2-2 2.1.27+dfsg2-3ubuntu1.2 deb +libsasl2-modules 2.1.27+dfsg2-3ubuntu1.2 deb +libsasl2-modules-db 2.1.27+dfsg2-3ubuntu1.2 deb +libseccomp2 2.5.3-2ubuntu2 deb +libselinux1 3.3-1build2 deb +libsemanage-common 3.3-1build2 deb +libsemanage2 3.3-1build2 deb +libsepol2 3.3-1build1 deb +libsmartcols1 2.37.2-4ubuntu3 deb +libsqlite3-0 3.37.2-2ubuntu0.1 deb +libss2 1.46.5-2ubuntu1.1 deb +libssh-4 0.9.6-2build1 deb +libssl3 3.0.2-0ubuntu1.8 deb +libstdc++6 12.1.0-2ubuntu1~22.04 deb +libsystemd0 249.11-0ubuntu3.6 deb +libtasn1-6 4.18.0-4build1 deb +libtinfo6 6.3-2 deb +libtirpc-common 1.3.2-2ubuntu0.1 deb +libtirpc3 1.3.2-2ubuntu0.1 deb +libudev1 249.11-0ubuntu3.6 deb +libunistring2 1.0-1 deb +libuuid1 2.37.2-4ubuntu3 deb +libxxhash0 0.8.1-1 deb +libzstd1 1.4.8+dfsg-3build1 deb +locales 2.35-0ubuntu3.1 deb +login 1:4.8.1-2ubuntu2.1 deb +logsave 1.46.5-2ubuntu1.1 deb +lsb-base 11.1.0ubuntu4 deb +mawk 1.3.4.20200120-3 deb +mount 2.37.2-4ubuntu3 deb +ncurses-base 6.3-2 deb +ncurses-bin 6.3-2 deb +netcat 1.218-4ubuntu1 deb +netcat-openbsd 1.218-4ubuntu1 deb +openssl 3.0.2-0ubuntu1.8 deb +passwd 1:4.8.1-2ubuntu2.1 deb +perl-base 5.34.0-3ubuntu1.1 deb +pinentry-curses 1.1.1-1build2 deb +plexmediaserver 1.31.1.6733-bc0674160 deb +procps 2:3.3.17-6ubuntu2 deb +publicsuffix 20211207.1025-1 deb +readline-common 8.1.2-1 deb +sed 4.8-1ubuntu2 deb +sensible-utils 0.0.17 deb +systemd-hwe-hwdb 249.11.3 deb +sysvinit-utils 3.01-1ubuntu1 deb +tar 1.34+dfsg-1build3 deb +tzdata 2022g-0ubuntu0.22.04.1 deb +ubuntu-keyring 2021.03.26 deb +udev 249.11-0ubuntu3.6 deb +unrar 1:6.1.5-1 deb +usrmerge 25ubuntu2 deb +util-linux 2.37.2-4ubuntu3 deb +wget 1.21.2-2ubuntu1 deb +zlib1g 1:1.2.11.dfsg-2ubuntu9.2 deb From cc56663516d0a38d6d38f38d1ca28a19c2ac14cf Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 9 Mar 2023 09:52:23 +0100 Subject: [PATCH 311/514] Bot Updating Package Versions --- package_versions.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index add5f0e..7394953 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -57,7 +57,7 @@ libffi8 3.4.2-4 deb libgcc-s1 12.1.0-2ubuntu1~22.04 deb libgcrypt20 1.9.4-3ubuntu3 deb libgmp10 2:6.2.1+dfsg-3ubuntu1 deb -libgnutls30 3.7.3-4ubuntu1.1 deb +libgnutls30 3.7.3-4ubuntu1.2 deb libgpg-error0 1.43-3 deb libgssapi-krb5-2 1.19.2-2ubuntu0.1 deb libhogweed6 3.7.3-1build2 deb @@ -112,7 +112,7 @@ libtasn1-6 4.18.0-4build1 deb libtinfo6 6.3-2 deb libtirpc-common 1.3.2-2ubuntu0.1 deb libtirpc3 1.3.2-2ubuntu0.1 deb -libudev1 249.11-0ubuntu3.6 deb +libudev1 249.11-0ubuntu3.7 deb libunistring2 1.0-1 deb libuuid1 2.37.2-4ubuntu3 deb libxxhash0 0.8.1-1 deb @@ -131,7 +131,7 @@ openssl 3.0.2-0ubuntu1.8 deb passwd 1:4.8.1-2ubuntu2.1 deb perl-base 5.34.0-3ubuntu1.1 deb pinentry-curses 1.1.1-1build2 deb -plexmediaserver 1.31.1.6733-bc0674160 deb +plexmediaserver 1.31.1.6782-77dfff442 deb procps 2:3.3.17-6ubuntu2 deb publicsuffix 20211207.1025-1 deb readline-common 8.1.2-1 deb @@ -139,10 +139,10 @@ sed 4.8-1ubuntu2 deb sensible-utils 0.0.17 deb systemd-hwe-hwdb 249.11.3 deb sysvinit-utils 3.01-1ubuntu1 deb -tar 1.34+dfsg-1build3 deb +tar 1.34+dfsg-1ubuntu0.1.22.04.1 deb tzdata 2022g-0ubuntu0.22.04.1 deb ubuntu-keyring 2021.03.26 deb -udev 249.11-0ubuntu3.6 deb +udev 249.11-0ubuntu3.7 deb unrar 1:6.1.5-1 deb usrmerge 25ubuntu2 deb util-linux 2.37.2-4ubuntu3 deb From 0cc418f6342d21fcb8c0a8bbde74cba8c2ea0d35 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 14 Mar 2023 18:51:38 +0100 Subject: [PATCH 312/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 7394953..145693e 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -131,7 +131,7 @@ openssl 3.0.2-0ubuntu1.8 deb passwd 1:4.8.1-2ubuntu2.1 deb perl-base 5.34.0-3ubuntu1.1 deb pinentry-curses 1.1.1-1build2 deb -plexmediaserver 1.31.1.6782-77dfff442 deb +plexmediaserver 1.31.2.6810-a607d384f deb procps 2:3.3.17-6ubuntu2 deb publicsuffix 20211207.1025-1 deb readline-common 8.1.2-1 deb From d8e526939d5daa5c1110453d2daf3373dcb5f398 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 28 Mar 2023 05:58:15 +0200 Subject: [PATCH 313/514] Bot Updating Package Versions --- package_versions.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 145693e..bc31bb0 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -8,7 +8,7 @@ bash 5.1-6ubuntu1 deb bsdutils 1:2.37.2-4ubuntu3 deb ca-certificates 20211016ubuntu0.22.04.1 deb coreutils 8.32-4.1ubuntu1 deb -curl 7.81.0-1ubuntu1.8 deb +curl 7.81.0-1ubuntu1.10 deb dash 0.5.11+git20210903+057cd650a4ed-3build1 deb debconf 1.5.79ubuntu1 deb debianutils 5.5-1ubuntu2 deb @@ -49,7 +49,7 @@ libcap-ng0 0.7.9-2.2build3 deb libcap2 1:2.44-1build3 deb libcom-err2 1.46.5-2ubuntu1.1 deb libcrypt1 1:4.4.27-1 deb -libcurl4 7.81.0-1ubuntu1.8 deb +libcurl4 7.81.0-1ubuntu1.10 deb libdb5.3 5.3.28+dfsg1-0.8ubuntu3 deb libdebconfclient0 0.261ubuntu1 deb libext2fs2 1.46.5-2ubuntu1.1 deb @@ -69,8 +69,8 @@ libkmod2 29-1ubuntu1 deb libkrb5-3 1.19.2-2ubuntu0.1 deb libkrb5support0 1.19.2-2ubuntu0.1 deb libksba8 1.6.0-2ubuntu0.2 deb -libldap-2.5-0 2.5.13+dfsg-0ubuntu0.22.04.1 deb -libldap-common 2.5.13+dfsg-0ubuntu0.22.04.1 deb +libldap-2.5-0 2.5.14+dfsg-0ubuntu0.22.04.1 deb +libldap-common 2.5.14+dfsg-0ubuntu0.22.04.1 deb liblz4-1 1.9.3-2build2 deb liblzma5 5.2.5-2ubuntu1 deb libmd0 1.0.4-1build1 deb @@ -107,7 +107,7 @@ libss2 1.46.5-2ubuntu1.1 deb libssh-4 0.9.6-2build1 deb libssl3 3.0.2-0ubuntu1.8 deb libstdc++6 12.1.0-2ubuntu1~22.04 deb -libsystemd0 249.11-0ubuntu3.6 deb +libsystemd0 249.11-0ubuntu3.7 deb libtasn1-6 4.18.0-4build1 deb libtinfo6 6.3-2 deb libtirpc-common 1.3.2-2ubuntu0.1 deb From aeb1a25634babc96d3dbef34584c6db7f6fa8ea6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 28 Mar 2023 11:03:21 -0500 Subject: [PATCH 314/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index bc31bb0..277f033 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -131,7 +131,7 @@ openssl 3.0.2-0ubuntu1.8 deb passwd 1:4.8.1-2ubuntu2.1 deb perl-base 5.34.0-3ubuntu1.1 deb pinentry-curses 1.1.1-1build2 deb -plexmediaserver 1.31.2.6810-a607d384f deb +plexmediaserver 1.31.3.6868-28fc46b27 deb procps 2:3.3.17-6ubuntu2 deb publicsuffix 20211207.1025-1 deb readline-common 8.1.2-1 deb From a0b6783a5d5000a2fb8f1ee754841f67589f543d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 4 Apr 2023 06:02:59 +0200 Subject: [PATCH 315/514] Bot Updating Templated Files --- Jenkinsfile | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 69ba944..583eaaa 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -58,7 +58,7 @@ pipeline { env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/' env.PULL_REQUEST = env.CHANGE_ID - env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/call_invalid_helper.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml' + env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/call_issue_pr_tracker.yml ./.github/workflows/call_issues_cron.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml' } script{ env.LS_RELEASE_NUMBER = sh( @@ -232,17 +232,14 @@ pipeline { } sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-shellcheck/master/checkrun.sh | /bin/bash''' sh '''#! /bin/bash - set -e - docker pull ghcr.io/linuxserver/lsiodev-spaces-file-upload:latest docker run --rm \ - -e DESTINATION=\"${IMAGE}/${META_TAG}/shellcheck-result.xml\" \ - -e FILE_NAME="shellcheck-result.xml" \ - -e MIMETYPE="text/xml" \ - -v ${WORKSPACE}:/mnt \ - -e SECRET_KEY=\"${S3_SECRET}\" \ - -e ACCESS_KEY=\"${S3_KEY}\" \ - -t ghcr.io/linuxserver/lsiodev-spaces-file-upload:latest \ - python /upload.py''' + -v ${WORKSPACE}:/mnt \ + -e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \ + -e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \ + ghcr.io/linuxserver/baseimage-alpine:3.17 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\ + apk add --no-cache py3-pip && \ + pip install s3cmd && \ + s3cmd put --no-preserve --acl-public -m text/xml /mnt/shellcheck-result.xml s3://ci-tests.linuxserver.io/${IMAGE}/${META_TAG}/shellcheck-result.xml" || :''' } } } @@ -279,7 +276,7 @@ pipeline { echo "Jenkinsfile is up to date." fi # Stage 2 - Delete old templates - OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md\n.github/ISSUE_TEMPLATE/issue.bug.md\n.github/ISSUE_TEMPLATE/issue.feature.md" + OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml" for i in ${OLD_TEMPLATES}; do if [[ -f "${i}" ]]; then TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}" @@ -296,7 +293,7 @@ pipeline { git commit -m 'Bot Updating Templated Files' git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} - echo "Deleting old templates" + echo "Deleting old and deprecated templates" rm -Rf ${TEMPDIR} exit 0 else From 0aecc24000aac445eb5705b438e83793df79e4a1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 4 Apr 2023 04:08:58 +0000 Subject: [PATCH 316/514] Bot Updating Templated Files --- .github/workflows/call_invalid_helper.yml | 12 ------------ .github/workflows/stale.yml | 23 ----------------------- 2 files changed, 35 deletions(-) delete mode 100644 .github/workflows/call_invalid_helper.yml delete mode 100755 .github/workflows/stale.yml diff --git a/.github/workflows/call_invalid_helper.yml b/.github/workflows/call_invalid_helper.yml deleted file mode 100644 index 773767c..0000000 --- a/.github/workflows/call_invalid_helper.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: Comment on invalid interaction -on: - issues: - types: - - labeled -jobs: - add-comment-on-invalid: - if: github.event.label.name == 'invalid' - permissions: - issues: write - uses: linuxserver/github-workflows/.github/workflows/invalid-interaction-helper.yml@v1 - secrets: inherit diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml deleted file mode 100755 index 73dfe45..0000000 --- a/.github/workflows/stale.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: Mark stale issues and pull requests - -on: - schedule: - - cron: "30 1 * * *" - -jobs: - stale: - - runs-on: ubuntu-latest - - steps: - - uses: actions/stale@v6.0.1 - with: - stale-issue-message: "This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions." - stale-pr-message: "This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions." - stale-issue-label: 'no-issue-activity' - stale-pr-label: 'no-pr-activity' - days-before-stale: 30 - days-before-close: 365 - exempt-issue-labels: 'awaiting-approval,work-in-progress' - exempt-pr-labels: 'awaiting-approval,work-in-progress' - repo-token: ${{ secrets.GITHUB_TOKEN }} From e77ae57845f8a2cc76063b03b1330016b10b3258 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 4 Apr 2023 04:14:12 +0000 Subject: [PATCH 317/514] Bot Updating Templated Files --- .github/workflows/call_issue_pr_tracker.yml | 14 ++++++++++++++ .github/workflows/call_issues_cron.yml | 13 +++++++++++++ .github/workflows/package_trigger_scheduler.yml | 2 +- .github/workflows/permissions.yml | 3 ++- 4 files changed, 30 insertions(+), 2 deletions(-) create mode 100755 .github/workflows/call_issue_pr_tracker.yml create mode 100755 .github/workflows/call_issues_cron.yml diff --git a/.github/workflows/call_issue_pr_tracker.yml b/.github/workflows/call_issue_pr_tracker.yml new file mode 100755 index 0000000..87243e2 --- /dev/null +++ b/.github/workflows/call_issue_pr_tracker.yml @@ -0,0 +1,14 @@ +name: Issue & PR Tracker + +on: + issues: + types: [opened,reopened,labeled,unlabeled] + pull_request_target: + types: [opened,reopened,review_requested,review_request_removed,labeled,unlabeled] + +jobs: + manage-project: + permissions: + issues: write + uses: linuxserver/github-workflows/.github/workflows/issue-pr-tracker.yml@v1 + secrets: inherit diff --git a/.github/workflows/call_issues_cron.yml b/.github/workflows/call_issues_cron.yml new file mode 100755 index 0000000..e38dfc0 --- /dev/null +++ b/.github/workflows/call_issues_cron.yml @@ -0,0 +1,13 @@ +name: Mark stale issues and pull requests +on: + schedule: + - cron: '33 12 * * *' + workflow_dispatch: + +jobs: + stale: + permissions: + issues: write + pull-requests: write + uses: linuxserver/github-workflows/.github/workflows/issues-cron.yml@v1 + secrets: inherit diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml index fbd8e8f..7e362a2 100644 --- a/.github/workflows/package_trigger_scheduler.yml +++ b/.github/workflows/package_trigger_scheduler.yml @@ -2,7 +2,7 @@ name: Package Trigger Scheduler on: schedule: - - cron: '51 3 * * 2' + - cron: '0 9 * * 1' workflow_dispatch: jobs: diff --git a/.github/workflows/permissions.yml b/.github/workflows/permissions.yml index 2df6b61..1447bc5 100755 --- a/.github/workflows/permissions.yml +++ b/.github/workflows/permissions.yml @@ -1,9 +1,10 @@ name: Permission check on: - pull_request: + pull_request_target: paths: - '**/run' - '**/finish' + - '**/check' jobs: permission_check: uses: linuxserver/github-workflows/.github/workflows/init-svc-executable-permissions.yml@v1 From ad7b5eb139acc7bd9067dccd5c4b2bf94be29af3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 10 Apr 2023 10:49:46 -0500 Subject: [PATCH 318/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 277f033..2e488d0 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -131,7 +131,7 @@ openssl 3.0.2-0ubuntu1.8 deb passwd 1:4.8.1-2ubuntu2.1 deb perl-base 5.34.0-3ubuntu1.1 deb pinentry-curses 1.1.1-1build2 deb -plexmediaserver 1.31.3.6868-28fc46b27 deb +plexmediaserver 1.32.0.6918-6f393eda1 deb procps 2:3.3.17-6ubuntu2 deb publicsuffix 20211207.1025-1 deb readline-common 8.1.2-1 deb From 2d7af046b18362485293427ae71a131ecd9da4e0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 17 Apr 2023 11:19:19 +0200 Subject: [PATCH 319/514] Bot Updating Package Versions --- package_versions.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 2e488d0..20b192d 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -69,8 +69,8 @@ libkmod2 29-1ubuntu1 deb libkrb5-3 1.19.2-2ubuntu0.1 deb libkrb5support0 1.19.2-2ubuntu0.1 deb libksba8 1.6.0-2ubuntu0.2 deb -libldap-2.5-0 2.5.14+dfsg-0ubuntu0.22.04.1 deb -libldap-common 2.5.14+dfsg-0ubuntu0.22.04.1 deb +libldap-2.5-0 2.5.14+dfsg-0ubuntu0.22.04.2 deb +libldap-common 2.5.14+dfsg-0ubuntu0.22.04.2 deb liblz4-1 1.9.3-2build2 deb liblzma5 5.2.5-2ubuntu1 deb libmd0 1.0.4-1build1 deb @@ -112,7 +112,7 @@ libtasn1-6 4.18.0-4build1 deb libtinfo6 6.3-2 deb libtirpc-common 1.3.2-2ubuntu0.1 deb libtirpc3 1.3.2-2ubuntu0.1 deb -libudev1 249.11-0ubuntu3.7 deb +libudev1 249.11-0ubuntu3.9 deb libunistring2 1.0-1 deb libuuid1 2.37.2-4ubuntu3 deb libxxhash0 0.8.1-1 deb @@ -140,9 +140,9 @@ sensible-utils 0.0.17 deb systemd-hwe-hwdb 249.11.3 deb sysvinit-utils 3.01-1ubuntu1 deb tar 1.34+dfsg-1ubuntu0.1.22.04.1 deb -tzdata 2022g-0ubuntu0.22.04.1 deb +tzdata 2023c-0ubuntu0.22.04.0 deb ubuntu-keyring 2021.03.26 deb -udev 249.11-0ubuntu3.7 deb +udev 249.11-0ubuntu3.9 deb unrar 1:6.1.5-1 deb usrmerge 25ubuntu2 deb util-linux 2.37.2-4ubuntu3 deb From d0f6d248793398fec4c6a059f720765c0ed2f90b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 17 Apr 2023 20:52:23 -0500 Subject: [PATCH 320/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 20b192d..70aa3a4 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -131,7 +131,7 @@ openssl 3.0.2-0ubuntu1.8 deb passwd 1:4.8.1-2ubuntu2.1 deb perl-base 5.34.0-3ubuntu1.1 deb pinentry-curses 1.1.1-1build2 deb -plexmediaserver 1.32.0.6918-6f393eda1 deb +plexmediaserver 1.32.0.6950-8521b7d99 deb procps 2:3.3.17-6ubuntu2 deb publicsuffix 20211207.1025-1 deb readline-common 8.1.2-1 deb From 24ada016206b625111af9529c9ff27dcba1d60f7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 20 Apr 2023 22:49:03 +0000 Subject: [PATCH 321/514] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 70aa3a4..db15b1a 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -107,7 +107,7 @@ libss2 1.46.5-2ubuntu1.1 deb libssh-4 0.9.6-2build1 deb libssl3 3.0.2-0ubuntu1.8 deb libstdc++6 12.1.0-2ubuntu1~22.04 deb -libsystemd0 249.11-0ubuntu3.7 deb +libsystemd0 249.11-0ubuntu3.9 deb libtasn1-6 4.18.0-4build1 deb libtinfo6 6.3-2 deb libtirpc-common 1.3.2-2ubuntu0.1 deb @@ -131,7 +131,7 @@ openssl 3.0.2-0ubuntu1.8 deb passwd 1:4.8.1-2ubuntu2.1 deb perl-base 5.34.0-3ubuntu1.1 deb pinentry-curses 1.1.1-1build2 deb -plexmediaserver 1.32.0.6950-8521b7d99 deb +plexmediaserver 1.32.0.6973-a787c5a8e deb procps 2:3.3.17-6ubuntu2 deb publicsuffix 20211207.1025-1 deb readline-common 8.1.2-1 deb From 509264ec5179dcd39b759de646e5f4943b37b3a9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 1 May 2023 09:18:07 +0000 Subject: [PATCH 322/514] Bot Updating Templated Files --- Jenkinsfile | 91 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 85 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 583eaaa..09f793d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -41,10 +41,11 @@ pipeline { // Setup all the basic environment variables needed for the build stage("Set ENV Variables base"){ steps{ + sh '''docker pull quay.io/skopeo/stable:v1 || : ''' script{ env.EXIT_STATUS = '' env.LS_RELEASE = sh( - script: '''docker run --rm ghcr.io/linuxserver/alexeiled-skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':latest 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''', + script: '''docker run --rm quay.io/skopeo/stable:v1 inspect docker://ghcr.io/${LS_USER}/${CONTAINER_NAME}:latest 2>/dev/null | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''', returnStdout: true).trim() env.LS_RELEASE_NOTES = sh( script: '''cat readme-vars.yml | awk -F \\" '/date: "[0-9][0-9].[0-9][0-9].[0-9][0-9]:/ {print $4;exit;}' | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''', @@ -230,7 +231,7 @@ pipeline { script{ env.SHELLCHECK_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/shellcheck-result.xml' } - sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-shellcheck/master/checkrun.sh | /bin/bash''' + sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-jenkins-builder/master/checkrun.sh | /bin/bash''' sh '''#! /bin/bash docker run --rm \ -v ${WORKSPACE}:/mnt \ @@ -378,6 +379,26 @@ pipeline { } } } + // If this is a master build check the S6 service file perms + stage("Check S6 Service file Permissions"){ + when { + branch "master" + environment name: 'CHANGE_ID', value: '' + environment name: 'EXIT_STATUS', value: '' + } + steps { + script{ + sh '''#! /bin/bash + WRONG_PERM=$(find ./ -path "./.git" -prune -o \\( -name "run" -o -name "finish" -o -name "check" \\) -not -perm -u=x,g=x,o=x -print) + if [[ -n "${WRONG_PERM}" ]]; then + echo "The following S6 service files are missing the executable bit; canceling the faulty build: ${WRONG_PERM}" + exit 1 + else + echo "S6 service file perms look good." + fi ''' + } + } + } /* ####################### GitLab Mirroring ####################### */ @@ -670,6 +691,7 @@ pipeline { ]) { script{ env.CI_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/index.html' + env.CI_JSON_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/report.json' } sh '''#! /bin/bash set -e @@ -696,8 +718,6 @@ pipeline { -e WEB_SCREENSHOT=\"${CI_WEB}\" \ -e WEB_AUTH=\"${CI_AUTH}\" \ -e WEB_PATH=\"${CI_WEBPATH}\" \ - -e DO_REGION="ams3" \ - -e DO_BUCKET="lsio-ci" \ -t ghcr.io/linuxserver/ci:latest \ python3 test_build.py''' } @@ -951,8 +971,67 @@ pipeline { environment name: 'EXIT_STATUS', value: '' } steps { - sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/issues/${PULL_REQUEST}/comments \ - -d '{"body": "I am a bot, here are the test results for this PR: \\n'${CI_URL}' \\n'${SHELLCHECK_URL}'"}' ''' + sh '''#! /bin/bash + # Function to retrieve JSON data from URL + get_json() { + local url="$1" + local response=$(curl -s "$url") + if [ $? -ne 0 ]; then + echo "Failed to retrieve JSON data from $url" + return 1 + fi + local json=$(echo "$response" | jq .) + if [ $? -ne 0 ]; then + echo "Failed to parse JSON data from $url" + return 1 + fi + echo "$json" + } + + build_table() { + local data="$1" + + # Get the keys in the JSON data + local keys=$(echo "$data" | jq -r 'to_entries | map(.key) | .[]') + + # Check if keys are empty + if [ -z "$keys" ]; then + echo "JSON report data does not contain any keys or the report does not exist." + return 1 + fi + + # Build table header + local header="| Tag | Passed |\\n| --- | --- |\\n" + + # Loop through the JSON data to build the table rows + local rows="" + for build in $keys; do + local status=$(echo "$data" | jq -r ".[\\"$build\\"].test_success") + if [ "$status" = "true" ]; then + status="✅" + else + status="❌" + fi + local row="| "$build" | "$status" |\\n" + rows="${rows}${row}" + done + + local table="${header}${rows}" + local escaped_table=$(echo "$table" | sed 's/\"/\\\\"/g') + echo "$escaped_table" + } + + # Retrieve JSON data from URL + data=$(get_json "$CI_JSON_URL") + # Create table from JSON data + table=$(build_table "$data") + echo -e "$table" + + curl -X POST -H "Authorization: token $GITHUB_TOKEN" \ + -H "Accept: application/vnd.github.v3+json" \ + "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \ + -d "{\\"body\\": \\"I am a bot, here are the test results for this PR: \\n${CI_URL}\\n${SHELLCHECK_URL}\\n${table}\\"}"''' + } } } From 878ff3ad341353a743c8c34bb1050c7a917550d3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 1 May 2023 09:19:47 +0000 Subject: [PATCH 323/514] Bot Updating Templated Files --- .github/workflows/call_issue_pr_tracker.yml | 6 ++++-- .github/workflows/external_trigger.yml | 8 ++++++++ .../workflows/external_trigger_scheduler.yml | 18 ++++++++++-------- .github/workflows/package_trigger.yml | 4 ++++ .../workflows/package_trigger_scheduler.yml | 8 ++++---- 5 files changed, 30 insertions(+), 14 deletions(-) diff --git a/.github/workflows/call_issue_pr_tracker.yml b/.github/workflows/call_issue_pr_tracker.yml index 87243e2..2c30784 100755 --- a/.github/workflows/call_issue_pr_tracker.yml +++ b/.github/workflows/call_issue_pr_tracker.yml @@ -2,9 +2,11 @@ name: Issue & PR Tracker on: issues: - types: [opened,reopened,labeled,unlabeled] + types: [opened,reopened,labeled,unlabeled,closed] pull_request_target: - types: [opened,reopened,review_requested,review_request_removed,labeled,unlabeled] + types: [opened,reopened,review_requested,review_request_removed,labeled,unlabeled,closed] + pull_request_review: + types: [submitted,edited,dismissed] jobs: manage-project: diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 597ec73..3323f8e 100644 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -14,9 +14,11 @@ jobs: run: | if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_PLEX_MASTER }}" ]; then echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_PLEX_MASTER is set; skipping trigger. ****" + echo "Github secret \`PAUSE_EXTERNAL_TRIGGER_PLEX_MASTER\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY exit 0 fi echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_PLEX_MASTER\". ****" + echo "External trigger running off of master branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_PLEX_MASTER\`" >> $GITHUB_STEP_SUMMARY echo "**** Retrieving external version ****" EXT_RELEASE=$(curl -s "https://plex.tv/api/downloads/5.json" | jq -r '. | .computer.Linux.version') if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then @@ -30,6 +32,7 @@ jobs: fi EXT_RELEASE=$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g') echo "**** External version: ${EXT_RELEASE} ****" + echo "External version: ${EXT_RELEASE}" >> $GITHUB_STEP_SUMMARY echo "**** Retrieving last pushed version ****" image="linuxserver/plex" tag="latest" @@ -65,14 +68,18 @@ jobs: exit 1 fi echo "**** Last pushed version: ${IMAGE_VERSION} ****" + echo "Last pushed version: ${IMAGE_VERSION}" >> $GITHUB_STEP_SUMMARY if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then echo "**** Version ${EXT_RELEASE} already pushed, exiting ****" + echo "Version ${EXT_RELEASE} already pushed, exiting" >> $GITHUB_STEP_SUMMARY exit 0 elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-plex/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then echo "**** New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting ****" + echo "New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY exit 0 else echo "**** New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build ****" + echo "New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build" >> $GITHUB_STEP_SUMMARY response=$(curl -iX POST \ https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-plex/job/master/buildWithParameters?PACKAGE_CHECK=false \ --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") @@ -82,6 +89,7 @@ jobs: buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url') buildurl="${buildurl%$'\r'}" echo "**** Jenkins job build url: ${buildurl} ****" + echo "Jenkins job build url: ${buildurl}" >> $GITHUB_STEP_SUMMARY echo "**** Attempting to change the Jenkins job description ****" curl -iX POST \ "${buildurl}submitDescription" \ diff --git a/.github/workflows/external_trigger_scheduler.yml b/.github/workflows/external_trigger_scheduler.yml index c64d369..c12a6ac 100644 --- a/.github/workflows/external_trigger_scheduler.yml +++ b/.github/workflows/external_trigger_scheduler.yml @@ -2,7 +2,7 @@ name: External Trigger Scheduler on: schedule: - - cron: '45 * * * *' + - cron: '14 * * * *' workflow_dispatch: jobs: @@ -17,18 +17,18 @@ jobs: run: | echo "**** Branches found: ****" git for-each-ref --format='%(refname:short)' refs/remotes - echo "**** Pulling the yq docker image ****" - docker pull ghcr.io/linuxserver/yq for br in $(git for-each-ref --format='%(refname:short)' refs/remotes) do br=$(echo "$br" | sed 's|origin/||g') echo "**** Evaluating branch ${br} ****" - ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-plex/${br}/jenkins-vars.yml \ - | docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch) - if [ "$br" == "$ls_branch" ]; then - echo "**** Branch ${br} appears to be live; checking workflow. ****" + ls_jenkins_vars=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-plex/${br}/jenkins-vars.yml) + ls_branch=$(echo "${ls_jenkins_vars}" | yq -r '.ls_branch') + ls_trigger=$(echo "${ls_jenkins_vars}" | yq -r '.external_type') + if [[ "${br}" == "${ls_branch}" ]] && [[ "${ls_trigger}" != "os" ]]; then + echo "**** Branch ${br} appears to be live and trigger is not os; checking workflow. ****" if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-plex/${br}/.github/workflows/external_trigger.yml > /dev/null 2>&1; then echo "**** Workflow exists. Triggering external trigger workflow for branch ${br} ****." + echo "Triggering external trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY curl -iX POST \ -H "Authorization: token ${{ secrets.CR_PAT }}" \ -H "Accept: application/vnd.github.v3+json" \ @@ -36,8 +36,10 @@ jobs: https://api.github.com/repos/linuxserver/docker-plex/actions/workflows/external_trigger.yml/dispatches else echo "**** Workflow doesn't exist; skipping trigger. ****" + echo "Skipping branch ${br} due to no external trigger workflow present." >> $GITHUB_STEP_SUMMARY fi else - echo "**** ${br} appears to be a dev branch; skipping trigger. ****" + echo "**** ${br} is either a dev branch, or has no external version; skipping trigger. ****" + echo "Skipping branch ${br} due to being detected as dev branch or having no external version." >> $GITHUB_STEP_SUMMARY fi done diff --git a/.github/workflows/package_trigger.yml b/.github/workflows/package_trigger.yml index 46c638a..c6e55ef 100644 --- a/.github/workflows/package_trigger.yml +++ b/.github/workflows/package_trigger.yml @@ -14,13 +14,16 @@ jobs: run: | if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_PLEX_MASTER }}" ]; then echo "**** Github secret PAUSE_PACKAGE_TRIGGER_PLEX_MASTER is set; skipping trigger. ****" + echo "Github secret \`PAUSE_PACKAGE_TRIGGER_PLEX_MASTER\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY exit 0 fi if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-plex/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then echo "**** There already seems to be an active build on Jenkins; skipping package trigger ****" + echo "There already seems to be an active build on Jenkins; skipping package trigger" >> $GITHUB_STEP_SUMMARY exit 0 fi echo "**** Package trigger running off of master branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_PLEX_MASTER\". ****" + echo "Package trigger running off of master branch. To disable, set a Github secret named \`PAUSE_PACKAGE_TRIGGER_PLEX_MASTER\`" >> $GITHUB_STEP_SUMMARY response=$(curl -iX POST \ https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-plex/job/master/buildWithParameters?PACKAGE_CHECK=true \ --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") @@ -30,6 +33,7 @@ jobs: buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url') buildurl="${buildurl%$'\r'}" echo "**** Jenkins job build url: ${buildurl} ****" + echo "Jenkins job build url: ${buildurl}" >> $GITHUB_STEP_SUMMARY echo "**** Attempting to change the Jenkins job description ****" curl -iX POST \ "${buildurl}submitDescription" \ diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml index 7e362a2..47a72fb 100644 --- a/.github/workflows/package_trigger_scheduler.yml +++ b/.github/workflows/package_trigger_scheduler.yml @@ -17,18 +17,16 @@ jobs: run: | echo "**** Branches found: ****" git for-each-ref --format='%(refname:short)' refs/remotes - echo "**** Pulling the yq docker image ****" - docker pull ghcr.io/linuxserver/yq for br in $(git for-each-ref --format='%(refname:short)' refs/remotes) do br=$(echo "$br" | sed 's|origin/||g') echo "**** Evaluating branch ${br} ****" - ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-plex/${br}/jenkins-vars.yml \ - | docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch) + ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-plex/${br}/jenkins-vars.yml | yq -r '.ls_branch') if [ "${br}" == "${ls_branch}" ]; then echo "**** Branch ${br} appears to be live; checking workflow. ****" if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-plex/${br}/.github/workflows/package_trigger.yml > /dev/null 2>&1; then echo "**** Workflow exists. Triggering package trigger workflow for branch ${br}. ****" + echo "Triggering package trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY triggered_branches="${triggered_branches}${br} " curl -iX POST \ -H "Authorization: token ${{ secrets.CR_PAT }}" \ @@ -38,9 +36,11 @@ jobs: sleep 30 else echo "**** Workflow doesn't exist; skipping trigger. ****" + echo "Skipping branch ${br} due to no package trigger workflow present." >> $GITHUB_STEP_SUMMARY fi else echo "**** ${br} appears to be a dev branch; skipping trigger. ****" + echo "Skipping branch ${br} due to being detected as dev branch." >> $GITHUB_STEP_SUMMARY fi done echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****" From 6448b9838f502d8eb010b29c4b1b7cf194b852c5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 1 May 2023 09:23:21 +0000 Subject: [PATCH 324/514] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index db15b1a..c4a8700 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,7 +1,7 @@ NAME VERSION TYPE adduser 3.118ubuntu5 deb -apt 2.4.8 deb -apt-utils 2.4.8 deb +apt 2.4.9 deb +apt-utils 2.4.9 deb base-files 12ubuntu4.3 deb base-passwd 3.5.52build1 deb bash 5.1-6ubuntu1 deb @@ -34,7 +34,7 @@ hostname 3.23ubuntu2 deb init-system-helpers 1.62 deb jq 1.6-2.1ubuntu3 deb libacl1 2.3.1-1 deb -libapt-pkg6.0 2.4.8 deb +libapt-pkg6.0 2.4.9 deb libassuan0 2.5.5-1build1 deb libattr1 1:2.5.1-1build1 deb libaudit-common 1:3.0.7-1build1 deb @@ -127,7 +127,7 @@ ncurses-base 6.3-2 deb ncurses-bin 6.3-2 deb netcat 1.218-4ubuntu1 deb netcat-openbsd 1.218-4ubuntu1 deb -openssl 3.0.2-0ubuntu1.8 deb +openssl 3.0.2-0ubuntu1.9 deb passwd 1:4.8.1-2ubuntu2.1 deb perl-base 5.34.0-3ubuntu1.1 deb pinentry-curses 1.1.1-1build2 deb From 6388b41298ddfb848ed07de85b79df061b92afb3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 8 May 2023 09:17:29 +0000 Subject: [PATCH 325/514] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index c4a8700..9868537 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -105,7 +105,7 @@ libsmartcols1 2.37.2-4ubuntu3 deb libsqlite3-0 3.37.2-2ubuntu0.1 deb libss2 1.46.5-2ubuntu1.1 deb libssh-4 0.9.6-2build1 deb -libssl3 3.0.2-0ubuntu1.8 deb +libssl3 3.0.2-0ubuntu1.9 deb libstdc++6 12.1.0-2ubuntu1~22.04 deb libsystemd0 249.11-0ubuntu3.9 deb libtasn1-6 4.18.0-4build1 deb @@ -140,7 +140,7 @@ sensible-utils 0.0.17 deb systemd-hwe-hwdb 249.11.3 deb sysvinit-utils 3.01-1ubuntu1 deb tar 1.34+dfsg-1ubuntu0.1.22.04.1 deb -tzdata 2023c-0ubuntu0.22.04.0 deb +tzdata 2023c-0ubuntu0.22.04.1 deb ubuntu-keyring 2021.03.26 deb udev 249.11-0ubuntu3.9 deb unrar 1:6.1.5-1 deb From 3acca9037ba77d4260af2d0749a9b2100b48d9a3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 8 May 2023 16:33:32 +0000 Subject: [PATCH 326/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 9868537..8d9384e 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -131,7 +131,7 @@ openssl 3.0.2-0ubuntu1.9 deb passwd 1:4.8.1-2ubuntu2.1 deb perl-base 5.34.0-3ubuntu1.1 deb pinentry-curses 1.1.1-1build2 deb -plexmediaserver 1.32.0.6973-a787c5a8e deb +plexmediaserver 1.32.1.6999-91e1e2e2c deb procps 2:3.3.17-6ubuntu2 deb publicsuffix 20211207.1025-1 deb readline-common 8.1.2-1 deb From c6a5e5c350de87a661d5abcd50c5330b59530e69 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 22 May 2023 17:26:44 +0000 Subject: [PATCH 327/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 8d9384e..09fcb08 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -131,7 +131,7 @@ openssl 3.0.2-0ubuntu1.9 deb passwd 1:4.8.1-2ubuntu2.1 deb perl-base 5.34.0-3ubuntu1.1 deb pinentry-curses 1.1.1-1build2 deb -plexmediaserver 1.32.1.6999-91e1e2e2c deb +plexmediaserver 1.32.2.7100-248a2daf0 deb procps 2:3.3.17-6ubuntu2 deb publicsuffix 20211207.1025-1 deb readline-common 8.1.2-1 deb From 1439d1b4d29fd8a72a253afa01f568ed5bdfed2f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 29 May 2023 09:17:46 +0000 Subject: [PATCH 328/514] Bot Updating Templated Files --- Jenkinsfile | 121 ++++++++++++++++++++++------------------------------ 1 file changed, 50 insertions(+), 71 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 09f793d..8870611 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -41,7 +41,12 @@ pipeline { // Setup all the basic environment variables needed for the build stage("Set ENV Variables base"){ steps{ - sh '''docker pull quay.io/skopeo/stable:v1 || : ''' + sh '''#! /bin/bash + containers=$(docker ps -aq) + if [[ -n "${containers}" ]]; then + docker stop ${containers} + fi + docker system prune -af --volumes || : ''' script{ env.EXIT_STATUS = '' env.LS_RELEASE = sh( @@ -206,12 +211,12 @@ pipeline { env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { - env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST } else { - env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST } - env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST - env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/' @@ -339,6 +344,8 @@ pipeline { git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-logo.png ]]; then sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-logo.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml + elif [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then + sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml fi if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then cd ${TEMPDIR}/unraid/templates/ @@ -430,8 +437,7 @@ pipeline { } steps{ sh '''#! /bin/bash - set -e - PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/organizations/linuxserver-ci/packages | jq -r '.[] | select(.name=="linuxserver/plex") | .uuid') + PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/organizations/linuxserver-ci/packages | jq -r '.[] | select(.name=="linuxserver/plex") | .uuid' || :) if [ -z "${PACKAGE_UUID}" ]; then echo "Adding package to Scarf.sh" curl -sX POST https://scarf.sh/api/v1/organizations/linuxserver-ci/packages \ @@ -541,9 +547,12 @@ pipeline { retry(5) { sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" } - sh '''docker rmi \ - ${IMAGE}:arm32v7-${META_TAG} \ - ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} || :''' + sh '''#! /bin/bash + containers=$(docker ps -aq) + if [[ -n "${containers}" ]]; then + docker stop ${containers} + fi + docker system prune -af --volumes || : ''' } } stage('Build ARM64') { @@ -576,9 +585,12 @@ pipeline { retry(5) { sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" } - sh '''docker rmi \ - ${IMAGE}:arm64v8-${META_TAG} \ - ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :''' + sh '''#! /bin/bash + containers=$(docker ps -aq) + if [[ -n "${containers}" ]]; then + docker stop ${containers} + fi + docker system prune -af --volumes || : ''' } } } @@ -639,13 +651,6 @@ pipeline { environment name: 'EXIT_STATUS', value: '' } steps { - sh '''#! /bin/bash - echo "Packages were updated. Cleaning up the image and exiting." - if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then - docker rmi ${IMAGE}:amd64-${META_TAG} - else - docker rmi ${IMAGE}:${META_TAG} - fi''' script{ env.EXIT_STATUS = 'ABORTED' } @@ -663,13 +668,6 @@ pipeline { } } steps { - sh '''#! /bin/bash - echo "There are no package updates. Cleaning up the image and exiting." - if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then - docker rmi ${IMAGE}:amd64-${META_TAG} - else - docker rmi ${IMAGE}:${META_TAG} - fi''' script{ env.EXIT_STATUS = 'ABORTED' } @@ -770,17 +768,6 @@ pipeline { done ''' } - sh '''#! /bin/bash - for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do - docker rmi \ - ${DELETEIMAGE}:${META_TAG} \ - ${DELETEIMAGE}:${EXT_RELEASE_TAG} \ - ${DELETEIMAGE}:latest || : - if [ -n "${SEMVER}" ]; then - docker rmi ${DELETEIMAGE}:${SEMVER} || : - fi - done - ''' } } } @@ -874,29 +861,6 @@ pipeline { done ''' } - sh '''#! /bin/bash - for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do - docker rmi \ - ${DELETEIMAGE}:amd64-${META_TAG} \ - ${DELETEIMAGE}:amd64-latest \ - ${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \ - ${DELETEIMAGE}:arm32v7-${META_TAG} \ - ${DELETEIMAGE}:arm32v7-latest \ - ${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \ - ${DELETEIMAGE}:arm64v8-${META_TAG} \ - ${DELETEIMAGE}:arm64v8-latest \ - ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || : - if [ -n "${SEMVER}" ]; then - docker rmi \ - ${DELETEIMAGE}:amd64-${SEMVER} \ - ${DELETEIMAGE}:arm32v7-${SEMVER} \ - ${DELETEIMAGE}:arm64v8-${SEMVER} || : - fi - done - docker rmi \ - ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \ - ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || : - ''' } } } @@ -967,7 +931,6 @@ pipeline { stage('Pull Request Comment') { when { not {environment name: 'CHANGE_ID', value: ''} - environment name: 'CI', value: 'true' environment name: 'EXIT_STATUS', value: '' } steps { @@ -1021,16 +984,24 @@ pipeline { echo "$escaped_table" } - # Retrieve JSON data from URL - data=$(get_json "$CI_JSON_URL") - # Create table from JSON data - table=$(build_table "$data") - echo -e "$table" + if [[ "${CI}" = "true" ]]; then + # Retrieve JSON data from URL + data=$(get_json "$CI_JSON_URL") + # Create table from JSON data + table=$(build_table "$data") + echo -e "$table" - curl -X POST -H "Authorization: token $GITHUB_TOKEN" \ - -H "Accept: application/vnd.github.v3+json" \ - "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \ - -d "{\\"body\\": \\"I am a bot, here are the test results for this PR: \\n${CI_URL}\\n${SHELLCHECK_URL}\\n${table}\\"}"''' + curl -X POST -H "Authorization: token $GITHUB_TOKEN" \ + -H "Accept: application/vnd.github.v3+json" \ + "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \ + -d "{\\"body\\": \\"I am a bot, here are the test results for this PR: \\n${CI_URL}\\n${SHELLCHECK_URL}\\n${table}\\"}" + else + curl -X POST -H "Authorization: token $GITHUB_TOKEN" \ + -H "Accept: application/vnd.github.v3+json" \ + "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \ + -d "{\\"body\\": \\"I am a bot, here is the pushed image/manifest for this PR: \\n\\n\\`${GITHUBIMAGE}:${META_TAG}\\`\\"}" + fi + ''' } } @@ -1057,6 +1028,14 @@ pipeline { } } cleanup { + sh '''#! /bin/bash + echo "Performing docker system prune!!" + containers=$(docker ps -aq) + if [[ -n "${containers}" ]]; then + docker stop ${containers} + fi + docker system prune -af --volumes || : + ''' cleanWs() } } From d1584cd2073db9a7c2aa17cd02d6ddec421c180b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 5 Jun 2023 09:17:49 +0000 Subject: [PATCH 329/514] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 09fcb08..aa21bb9 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -6,7 +6,7 @@ base-files 12ubuntu4.3 deb base-passwd 3.5.52build1 deb bash 5.1-6ubuntu1 deb bsdutils 1:2.37.2-4ubuntu3 deb -ca-certificates 20211016ubuntu0.22.04.1 deb +ca-certificates 20230311ubuntu0.22.04.1 deb coreutils 8.32-4.1ubuntu1 deb curl 7.81.0-1ubuntu1.10 deb dash 0.5.11+git20210903+057cd650a4ed-3build1 deb @@ -127,7 +127,7 @@ ncurses-base 6.3-2 deb ncurses-bin 6.3-2 deb netcat 1.218-4ubuntu1 deb netcat-openbsd 1.218-4ubuntu1 deb -openssl 3.0.2-0ubuntu1.9 deb +openssl 3.0.2-0ubuntu1.10 deb passwd 1:4.8.1-2ubuntu2.1 deb perl-base 5.34.0-3ubuntu1.1 deb pinentry-curses 1.1.1-1build2 deb From c864d3f96f38a1d70cdebfb07777ecc8b8847300 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 5 Jun 2023 20:26:55 +0000 Subject: [PATCH 330/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index aa21bb9..e9ca1a2 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -131,7 +131,7 @@ openssl 3.0.2-0ubuntu1.10 deb passwd 1:4.8.1-2ubuntu2.1 deb perl-base 5.34.0-3ubuntu1.1 deb pinentry-curses 1.1.1-1build2 deb -plexmediaserver 1.32.2.7100-248a2daf0 deb +plexmediaserver 1.32.3.7162-b0a36929b deb procps 2:3.3.17-6ubuntu2 deb publicsuffix 20211207.1025-1 deb readline-common 8.1.2-1 deb From 9a90436d14bb2c52c9bc4d212298a0f035d396e7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 12 Jun 2023 09:20:07 +0000 Subject: [PATCH 331/514] Bot Updating Package Versions --- package_versions.txt | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index e9ca1a2..d5ef490 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -14,7 +14,7 @@ debconf 1.5.79ubuntu1 deb debianutils 5.5-1ubuntu2 deb diffutils 1:3.8-0ubuntu2 deb dirmngr 2.2.27-3ubuntu2.1 deb -dpkg 1.21.1ubuntu2.1 deb +dpkg 1.21.1ubuntu2.2 deb e2fsprogs 1.46.5-2ubuntu1.1 deb findutils 4.8.0-1ubuntu3 deb gcc-12-base 12.1.0-2ubuntu1~22.04 deb @@ -59,15 +59,15 @@ libgcrypt20 1.9.4-3ubuntu3 deb libgmp10 2:6.2.1+dfsg-3ubuntu1 deb libgnutls30 3.7.3-4ubuntu1.2 deb libgpg-error0 1.43-3 deb -libgssapi-krb5-2 1.19.2-2ubuntu0.1 deb +libgssapi-krb5-2 1.19.2-2ubuntu0.2 deb libhogweed6 3.7.3-1build2 deb libidn2-0 2.3.2-2build1 deb libjq1 1.6-2.1ubuntu3 deb -libk5crypto3 1.19.2-2ubuntu0.1 deb +libk5crypto3 1.19.2-2ubuntu0.2 deb libkeyutils1 1.6.1-2ubuntu3 deb libkmod2 29-1ubuntu1 deb -libkrb5-3 1.19.2-2ubuntu0.1 deb -libkrb5support0 1.19.2-2ubuntu0.1 deb +libkrb5-3 1.19.2-2ubuntu0.2 deb +libkrb5support0 1.19.2-2ubuntu0.2 deb libksba8 1.6.0-2ubuntu0.2 deb libldap-2.5-0 2.5.14+dfsg-0ubuntu0.22.04.2 deb libldap-common 2.5.14+dfsg-0ubuntu0.22.04.2 deb @@ -75,8 +75,8 @@ liblz4-1 1.9.3-2build2 deb liblzma5 5.2.5-2ubuntu1 deb libmd0 1.0.4-1build1 deb libmount1 2.37.2-4ubuntu3 deb -libncurses6 6.3-2 deb -libncursesw6 6.3-2 deb +libncurses6 6.3-2ubuntu0.1 deb +libncursesw6 6.3-2ubuntu0.1 deb libnettle8 3.7.3-1build2 deb libnghttp2-14 1.43.0-1build3 deb libnpth0 1.6-3build2 deb @@ -104,12 +104,12 @@ libsepol2 3.3-1build1 deb libsmartcols1 2.37.2-4ubuntu3 deb libsqlite3-0 3.37.2-2ubuntu0.1 deb libss2 1.46.5-2ubuntu1.1 deb -libssh-4 0.9.6-2build1 deb -libssl3 3.0.2-0ubuntu1.9 deb +libssh-4 0.9.6-2ubuntu0.22.04.1 deb +libssl3 3.0.2-0ubuntu1.10 deb libstdc++6 12.1.0-2ubuntu1~22.04 deb libsystemd0 249.11-0ubuntu3.9 deb libtasn1-6 4.18.0-4build1 deb -libtinfo6 6.3-2 deb +libtinfo6 6.3-2ubuntu0.1 deb libtirpc-common 1.3.2-2ubuntu0.1 deb libtirpc3 1.3.2-2ubuntu0.1 deb libudev1 249.11-0ubuntu3.9 deb @@ -123,13 +123,13 @@ logsave 1.46.5-2ubuntu1.1 deb lsb-base 11.1.0ubuntu4 deb mawk 1.3.4.20200120-3 deb mount 2.37.2-4ubuntu3 deb -ncurses-base 6.3-2 deb -ncurses-bin 6.3-2 deb +ncurses-base 6.3-2ubuntu0.1 deb +ncurses-bin 6.3-2ubuntu0.1 deb netcat 1.218-4ubuntu1 deb netcat-openbsd 1.218-4ubuntu1 deb openssl 3.0.2-0ubuntu1.10 deb passwd 1:4.8.1-2ubuntu2.1 deb -perl-base 5.34.0-3ubuntu1.1 deb +perl-base 5.34.0-3ubuntu1.2 deb pinentry-curses 1.1.1-1build2 deb plexmediaserver 1.32.3.7162-b0a36929b deb procps 2:3.3.17-6ubuntu2 deb @@ -140,7 +140,7 @@ sensible-utils 0.0.17 deb systemd-hwe-hwdb 249.11.3 deb sysvinit-utils 3.01-1ubuntu1 deb tar 1.34+dfsg-1ubuntu0.1.22.04.1 deb -tzdata 2023c-0ubuntu0.22.04.1 deb +tzdata 2023c-0ubuntu0.22.04.2 deb ubuntu-keyring 2021.03.26 deb udev 249.11-0ubuntu3.9 deb unrar 1:6.1.5-1 deb From df9f7c1798441fe6f50436cd2378f0b836c8053a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 12 Jun 2023 18:35:39 +0000 Subject: [PATCH 332/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index d5ef490..0c8748c 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -131,7 +131,7 @@ openssl 3.0.2-0ubuntu1.10 deb passwd 1:4.8.1-2ubuntu2.1 deb perl-base 5.34.0-3ubuntu1.2 deb pinentry-curses 1.1.1-1build2 deb -plexmediaserver 1.32.3.7162-b0a36929b deb +plexmediaserver 1.32.3.7192-7aa441827 deb procps 2:3.3.17-6ubuntu2 deb publicsuffix 20211207.1025-1 deb readline-common 8.1.2-1 deb From 7e4c9b7140e32beea576c035c8e747f62e34baf7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 19 Jun 2023 18:30:19 +0000 Subject: [PATCH 333/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 0c8748c..d1d22e0 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -131,7 +131,7 @@ openssl 3.0.2-0ubuntu1.10 deb passwd 1:4.8.1-2ubuntu2.1 deb perl-base 5.34.0-3ubuntu1.2 deb pinentry-curses 1.1.1-1build2 deb -plexmediaserver 1.32.3.7192-7aa441827 deb +plexmediaserver 1.32.4.7195-7c8f9d3b6 deb procps 2:3.3.17-6ubuntu2 deb publicsuffix 20211207.1025-1 deb readline-common 8.1.2-1 deb From 429f18654f64735973290605f1b6f710a046b2d8 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 3 Jul 2023 09:19:04 +0000 Subject: [PATCH 334/514] Bot Updating Templated Files --- Jenkinsfile | 83 +++++++++++++---------------------------------------- 1 file changed, 20 insertions(+), 63 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8870611..32c9ee5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -165,7 +165,7 @@ pipeline { env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { - env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER } else { env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER } @@ -188,7 +188,7 @@ pipeline { env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { - env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA } else { env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA } @@ -211,7 +211,7 @@ pipeline { env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { - env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST } else { env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST } @@ -282,7 +282,7 @@ pipeline { echo "Jenkinsfile is up to date." fi # Stage 2 - Delete old templates - OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml" + OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml Dockerfile.armhf" for i in ${OLD_TEMPLATES}; do if [[ -f "${i}" ]]; then TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}" @@ -318,12 +318,13 @@ pipeline { mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || : + cp --parents readme-vars.yml ${TEMPDIR}/repo/${LS_REPO}/ || : cd ${TEMPDIR}/repo/${LS_REPO}/ if ! grep -q '.jenkins-external' .gitignore 2>/dev/null; then echo ".jenkins-external" >> .gitignore git add .gitignore fi - git add ${TEMPLATED_FILES} + git add readme-vars.yml ${TEMPLATED_FILES} git commit -m 'Bot Updating Templated Files' git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} @@ -517,44 +518,6 @@ pipeline { --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." } } - stage('Build ARMHF') { - agent { - label 'ARMHF' - } - steps { - echo "Running on node: ${NODE_NAME}" - echo 'Logging into Github' - sh '''#! /bin/bash - echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin - ''' - sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile.armhf" - sh "docker buildx build \ - --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \ - --label \"org.opencontainers.image.authors=linuxserver.io\" \ - --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-plex/packages\" \ - --label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-plex\" \ - --label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-plex\" \ - --label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \ - --label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \ - --label \"org.opencontainers.image.vendor=linuxserver.io\" \ - --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \ - --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ - --label \"org.opencontainers.image.title=Plex\" \ - --label \"org.opencontainers.image.description=[Plex](https://plex.tv) organizes video, music and photos from personal media libraries and streams them to smart TVs, streaming boxes and mobile devices. This container is packaged as a standalone Plex Media Server. has always been a top priority. Straightforward design and bulk actions mean getting things done faster.\" \ - --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} --platform=linux/arm/v7 \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." - sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" - retry(5) { - sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" - } - sh '''#! /bin/bash - containers=$(docker ps -aq) - if [[ -n "${containers}" ]]; then - docker stop ${containers} - fi - docker system prune -af --volumes || : ''' - } - } stage('Build ARM64') { agent { label 'ARM64' @@ -695,9 +658,7 @@ pipeline { set -e docker pull ghcr.io/linuxserver/ci:latest if [ "${MULTIARCH}" == "true" ]; then - docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} - docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG} docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} fi docker run --rm \ @@ -800,8 +761,6 @@ pipeline { echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin if [ "${CI}" == "false" ]; then - docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} - docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG} docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} fi @@ -809,49 +768,47 @@ pipeline { docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-latest docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} - docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} - docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-latest - docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} if [ -n "${SEMVER}" ]; then docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER} - docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER} docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER} fi docker push ${MANIFESTIMAGE}:amd64-${META_TAG} docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} docker push ${MANIFESTIMAGE}:amd64-latest - docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG} - docker push ${MANIFESTIMAGE}:arm32v7-latest - docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} docker push ${MANIFESTIMAGE}:arm64v8-latest docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} if [ -n "${SEMVER}" ]; then docker push ${MANIFESTIMAGE}:amd64-${SEMVER} - docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER} docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER} fi docker manifest push --purge ${MANIFESTIMAGE}:latest || : - docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest - docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm + docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8 docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || : - docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} - docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm + docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8 docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} || : - docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} - docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm + docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8 if [ -n "${SEMVER}" ]; then docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || : - docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} - docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm + docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8 fi + token=$(curl -sX GET "https://ghcr.io/token?scope=repository%3Alinuxserver%2F${CONTAINER_NAME}%3Apull" | jq -r '.token') + digest=$(curl -s \ + --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \ + --header "Authorization: Bearer ${token}" \ + "https://ghcr.io/v2/linuxserver/${CONTAINER_NAME}/manifests/arm32v7-latest") + if [[ $(echo "$digest" | jq -r '.layers') != "null" ]]; then + docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-latest || : + docker manifest create ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:amd64-latest + docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-latest + fi docker manifest push --purge ${MANIFESTIMAGE}:latest docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} From 9c5bc2bd382c047c330314e09cefeaa1f7a3959d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 3 Jul 2023 09:20:31 +0000 Subject: [PATCH 335/514] Bot Updating Templated Files --- Dockerfile.armhf | 53 ------------------------------------------------ 1 file changed, 53 deletions(-) delete mode 100644 Dockerfile.armhf diff --git a/Dockerfile.armhf b/Dockerfile.armhf deleted file mode 100644 index 279bbe7..0000000 --- a/Dockerfile.armhf +++ /dev/null @@ -1,53 +0,0 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-jammy - -# set version label -ARG BUILD_DATE -ARG VERSION -ARG PLEX_RELEASE -LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" -LABEL maintainer="thelamer" - -# global environment settings -ENV DEBIAN_FRONTEND="noninteractive" \ - PLEX_DOWNLOAD="https://downloads.plex.tv/plex-media-server-new" \ - PLEX_ARCH="armhf" \ - PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR="/config/Library/Application Support" \ - PLEX_MEDIA_SERVER_HOME="/usr/lib/plexmediaserver" \ - PLEX_MEDIA_SERVER_MAX_PLUGIN_PROCS="6" \ - PLEX_MEDIA_SERVER_USER="abc" \ - PLEX_MEDIA_SERVER_INFO_VENDOR="Docker" \ - PLEX_MEDIA_SERVER_INFO_DEVICE="Docker Container (LinuxServer.io)" - -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'); \ - fi && \ - curl -o \ - /tmp/plexmediaserver.deb -L \ - "${PLEX_DOWNLOAD}/${PLEX_RELEASE}/debian/plexmediaserver_${PLEX_RELEASE}_${PLEX_ARCH}.deb" && \ - dpkg -i /tmp/plexmediaserver.deb && \ - echo "**** ensure abc user's home folder is /app ****" && \ - usermod -d /app abc && \ - echo "**** cleanup ****" && \ - apt-get clean && \ - rm -rf \ - /etc/default/plexmediaserver \ - /tmp/* \ - /var/lib/apt/lists/* \ - /var/tmp/* - -# add local files -COPY root/ / - -# ports and volumes -EXPOSE 32400/tcp 1900/udp 3005/tcp 5353/udp 8324/tcp 32410/udp 32412/udp 32413/udp 32414/udp 32469/tcp -VOLUME /config From 37d8b952b0c587be09b55e169c0944affd308617 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 3 Jul 2023 09:21:55 +0000 Subject: [PATCH 336/514] Bot Updating Templated Files --- .github/ISSUE_TEMPLATE/issue.bug.yml | 1 - README.md | 3 +- readme-vars.yml | 111 +++++++++++++-------------- 3 files changed, 54 insertions(+), 61 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/issue.bug.yml b/.github/ISSUE_TEMPLATE/issue.bug.yml index 59a10f5..ce3d19a 100755 --- a/.github/ISSUE_TEMPLATE/issue.bug.yml +++ b/.github/ISSUE_TEMPLATE/issue.bug.yml @@ -53,7 +53,6 @@ body: options: - x86-64 - arm64 - - armhf validations: required: true - type: textarea diff --git a/README.md b/README.md index cbb400f..8317bba 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ The architectures supported by this image are: | :----: | :----: | ---- | | x86-64 | ✅ | amd64-\<version tag\> | | arm64 | ✅ | arm64v8-\<version tag\> | -| armhf | ✅ | arm32v7-\<version tag\> | +| armhf | ❌ | | ## Application Setup @@ -294,6 +294,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **03.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf) * **16.10.22:** - Rebase to jammy. Update to s6v3. Remove opencl packages (bundled with plex). * **18.07.22:** - Pin all opencl related driver packages. * **16.05.22:** - Pin opencl version. diff --git a/readme-vars.yml b/readme-vars.yml index 478af0d..cbd92c4 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -5,38 +5,32 @@ project_name: plex project_url: "https://plex.tv" project_logo: "http://the-gadgeteer.com/wp-content/uploads/2015/10/plex-logo-e1446990678679.png" project_blurb: "[{{ project_name|capitalize }}]({{ project_url }}) organizes video, music and photos from personal media libraries and streams them to smart TVs, streaming boxes and mobile devices. This container is packaged as a standalone Plex Media Server. has always been a top priority. Straightforward design and bulk actions mean getting things done faster." - project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}" - # supported architectures available_architectures: - - { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"} - - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"} - - { arch: "{{ arch_armhf }}", tag: "arm32v7-latest"} - + - {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: "/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: "/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: "/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" param_usage_include_env: true param_env_vars: - - { env_var: "VERSION", env_value: "docker", desc: "Set whether to update plex or not - see Application Setup section."} + - {env_var: "VERSION", env_value: "docker", desc: "Set whether to update plex or not - see Application Setup section."} # optional env variables opt_param_usage_include_env: true opt_param_env_vars: - - { env_var: "PLEX_CLAIM", env_value: "", desc: "Optionally you can obtain a claim token from https://plex.tv/claim and input here. Keep in mind that the claim tokens expire within 4 minutes."} - + - {env_var: "PLEX_CLAIM", env_value: "", desc: "Optionally you can obtain a claim token from https://plex.tv/claim and input here. Keep in mind that the claim tokens expire within 4 minutes."} optional_parameters: | If you want to run the container in bridge network mode (instead of the recommended host network mode) you will need to specify ports. The [official documentation for ports](https://support.plex.tv/articles/201543147-what-network-ports-do-i-need-to-allow-through-my-firewall/) lists 32400 as the only required port. @@ -63,7 +57,6 @@ optional_parameters: | | :---: | --- | | `--device=/dev/dri:/dev/dri` | Add this option to your run command if you plan on using Quicksync hardware acceleration - see Application Setup section.| | `--device=/dev/dvb:/dev/dvb` | Add this option to your run command if you plan on using dvb devices.| - # application setup block app_setup_block_enabled: true app_setup_block: | @@ -83,9 +76,9 @@ app_setup_block: | + **`<specific-version>`**: will select a specific version (eg 0.9.12.4.1192-9a47d21) of plex to install, note you cannot use this to access plexpass versions if you do not have plexpass. ## Hardware Acceleration - + ### Intel - + Hardware acceleration users for Intel Quicksync will need to mount their /dev/dri video device inside of the container by passing the following command when running or creating the container: ``` @@ -95,52 +88,52 @@ app_setup_block: | We will automatically ensure the abc user inside of the container has the proper permissions to access this device. ### Nvidia - + Hardware acceleration users for Nvidia will need to install the container runtime provided by Nvidia on their host, instructions can be found here: https://github.com/NVIDIA/nvidia-docker - - We automatically add the necessary environment variable that will utilise all the features available on a GPU on the host. Once nvidia-docker is installed on your host you will need to re/create the docker container with the nvidia container runtime `--runtime=nvidia` and add an environment variable `-e NVIDIA_VISIBLE_DEVICES=all` (can also be set to a specific gpu's UUID, this can be discovered by running `nvidia-smi --query-gpu=gpu_name,gpu_uuid --format=csv` ). NVIDIA automatically mounts the GPU and drivers from your host into the plex docker. + We automatically add the necessary environment variable that will utilise all the features available on a GPU on the host. Once nvidia-docker is installed on your host you will need to re/create the docker container with the nvidia container runtime `--runtime=nvidia` and add an environment variable `-e NVIDIA_VISIBLE_DEVICES=all` (can also be set to a specific gpu's UUID, this can be discovered by running `nvidia-smi --query-gpu=gpu_name,gpu_uuid --format=csv` ). NVIDIA automatically mounts the GPU and drivers from your host into the plex docker. # changelog changelogs: - - { date: "16.10.22:", desc: "Rebase to jammy. Update to s6v3. Remove opencl packages (bundled with plex)." } - - { date: "18.07.22:", desc: "Pin all opencl related driver packages." } - - { date: "16.05.22:", desc: "Pin opencl version." } - - { date: "04.03.22:", desc: "Increase verbosity of video device permissions fix, attempt to fix missing group rw." } - - { date: "25.12.21:", desc: "Install Intel drivers from the official repo." } - - { date: "20.01.21:", desc: "Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information." } - - { date: "10.12.20:", desc: "Add latest Intel Compute packages from github repo for opencl support on latest gen igpu." } - - { date: "23.11.20:", desc: "Add Bionic branch make Focal default." } - - { date: "03.05.20:", desc: "Update exposed ports and example docs for bridge mode." } - - { date: "23.03.20:", desc: "Remove udev hack (no longer needed), suppress uuid error in log during first start." } - - { date: "04.12.19:", desc: "Add variable for setting PLEX_CLAIM. Remove `/transcode` volume mapping as it is now set via plex gui and defaults to a location under `/config`." } - - { date: "06.08.19:", desc: "Add variable for setting UMASK." } - - { date: "10.07.19:", desc: "Fix permissions for tuner (/dev/dvb) devices." } - - { date: "20.05.19:", desc: "Bugfix do not allow Root group for Intel QuickSync ownership rules." } - - { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." } - - { date: "22.03.19:", desc: "Fix update logic for `VERSION=public`." } - - { date: "14.03.19:", desc: "Switch to new api endpoints, enable beta (plex pass) updates for armhf and aarch64." } - - { date: "15.02.19:", desc: "Clean up plex pid after unclean stop." } - - { date: "11.02.19:", desc: "Fix nvidia variables, add device variables." } - - { date: "16.01.19:", desc: "Add pipeline logic, multi arch, and HW transcoding configuration; remove avahi service." } - - { date: "07.09.18:", desc: "Rebase to ubuntu bionic, add udev package." } - - { date: "09.12.17:", desc: "Fix continuation lines." } - - { date: "12.07.17:", desc: "Add inspect commands to README, move to jenkins build and push." } - - { date: "28.05.17:", desc: "Add unrar package as per requests, for subzero plugin." } - - { date: "11.01.17:", desc: "Use Plex environment variables from pms docker, change abc home folder to /app to alleviate usermod chowning library" } - - { date: "03.01.17:", desc: "Use case insensitive version variable matching rather than export and make lowercase." } - - { date: "17.10.16:", desc: "Allow use of uppercase version variable" } - - { date: "01.10.16:", desc: "Add TZ info to README." } - - { date: "09.09.16:", desc: "Add layer badges to README." } - - { date: "27.08.16:", desc: "Add badges to README." } - - { date: "22.08.16:", desc: "Rebased to xenial and s6 overlay" } - - { date: "07.04.16:", desc: "removed `/transcode` volume support (upstream Plex change) and modified PlexPass download method to prevent unauthorised usage of paid PMS" } - - { date: "24.09.15:", desc: "added optional support for volume transcoding (/transcode), and various typo fixes." } - - { date: "17.09.15:", desc: "Changed to run chmod only once" } - - { date: "19.09.15:", desc: "Plex updated their download servers from http to https" } - - { date: "28.08.15:", desc: "Removed plexpass from routine, and now uses VERSION as a combination fix." } - - { date: "18.07.15:", desc: "Moved autoupdate to be hosted by linuxserver.io and implemented bugfix thanks to ljm42." } - - { date: "09.07.15:", desc: "Now with ability to pick static version number." } - - { date: "08.07.15:", desc: "Now with autoupdates. (Hosted by fanart.tv)" } - - { date: "03.07.15:", desc: "Fixed a mistake that allowed plex to run as user plex rather than abc (99:100). Thanks to double16 for spotting this." } + - {date: "03.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"} + - {date: "16.10.22:", desc: "Rebase to jammy. Update to s6v3. Remove opencl packages (bundled with plex)."} + - {date: "18.07.22:", desc: "Pin all opencl related driver packages."} + - {date: "16.05.22:", desc: "Pin opencl version."} + - {date: "04.03.22:", desc: "Increase verbosity of video device permissions fix, attempt to fix missing group rw."} + - {date: "25.12.21:", desc: "Install Intel drivers from the official repo."} + - {date: "20.01.21:", desc: "Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information."} + - {date: "10.12.20:", desc: "Add latest Intel Compute packages from github repo for opencl support on latest gen igpu."} + - {date: "23.11.20:", desc: "Add Bionic branch make Focal default."} + - {date: "03.05.20:", desc: "Update exposed ports and example docs for bridge mode."} + - {date: "23.03.20:", desc: "Remove udev hack (no longer needed), suppress uuid error in log during first start."} + - {date: "04.12.19:", desc: "Add variable for setting PLEX_CLAIM. Remove `/transcode` volume mapping as it is now set via plex gui and defaults to a location under `/config`."} + - {date: "06.08.19:", desc: "Add variable for setting UMASK."} + - {date: "10.07.19:", desc: "Fix permissions for tuner (/dev/dvb) devices."} + - {date: "20.05.19:", desc: "Bugfix do not allow Root group for Intel QuickSync ownership rules."} + - {date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag."} + - {date: "22.03.19:", desc: "Fix update logic for `VERSION=public`."} + - {date: "14.03.19:", desc: "Switch to new api endpoints, enable beta (plex pass) updates for armhf and aarch64."} + - {date: "15.02.19:", desc: "Clean up plex pid after unclean stop."} + - {date: "11.02.19:", desc: "Fix nvidia variables, add device variables."} + - {date: "16.01.19:", desc: "Add pipeline logic, multi arch, and HW transcoding configuration; remove avahi service."} + - {date: "07.09.18:", desc: "Rebase to ubuntu bionic, add udev package."} + - {date: "09.12.17:", desc: "Fix continuation lines."} + - {date: "12.07.17:", desc: "Add inspect commands to README, move to jenkins build and push."} + - {date: "28.05.17:", desc: "Add unrar package as per requests, for subzero plugin."} + - {date: "11.01.17:", desc: "Use Plex environment variables from pms docker, change abc home folder to /app to alleviate usermod chowning library"} + - {date: "03.01.17:", desc: "Use case insensitive version variable matching rather than export and make lowercase."} + - {date: "17.10.16:", desc: "Allow use of uppercase version variable"} + - {date: "01.10.16:", desc: "Add TZ info to README."} + - {date: "09.09.16:", desc: "Add layer badges to README."} + - {date: "27.08.16:", desc: "Add badges to README."} + - {date: "22.08.16:", desc: "Rebased to xenial and s6 overlay"} + - {date: "07.04.16:", desc: "removed `/transcode` volume support (upstream Plex change) and modified PlexPass download method to prevent unauthorised usage of paid PMS"} + - {date: "24.09.15:", desc: "added optional support for volume transcoding (/transcode), and various typo fixes."} + - {date: "17.09.15:", desc: "Changed to run chmod only once"} + - {date: "19.09.15:", desc: "Plex updated their download servers from http to https"} + - {date: "28.08.15:", desc: "Removed plexpass from routine, and now uses VERSION as a combination fix."} + - {date: "18.07.15:", desc: "Moved autoupdate to be hosted by linuxserver.io and implemented bugfix thanks to ljm42."} + - {date: "09.07.15:", desc: "Now with ability to pick static version number."} + - {date: "08.07.15:", desc: "Now with autoupdates. (Hosted by fanart.tv)"} + - {date: "03.07.15:", desc: "Fixed a mistake that allowed plex to run as user plex rather than abc (99:100). Thanks to double16 for spotting this."} From a48be5cabc571816e14f9bd55eee4e35e9932274 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 3 Jul 2023 09:26:03 +0000 Subject: [PATCH 337/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index d1d22e0..988eec4 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -46,7 +46,7 @@ libbz2-1.0 1.0.8-5build1 deb libc-bin 2.35-0ubuntu3.1 deb libc6 2.35-0ubuntu3.1 deb libcap-ng0 0.7.9-2.2build3 deb -libcap2 1:2.44-1build3 deb +libcap2 1:2.44-1ubuntu0.22.04.1 deb libcom-err2 1.46.5-2ubuntu1.1 deb libcrypt1 1:4.4.27-1 deb libcurl4 7.81.0-1ubuntu1.10 deb From 8cc170bdff2e4f232f1176625ee5aaa6f91b35af Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Wed, 19 Jul 2023 21:23:14 +0000 Subject: [PATCH 338/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 988eec4..be68823 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -131,7 +131,7 @@ openssl 3.0.2-0ubuntu1.10 deb passwd 1:4.8.1-2ubuntu2.1 deb perl-base 5.34.0-3ubuntu1.2 deb pinentry-curses 1.1.1-1build2 deb -plexmediaserver 1.32.4.7195-7c8f9d3b6 deb +plexmediaserver 1.32.5.7328-2632c9d3a deb procps 2:3.3.17-6ubuntu2 deb publicsuffix 20211207.1025-1 deb readline-common 8.1.2-1 deb From 876dbabe4ac1bb7bb86b10862abe7b8e0d9f9e7c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 25 Jul 2023 15:27:21 +0000 Subject: [PATCH 339/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index be68823..2e5d25b 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -131,7 +131,7 @@ openssl 3.0.2-0ubuntu1.10 deb passwd 1:4.8.1-2ubuntu2.1 deb perl-base 5.34.0-3ubuntu1.2 deb pinentry-curses 1.1.1-1build2 deb -plexmediaserver 1.32.5.7328-2632c9d3a deb +plexmediaserver 1.32.5.7349-8f4248874 deb procps 2:3.3.17-6ubuntu2 deb publicsuffix 20211207.1025-1 deb readline-common 8.1.2-1 deb From cea59c18cc156e8c1caeb7fd1e8acbbd5e8c86b0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 31 Jul 2023 09:18:12 +0000 Subject: [PATCH 340/514] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 2e5d25b..c0e79c2 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -8,7 +8,7 @@ bash 5.1-6ubuntu1 deb bsdutils 1:2.37.2-4ubuntu3 deb ca-certificates 20230311ubuntu0.22.04.1 deb coreutils 8.32-4.1ubuntu1 deb -curl 7.81.0-1ubuntu1.10 deb +curl 7.81.0-1ubuntu1.13 deb dash 0.5.11+git20210903+057cd650a4ed-3build1 deb debconf 1.5.79ubuntu1 deb debianutils 5.5-1ubuntu2 deb @@ -49,7 +49,7 @@ libcap-ng0 0.7.9-2.2build3 deb libcap2 1:2.44-1ubuntu0.22.04.1 deb libcom-err2 1.46.5-2ubuntu1.1 deb libcrypt1 1:4.4.27-1 deb -libcurl4 7.81.0-1ubuntu1.10 deb +libcurl4 7.81.0-1ubuntu1.13 deb libdb5.3 5.3.28+dfsg1-0.8ubuntu3 deb libdebconfclient0 0.261ubuntu1 deb libext2fs2 1.46.5-2ubuntu1.1 deb From d89236ed2f50983a5011c3cf2b5c3bed8f177c60 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 7 Aug 2023 09:17:31 +0000 Subject: [PATCH 341/514] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index c0e79c2..61a8cca 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -69,8 +69,8 @@ libkmod2 29-1ubuntu1 deb libkrb5-3 1.19.2-2ubuntu0.2 deb libkrb5support0 1.19.2-2ubuntu0.2 deb libksba8 1.6.0-2ubuntu0.2 deb -libldap-2.5-0 2.5.14+dfsg-0ubuntu0.22.04.2 deb -libldap-common 2.5.14+dfsg-0ubuntu0.22.04.2 deb +libldap-2.5-0 2.5.15+dfsg-0ubuntu0.22.04.1 deb +libldap-common 2.5.15+dfsg-0ubuntu0.22.04.1 deb liblz4-1 1.9.3-2build2 deb liblzma5 5.2.5-2ubuntu1 deb libmd0 1.0.4-1build1 deb From 9666b13f11909e9a7abc389c0b8ce5ca6fa7882d Mon Sep 17 00:00:00 2001 From: aptalca <541623+aptalca@users.noreply.github.com> Date: Wed, 16 Aug 2023 12:01:22 -0400 Subject: [PATCH 342/514] install unrar from linuxserver repo remove obsolete port --- Dockerfile | 10 ++++++++-- Dockerfile.aarch64 | 9 ++++++++- README.md | 1 + readme-vars.yml | 2 +- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 26a889b..36ef5db 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,7 @@ +# syntax=docker/dockerfile:1 + +FROM ghcr.io/linuxserver/unrar:latest as unrar + FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy # set version label @@ -27,7 +31,6 @@ RUN \ apt-get install -y \ jq \ udev \ - unrar \ wget && \ echo "**** install plex ****" && \ if [ -z ${PLEX_RELEASE+x} ]; then \ @@ -51,6 +54,9 @@ RUN \ # add local files COPY root/ / +# add unrar +COPY --from=unrar /usr/bin/unrar-ubuntu /usr/bin/unrar + # ports and volumes -EXPOSE 32400/tcp 1900/udp 3005/tcp 5353/udp 8324/tcp 32410/udp 32412/udp 32413/udp 32414/udp 32469/tcp +EXPOSE 32400/tcp 1900/udp 5353/udp 8324/tcp 32410/udp 32412/udp 32413/udp 32414/udp 32469/tcp VOLUME /config diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index a005fdd..3492c98 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,3 +1,7 @@ +# syntax=docker/dockerfile:1 + +FROM ghcr.io/linuxserver/unrar:arm64v8-latest as unrar + FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy # set version label @@ -48,6 +52,9 @@ RUN \ # add local files COPY root/ / +# add unrar +COPY --from=unrar /usr/bin/unrar-ubuntu /usr/bin/unrar + # ports and volumes -EXPOSE 32400/tcp 1900/udp 3005/tcp 5353/udp 8324/tcp 32410/udp 32412/udp 32413/udp 32414/udp 32469/tcp +EXPOSE 32400/tcp 1900/udp 5353/udp 8324/tcp 32410/udp 32412/udp 32413/udp 32414/udp 32469/tcp VOLUME /config diff --git a/README.md b/README.md index 8317bba..0160392 100644 --- a/README.md +++ b/README.md @@ -294,6 +294,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **16.08.23:** - Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar). * **03.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf) * **16.10.22:** - Rebase to jammy. Update to s6v3. Remove opencl packages (bundled with plex). * **18.07.22:** - Pin all opencl related driver packages. diff --git a/readme-vars.yml b/readme-vars.yml index cbd92c4..e687267 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -40,7 +40,6 @@ optional_parameters: | ``` -p 32400:32400 \ -p 1900:1900/udp \ - -p 3005:3005 \ -p 5353:5353/udp \ -p 8324:8324 \ -p 32410:32410/udp \ @@ -96,6 +95,7 @@ app_setup_block: | We automatically add the necessary environment variable that will utilise all the features available on a GPU on the host. Once nvidia-docker is installed on your host you will need to re/create the docker container with the nvidia container runtime `--runtime=nvidia` and add an environment variable `-e NVIDIA_VISIBLE_DEVICES=all` (can also be set to a specific gpu's UUID, this can be discovered by running `nvidia-smi --query-gpu=gpu_name,gpu_uuid --format=csv` ). NVIDIA automatically mounts the GPU and drivers from your host into the plex docker. # changelog changelogs: + - {date: "16.08.23:", desc: "Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar)."} - {date: "03.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"} - {date: "16.10.22:", desc: "Rebase to jammy. Update to s6v3. Remove opencl packages (bundled with plex)."} - {date: "18.07.22:", desc: "Pin all opencl related driver packages."} From c824daa6a2bbebd3cfb799ec4e26eb0b39c5af97 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 18 Aug 2023 20:34:45 +0000 Subject: [PATCH 343/514] Bot Updating Templated Files --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 0160392..5a4999c 100644 --- a/README.md +++ b/README.md @@ -184,7 +184,6 @@ If you have not already claimed your server (first time setup) you need to set ` ``` -p 32400:32400 \ -p 1900:1900/udp \ - -p 3005:3005 \ -p 5353:5353/udp \ -p 8324:8324 \ -p 32410:32410/udp \ From 888f26c8e6d7b58795786fce4d2aac4ae9ee7025 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 18 Aug 2023 20:38:40 +0000 Subject: [PATCH 344/514] Bot Updating Package Versions --- package_versions.txt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 61a8cca..a4e985c 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,7 +1,7 @@ NAME VERSION TYPE adduser 3.118ubuntu5 deb -apt 2.4.9 deb -apt-utils 2.4.9 deb +apt 2.4.10 deb +apt-utils 2.4.10 deb base-files 12ubuntu4.3 deb base-passwd 3.5.52build1 deb bash 5.1-6ubuntu1 deb @@ -34,7 +34,7 @@ hostname 3.23ubuntu2 deb init-system-helpers 1.62 deb jq 1.6-2.1ubuntu3 deb libacl1 2.3.1-1 deb -libapt-pkg6.0 2.4.9 deb +libapt-pkg6.0 2.4.10 deb libassuan0 2.5.5-1build1 deb libattr1 1:2.5.1-1build1 deb libaudit-common 1:3.0.7-1build1 deb @@ -69,8 +69,8 @@ libkmod2 29-1ubuntu1 deb libkrb5-3 1.19.2-2ubuntu0.2 deb libkrb5support0 1.19.2-2ubuntu0.2 deb libksba8 1.6.0-2ubuntu0.2 deb -libldap-2.5-0 2.5.15+dfsg-0ubuntu0.22.04.1 deb -libldap-common 2.5.15+dfsg-0ubuntu0.22.04.1 deb +libldap-2.5-0 2.5.16+dfsg-0ubuntu0.22.04.1 deb +libldap-common 2.5.16+dfsg-0ubuntu0.22.04.1 deb liblz4-1 1.9.3-2build2 deb liblzma5 5.2.5-2ubuntu1 deb libmd0 1.0.4-1build1 deb @@ -143,7 +143,6 @@ tar 1.34+dfsg-1ubuntu0.1.22.04.1 deb tzdata 2023c-0ubuntu0.22.04.2 deb ubuntu-keyring 2021.03.26 deb udev 249.11-0ubuntu3.9 deb -unrar 1:6.1.5-1 deb usrmerge 25ubuntu2 deb util-linux 2.37.2-4ubuntu3 deb wget 1.21.2-2ubuntu1 deb From a8f529c0e2d3e9548c583d0da41eb9cf69779d0c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 28 Aug 2023 09:19:33 +0000 Subject: [PATCH 345/514] Bot Updating Package Versions --- package_versions.txt | 299 ++++++++++++++++++++++--------------------- 1 file changed, 150 insertions(+), 149 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index a4e985c..c78cdd9 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,149 +1,150 @@ -NAME VERSION TYPE -adduser 3.118ubuntu5 deb -apt 2.4.10 deb -apt-utils 2.4.10 deb -base-files 12ubuntu4.3 deb -base-passwd 3.5.52build1 deb -bash 5.1-6ubuntu1 deb -bsdutils 1:2.37.2-4ubuntu3 deb -ca-certificates 20230311ubuntu0.22.04.1 deb -coreutils 8.32-4.1ubuntu1 deb -curl 7.81.0-1ubuntu1.13 deb -dash 0.5.11+git20210903+057cd650a4ed-3build1 deb -debconf 1.5.79ubuntu1 deb -debianutils 5.5-1ubuntu2 deb -diffutils 1:3.8-0ubuntu2 deb -dirmngr 2.2.27-3ubuntu2.1 deb -dpkg 1.21.1ubuntu2.2 deb -e2fsprogs 1.46.5-2ubuntu1.1 deb -findutils 4.8.0-1ubuntu3 deb -gcc-12-base 12.1.0-2ubuntu1~22.04 deb -gnupg 2.2.27-3ubuntu2.1 deb -gnupg-l10n 2.2.27-3ubuntu2.1 deb -gnupg-utils 2.2.27-3ubuntu2.1 deb -gpg 2.2.27-3ubuntu2.1 deb -gpg-agent 2.2.27-3ubuntu2.1 deb -gpg-wks-client 2.2.27-3ubuntu2.1 deb -gpg-wks-server 2.2.27-3ubuntu2.1 deb -gpgconf 2.2.27-3ubuntu2.1 deb -gpgsm 2.2.27-3ubuntu2.1 deb -gpgv 2.2.27-3ubuntu2.1 deb -grep 3.7-1build1 deb -gzip 1.10-4ubuntu4.1 deb -hostname 3.23ubuntu2 deb -init-system-helpers 1.62 deb -jq 1.6-2.1ubuntu3 deb -libacl1 2.3.1-1 deb -libapt-pkg6.0 2.4.10 deb -libassuan0 2.5.5-1build1 deb -libattr1 1:2.5.1-1build1 deb -libaudit-common 1:3.0.7-1build1 deb -libaudit1 1:3.0.7-1build1 deb -libblkid1 2.37.2-4ubuntu3 deb -libbrotli1 1.0.9-2build6 deb -libbsd0 0.11.5-1 deb -libbz2-1.0 1.0.8-5build1 deb -libc-bin 2.35-0ubuntu3.1 deb -libc6 2.35-0ubuntu3.1 deb -libcap-ng0 0.7.9-2.2build3 deb -libcap2 1:2.44-1ubuntu0.22.04.1 deb -libcom-err2 1.46.5-2ubuntu1.1 deb -libcrypt1 1:4.4.27-1 deb -libcurl4 7.81.0-1ubuntu1.13 deb -libdb5.3 5.3.28+dfsg1-0.8ubuntu3 deb -libdebconfclient0 0.261ubuntu1 deb -libext2fs2 1.46.5-2ubuntu1.1 deb -libffi8 3.4.2-4 deb -libgcc-s1 12.1.0-2ubuntu1~22.04 deb -libgcrypt20 1.9.4-3ubuntu3 deb -libgmp10 2:6.2.1+dfsg-3ubuntu1 deb -libgnutls30 3.7.3-4ubuntu1.2 deb -libgpg-error0 1.43-3 deb -libgssapi-krb5-2 1.19.2-2ubuntu0.2 deb -libhogweed6 3.7.3-1build2 deb -libidn2-0 2.3.2-2build1 deb -libjq1 1.6-2.1ubuntu3 deb -libk5crypto3 1.19.2-2ubuntu0.2 deb -libkeyutils1 1.6.1-2ubuntu3 deb -libkmod2 29-1ubuntu1 deb -libkrb5-3 1.19.2-2ubuntu0.2 deb -libkrb5support0 1.19.2-2ubuntu0.2 deb -libksba8 1.6.0-2ubuntu0.2 deb -libldap-2.5-0 2.5.16+dfsg-0ubuntu0.22.04.1 deb -libldap-common 2.5.16+dfsg-0ubuntu0.22.04.1 deb -liblz4-1 1.9.3-2build2 deb -liblzma5 5.2.5-2ubuntu1 deb -libmd0 1.0.4-1build1 deb -libmount1 2.37.2-4ubuntu3 deb -libncurses6 6.3-2ubuntu0.1 deb -libncursesw6 6.3-2ubuntu0.1 deb -libnettle8 3.7.3-1build2 deb -libnghttp2-14 1.43.0-1build3 deb -libnpth0 1.6-3build2 deb -libnsl2 1.3.0-2build2 deb -libonig5 6.9.7.1-2build1 deb -libp11-kit0 0.24.0-6build1 deb -libpam-modules 1.4.0-11ubuntu2.3 deb -libpam-modules-bin 1.4.0-11ubuntu2.3 deb -libpam-runtime 1.4.0-11ubuntu2.3 deb -libpam0g 1.4.0-11ubuntu2.3 deb -libpcre2-8-0 10.39-3ubuntu0.1 deb -libpcre3 2:8.39-13ubuntu0.22.04.1 deb -libprocps8 2:3.3.17-6ubuntu2 deb -libpsl5 0.21.0-1.2build2 deb -libreadline8 8.1.2-1 deb -librtmp1 2.4+20151223.gitfa8646d.1-2build4 deb -libsasl2-2 2.1.27+dfsg2-3ubuntu1.2 deb -libsasl2-modules 2.1.27+dfsg2-3ubuntu1.2 deb -libsasl2-modules-db 2.1.27+dfsg2-3ubuntu1.2 deb -libseccomp2 2.5.3-2ubuntu2 deb -libselinux1 3.3-1build2 deb -libsemanage-common 3.3-1build2 deb -libsemanage2 3.3-1build2 deb -libsepol2 3.3-1build1 deb -libsmartcols1 2.37.2-4ubuntu3 deb -libsqlite3-0 3.37.2-2ubuntu0.1 deb -libss2 1.46.5-2ubuntu1.1 deb -libssh-4 0.9.6-2ubuntu0.22.04.1 deb -libssl3 3.0.2-0ubuntu1.10 deb -libstdc++6 12.1.0-2ubuntu1~22.04 deb -libsystemd0 249.11-0ubuntu3.9 deb -libtasn1-6 4.18.0-4build1 deb -libtinfo6 6.3-2ubuntu0.1 deb -libtirpc-common 1.3.2-2ubuntu0.1 deb -libtirpc3 1.3.2-2ubuntu0.1 deb -libudev1 249.11-0ubuntu3.9 deb -libunistring2 1.0-1 deb -libuuid1 2.37.2-4ubuntu3 deb -libxxhash0 0.8.1-1 deb -libzstd1 1.4.8+dfsg-3build1 deb -locales 2.35-0ubuntu3.1 deb -login 1:4.8.1-2ubuntu2.1 deb -logsave 1.46.5-2ubuntu1.1 deb -lsb-base 11.1.0ubuntu4 deb -mawk 1.3.4.20200120-3 deb -mount 2.37.2-4ubuntu3 deb -ncurses-base 6.3-2ubuntu0.1 deb -ncurses-bin 6.3-2ubuntu0.1 deb -netcat 1.218-4ubuntu1 deb -netcat-openbsd 1.218-4ubuntu1 deb -openssl 3.0.2-0ubuntu1.10 deb -passwd 1:4.8.1-2ubuntu2.1 deb -perl-base 5.34.0-3ubuntu1.2 deb -pinentry-curses 1.1.1-1build2 deb -plexmediaserver 1.32.5.7349-8f4248874 deb -procps 2:3.3.17-6ubuntu2 deb -publicsuffix 20211207.1025-1 deb -readline-common 8.1.2-1 deb -sed 4.8-1ubuntu2 deb -sensible-utils 0.0.17 deb -systemd-hwe-hwdb 249.11.3 deb -sysvinit-utils 3.01-1ubuntu1 deb -tar 1.34+dfsg-1ubuntu0.1.22.04.1 deb -tzdata 2023c-0ubuntu0.22.04.2 deb -ubuntu-keyring 2021.03.26 deb -udev 249.11-0ubuntu3.9 deb -usrmerge 25ubuntu2 deb -util-linux 2.37.2-4ubuntu3 deb -wget 1.21.2-2ubuntu1 deb -zlib1g 1:1.2.11.dfsg-2ubuntu9.2 deb +NAME VERSION TYPE +adduser 3.118ubuntu5 deb +apt 2.4.10 deb +apt-utils 2.4.10 deb +base-files 12ubuntu4.3 deb +base-passwd 3.5.52build1 deb +bash 5.1-6ubuntu1 deb +bash 5.1.16 binary +bsdutils 1:2.37.2-4ubuntu3 deb +ca-certificates 20230311ubuntu0.22.04.1 deb +coreutils 8.32-4.1ubuntu1 deb +curl 7.81.0-1ubuntu1.13 deb +dash 0.5.11+git20210903+057cd650a4ed-3build1 deb +debconf 1.5.79ubuntu1 deb +debianutils 5.5-1ubuntu2 deb +diffutils 1:3.8-0ubuntu2 deb +dirmngr 2.2.27-3ubuntu2.1 deb +dpkg 1.21.1ubuntu2.2 deb +e2fsprogs 1.46.5-2ubuntu1.1 deb +findutils 4.8.0-1ubuntu3 deb +gcc-12-base 12.1.0-2ubuntu1~22.04 deb +gnupg 2.2.27-3ubuntu2.1 deb +gnupg-l10n 2.2.27-3ubuntu2.1 deb +gnupg-utils 2.2.27-3ubuntu2.1 deb +gpg 2.2.27-3ubuntu2.1 deb +gpg-agent 2.2.27-3ubuntu2.1 deb +gpg-wks-client 2.2.27-3ubuntu2.1 deb +gpg-wks-server 2.2.27-3ubuntu2.1 deb +gpgconf 2.2.27-3ubuntu2.1 deb +gpgsm 2.2.27-3ubuntu2.1 deb +gpgv 2.2.27-3ubuntu2.1 deb +grep 3.7-1build1 deb +gzip 1.10-4ubuntu4.1 deb +hostname 3.23ubuntu2 deb +init-system-helpers 1.62 deb +jq 1.6-2.1ubuntu3 deb +libacl1 2.3.1-1 deb +libapt-pkg6.0 2.4.10 deb +libassuan0 2.5.5-1build1 deb +libattr1 1:2.5.1-1build1 deb +libaudit-common 1:3.0.7-1build1 deb +libaudit1 1:3.0.7-1build1 deb +libblkid1 2.37.2-4ubuntu3 deb +libbrotli1 1.0.9-2build6 deb +libbsd0 0.11.5-1 deb +libbz2-1.0 1.0.8-5build1 deb +libc-bin 2.35-0ubuntu3.1 deb +libc6 2.35-0ubuntu3.1 deb +libcap-ng0 0.7.9-2.2build3 deb +libcap2 1:2.44-1ubuntu0.22.04.1 deb +libcom-err2 1.46.5-2ubuntu1.1 deb +libcrypt1 1:4.4.27-1 deb +libcurl4 7.81.0-1ubuntu1.13 deb +libdb5.3 5.3.28+dfsg1-0.8ubuntu3 deb +libdebconfclient0 0.261ubuntu1 deb +libext2fs2 1.46.5-2ubuntu1.1 deb +libffi8 3.4.2-4 deb +libgcc-s1 12.1.0-2ubuntu1~22.04 deb +libgcrypt20 1.9.4-3ubuntu3 deb +libgmp10 2:6.2.1+dfsg-3ubuntu1 deb +libgnutls30 3.7.3-4ubuntu1.2 deb +libgpg-error0 1.43-3 deb +libgssapi-krb5-2 1.19.2-2ubuntu0.2 deb +libhogweed6 3.7.3-1build2 deb +libidn2-0 2.3.2-2build1 deb +libjq1 1.6-2.1ubuntu3 deb +libk5crypto3 1.19.2-2ubuntu0.2 deb +libkeyutils1 1.6.1-2ubuntu3 deb +libkmod2 29-1ubuntu1 deb +libkrb5-3 1.19.2-2ubuntu0.2 deb +libkrb5support0 1.19.2-2ubuntu0.2 deb +libksba8 1.6.0-2ubuntu0.2 deb +libldap-2.5-0 2.5.16+dfsg-0ubuntu0.22.04.1 deb +libldap-common 2.5.16+dfsg-0ubuntu0.22.04.1 deb +liblz4-1 1.9.3-2build2 deb +liblzma5 5.2.5-2ubuntu1 deb +libmd0 1.0.4-1build1 deb +libmount1 2.37.2-4ubuntu3 deb +libncurses6 6.3-2ubuntu0.1 deb +libncursesw6 6.3-2ubuntu0.1 deb +libnettle8 3.7.3-1build2 deb +libnghttp2-14 1.43.0-1build3 deb +libnpth0 1.6-3build2 deb +libnsl2 1.3.0-2build2 deb +libonig5 6.9.7.1-2build1 deb +libp11-kit0 0.24.0-6build1 deb +libpam-modules 1.4.0-11ubuntu2.3 deb +libpam-modules-bin 1.4.0-11ubuntu2.3 deb +libpam-runtime 1.4.0-11ubuntu2.3 deb +libpam0g 1.4.0-11ubuntu2.3 deb +libpcre2-8-0 10.39-3ubuntu0.1 deb +libpcre3 2:8.39-13ubuntu0.22.04.1 deb +libprocps8 2:3.3.17-6ubuntu2 deb +libpsl5 0.21.0-1.2build2 deb +libreadline8 8.1.2-1 deb +librtmp1 2.4+20151223.gitfa8646d.1-2build4 deb +libsasl2-2 2.1.27+dfsg2-3ubuntu1.2 deb +libsasl2-modules 2.1.27+dfsg2-3ubuntu1.2 deb +libsasl2-modules-db 2.1.27+dfsg2-3ubuntu1.2 deb +libseccomp2 2.5.3-2ubuntu2 deb +libselinux1 3.3-1build2 deb +libsemanage-common 3.3-1build2 deb +libsemanage2 3.3-1build2 deb +libsepol2 3.3-1build1 deb +libsmartcols1 2.37.2-4ubuntu3 deb +libsqlite3-0 3.37.2-2ubuntu0.1 deb +libss2 1.46.5-2ubuntu1.1 deb +libssh-4 0.9.6-2ubuntu0.22.04.1 deb +libssl3 3.0.2-0ubuntu1.10 deb +libstdc++6 12.1.0-2ubuntu1~22.04 deb +libsystemd0 249.11-0ubuntu3.9 deb +libtasn1-6 4.18.0-4build1 deb +libtinfo6 6.3-2ubuntu0.1 deb +libtirpc-common 1.3.2-2ubuntu0.1 deb +libtirpc3 1.3.2-2ubuntu0.1 deb +libudev1 249.11-0ubuntu3.9 deb +libunistring2 1.0-1 deb +libuuid1 2.37.2-4ubuntu3 deb +libxxhash0 0.8.1-1 deb +libzstd1 1.4.8+dfsg-3build1 deb +locales 2.35-0ubuntu3.1 deb +login 1:4.8.1-2ubuntu2.1 deb +logsave 1.46.5-2ubuntu1.1 deb +lsb-base 11.1.0ubuntu4 deb +mawk 1.3.4.20200120-3 deb +mount 2.37.2-4ubuntu3 deb +ncurses-base 6.3-2ubuntu0.1 deb +ncurses-bin 6.3-2ubuntu0.1 deb +netcat 1.218-4ubuntu1 deb +netcat-openbsd 1.218-4ubuntu1 deb +openssl 3.0.2-0ubuntu1.10 deb +passwd 1:4.8.1-2ubuntu2.1 deb +perl-base 5.34.0-3ubuntu1.2 deb +pinentry-curses 1.1.1-1build2 deb +plexmediaserver 1.32.5.7349-8f4248874 deb +procps 2:3.3.17-6ubuntu2 deb +publicsuffix 20211207.1025-1 deb +readline-common 8.1.2-1 deb +sed 4.8-1ubuntu2 deb +sensible-utils 0.0.17 deb +systemd-hwe-hwdb 249.11.3 deb +sysvinit-utils 3.01-1ubuntu1 deb +tar 1.34+dfsg-1ubuntu0.1.22.04.1 deb +tzdata 2023c-0ubuntu0.22.04.2 deb +ubuntu-keyring 2021.03.26 deb +udev 249.11-0ubuntu3.9 deb +usrmerge 25ubuntu2 deb +util-linux 2.37.2-4ubuntu3 deb +wget 1.21.2-2ubuntu1 deb +zlib1g 1:1.2.11.dfsg-2ubuntu9.2 deb From 2921a3e2a0067bb784cc08cf6f24a4a476c7f233 Mon Sep 17 00:00:00 2001 From: TheSpad <git@spad.co.uk> Date: Mon, 4 Sep 2023 20:23:00 +0100 Subject: [PATCH 346/514] Clearly log failed update if remote version can't be fetched --- root/etc/s6-overlay/s6-rc.d/init-plex-update/run | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-update/run b/root/etc/s6-overlay/s6-rc.d/init-plex-update/run index 6e0cf63..c22df28 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-plex-update/run +++ b/root/etc/s6-overlay/s6-rc.d/init-plex-update/run @@ -100,7 +100,7 @@ if [[ "${VERSION,,}" = latest ]] || [[ "${VERSION,,}" = plexpass ]] || [[ "$PLEX fi REMOTE_VERSION=$(curl -s "https://plex.tv/downloads/details/5?distro=debian&build=linux-${PLEX_URL_ARCH}&channel=8&X-Plex-Token=$PLEX_TOKEN"| grep -oP 'version="\K[^"]+' | tail -n 1 ) elif [[ "${VERSION,,}" = public ]]; then - REMOTE_VERSION=$(curl -sX GET 'https://plex.tv/api/downloads/5.json' | jq -r '.computer.Linux.version') + REMOTE_VERSION=$(curl -s 'https://plex.tv/api/downloads/5.json' | jq -r '.computer.Linux.version') else REMOTE_VERSION="${VERSION}" fi @@ -110,6 +110,11 @@ if [[ "$REMOTE_VERSION" == "$INSTALLED_VERSION" ]]; then exit 0 fi +if [[ -z "${REMOTE_VERSION}" ]]; then + echo "*** Unable to fetch version from Plex remote endpoint, please check your network configuration ***" + exit 0 +fi + echo "Atempting to upgrade to: $REMOTE_VERSION" rm -f /tmp/plexmediaserver_*.deb wget -nv -P /tmp \ From b804392aaa9823d428665888fffd6bd15c08b916 Mon Sep 17 00:00:00 2001 From: TheSpad <git@spad.co.uk> Date: Mon, 4 Sep 2023 20:26:16 +0100 Subject: [PATCH 347/514] Clarify --- root/etc/s6-overlay/s6-rc.d/init-plex-update/run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-update/run b/root/etc/s6-overlay/s6-rc.d/init-plex-update/run index c22df28..6f1751d 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-plex-update/run +++ b/root/etc/s6-overlay/s6-rc.d/init-plex-update/run @@ -111,7 +111,7 @@ if [[ "$REMOTE_VERSION" == "$INSTALLED_VERSION" ]]; then fi if [[ -z "${REMOTE_VERSION}" ]]; then - echo "*** Unable to fetch version from Plex remote endpoint, please check your network configuration ***" + echo "*** Unable to fetch version from Plex remote endpoint or empty VERSION supplied, please check your configuration ***" exit 0 fi From 46ae41bbd6a27b0529c0cdd666197ad17ff0db79 Mon Sep 17 00:00:00 2001 From: driz <40674481+drizuid@users.noreply.github.com> Date: Wed, 13 Sep 2023 16:17:01 -0400 Subject: [PATCH 348/514] Update run --- root/etc/s6-overlay/s6-rc.d/init-plex-update/run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-update/run b/root/etc/s6-overlay/s6-rc.d/init-plex-update/run index 6f1751d..6e2b65b 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-plex-update/run +++ b/root/etc/s6-overlay/s6-rc.d/init-plex-update/run @@ -58,7 +58,7 @@ NOTOKEN_SET='/tmp/no-token.nfo' cat > "${NOTOKEN_SET}" <<-EOFTOKEN ##################################################### # Login via the webui at http://<ip>:32400/web # -# and restart the docker, because there was no # +# and restart the container, because there was no # EOFTOKEN # if preferences files doesn't exist, exit out From fe44c3183310cf803eed8ff7b5cc289284ab62db Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 14 Sep 2023 15:27:00 +0000 Subject: [PATCH 349/514] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index c78cdd9..5cf4691 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -118,7 +118,7 @@ libunistring2 1.0-1 deb libuuid1 2.37.2-4ubuntu3 deb libxxhash0 0.8.1-1 deb libzstd1 1.4.8+dfsg-3build1 deb -locales 2.35-0ubuntu3.1 deb +locales 2.35-0ubuntu3.3 deb login 1:4.8.1-2ubuntu2.1 deb logsave 1.46.5-2ubuntu1.1 deb lsb-base 11.1.0ubuntu4 deb @@ -132,7 +132,7 @@ openssl 3.0.2-0ubuntu1.10 deb passwd 1:4.8.1-2ubuntu2.1 deb perl-base 5.34.0-3ubuntu1.2 deb pinentry-curses 1.1.1-1build2 deb -plexmediaserver 1.32.5.7349-8f4248874 deb +plexmediaserver 1.32.6.7468-07e0d4a7e deb procps 2:3.3.17-6ubuntu2 deb publicsuffix 20211207.1025-1 deb readline-common 8.1.2-1 deb From 244701df4f8ec8bea7d418919963541c853e3aa5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 15 Sep 2023 17:28:49 +0000 Subject: [PATCH 350/514] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 5cf4691..510488e 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -113,7 +113,7 @@ libtasn1-6 4.18.0-4build1 deb libtinfo6 6.3-2ubuntu0.1 deb libtirpc-common 1.3.2-2ubuntu0.1 deb libtirpc3 1.3.2-2ubuntu0.1 deb -libudev1 249.11-0ubuntu3.9 deb +libudev1 249.11-0ubuntu3.10 deb libunistring2 1.0-1 deb libuuid1 2.37.2-4ubuntu3 deb libxxhash0 0.8.1-1 deb @@ -132,7 +132,7 @@ openssl 3.0.2-0ubuntu1.10 deb passwd 1:4.8.1-2ubuntu2.1 deb perl-base 5.34.0-3ubuntu1.2 deb pinentry-curses 1.1.1-1build2 deb -plexmediaserver 1.32.6.7468-07e0d4a7e deb +plexmediaserver 1.32.5.7349-8f4248874 deb procps 2:3.3.17-6ubuntu2 deb publicsuffix 20211207.1025-1 deb readline-common 8.1.2-1 deb @@ -143,7 +143,7 @@ sysvinit-utils 3.01-1ubuntu1 deb tar 1.34+dfsg-1ubuntu0.1.22.04.1 deb tzdata 2023c-0ubuntu0.22.04.2 deb ubuntu-keyring 2021.03.26 deb -udev 249.11-0ubuntu3.9 deb +udev 249.11-0ubuntu3.10 deb usrmerge 25ubuntu2 deb util-linux 2.37.2-4ubuntu3 deb wget 1.21.2-2ubuntu1 deb From 5e13d72c1a9db59d3ee483cd5c17c71445f60671 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 18 Sep 2023 16:34:54 +0000 Subject: [PATCH 351/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 510488e..67c2913 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -132,7 +132,7 @@ openssl 3.0.2-0ubuntu1.10 deb passwd 1:4.8.1-2ubuntu2.1 deb perl-base 5.34.0-3ubuntu1.2 deb pinentry-curses 1.1.1-1build2 deb -plexmediaserver 1.32.5.7349-8f4248874 deb +plexmediaserver 1.32.5.7516-8f4248874 deb procps 2:3.3.17-6ubuntu2 deb publicsuffix 20211207.1025-1 deb readline-common 8.1.2-1 deb From da744ed2e99e9b14d12d93c8652c0e18835b5198 Mon Sep 17 00:00:00 2001 From: Gregory Weibell <13382354+weibell@users.noreply.github.com> Date: Mon, 18 Sep 2023 18:41:43 +0200 Subject: [PATCH 352/514] Remove stray text in description --- Jenkinsfile | 6 +++--- README.md | 2 +- readme-vars.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 32c9ee5..ce9c9f6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -482,7 +482,7 @@ pipeline { --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \ --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ --label \"org.opencontainers.image.title=Plex\" \ - --label \"org.opencontainers.image.description=[Plex](https://plex.tv) organizes video, music and photos from personal media libraries and streams them to smart TVs, streaming boxes and mobile devices. This container is packaged as a standalone Plex Media Server. has always been a top priority. Straightforward design and bulk actions mean getting things done faster.\" \ + --label \"org.opencontainers.image.description=[Plex](https://plex.tv) organizes video, music and photos from personal media libraries and streams them to smart TVs, streaming boxes and mobile devices. This container is packaged as a standalone Plex Media Server. Straightforward design and bulk actions mean getting things done faster.\" \ --no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." } @@ -513,7 +513,7 @@ pipeline { --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \ --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ --label \"org.opencontainers.image.title=Plex\" \ - --label \"org.opencontainers.image.description=[Plex](https://plex.tv) organizes video, music and photos from personal media libraries and streams them to smart TVs, streaming boxes and mobile devices. This container is packaged as a standalone Plex Media Server. has always been a top priority. Straightforward design and bulk actions mean getting things done faster.\" \ + --label \"org.opencontainers.image.description=[Plex](https://plex.tv) organizes video, music and photos from personal media libraries and streams them to smart TVs, streaming boxes and mobile devices. This container is packaged as a standalone Plex Media Server. Straightforward design and bulk actions mean getting things done faster.\" \ --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." } @@ -541,7 +541,7 @@ pipeline { --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \ --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ --label \"org.opencontainers.image.title=Plex\" \ - --label \"org.opencontainers.image.description=[Plex](https://plex.tv) organizes video, music and photos from personal media libraries and streams them to smart TVs, streaming boxes and mobile devices. This container is packaged as a standalone Plex Media Server. has always been a top priority. Straightforward design and bulk actions mean getting things done faster.\" \ + --label \"org.opencontainers.image.description=[Plex](https://plex.tv) organizes video, music and photos from personal media libraries and streams them to smart TVs, streaming boxes and mobile devices. This container is packaged as a standalone Plex Media Server. Straightforward design and bulk actions mean getting things done faster.\" \ --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" diff --git a/README.md b/README.md index 5a4999c..fc0f0ad 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ Find us at: [![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-plex%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-plex/job/master/) [![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Fci-tests.linuxserver.io%2Flinuxserver%2Fplex%2Flatest%2Fci-status.yml)](https://ci-tests.linuxserver.io/linuxserver/plex/latest/index.html) -[Plex](https://plex.tv) organizes video, music and photos from personal media libraries and streams them to smart TVs, streaming boxes and mobile devices. This container is packaged as a standalone Plex Media Server. has always been a top priority. Straightforward design and bulk actions mean getting things done faster. +[Plex](https://plex.tv) organizes video, music and photos from personal media libraries and streams them to smart TVs, streaming boxes and mobile devices. This container is packaged as a standalone Plex Media Server. Straightforward design and bulk actions mean getting things done faster. [![plex](http://the-gadgeteer.com/wp-content/uploads/2015/10/plex-logo-e1446990678679.png)](https://plex.tv) diff --git a/readme-vars.yml b/readme-vars.yml index e687267..1d11f38 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -4,7 +4,7 @@ project_name: plex project_url: "https://plex.tv" project_logo: "http://the-gadgeteer.com/wp-content/uploads/2015/10/plex-logo-e1446990678679.png" -project_blurb: "[{{ project_name|capitalize }}]({{ project_url }}) organizes video, music and photos from personal media libraries and streams them to smart TVs, streaming boxes and mobile devices. This container is packaged as a standalone Plex Media Server. has always been a top priority. Straightforward design and bulk actions mean getting things done faster." +project_blurb: "[{{ project_name|capitalize }}]({{ project_url }}) organizes video, music and photos from personal media libraries and streams them to smart TVs, streaming boxes and mobile devices. This container is packaged as a standalone Plex Media Server. Straightforward design and bulk actions mean getting things done faster." project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}" # supported architectures available_architectures: From 3955e8f00df46a1c07bdd292f9eca45375d3a98b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Wed, 27 Sep 2023 17:29:41 +0000 Subject: [PATCH 353/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 67c2913..5ad9033 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -132,7 +132,7 @@ openssl 3.0.2-0ubuntu1.10 deb passwd 1:4.8.1-2ubuntu2.1 deb perl-base 5.34.0-3ubuntu1.2 deb pinentry-curses 1.1.1-1build2 deb -plexmediaserver 1.32.5.7516-8f4248874 deb +plexmediaserver 1.32.6.7557-1cf77d501 deb procps 2:3.3.17-6ubuntu2 deb publicsuffix 20211207.1025-1 deb readline-common 8.1.2-1 deb From dea07237019307324018482044b54384defba0b5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 9 Oct 2023 09:18:24 +0000 Subject: [PATCH 354/514] Bot Updating Templated Files --- Jenkinsfile | 77 ++++++++++++++++++++++++++++------------------------- 1 file changed, 41 insertions(+), 36 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 32c9ee5..aa39e61 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,6 @@ pipeline { GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab') GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0') GITLAB_NAMESPACE=credentials('gitlab-namespace-id') - SCARF_TOKEN=credentials('scarf_api_key') JSON_URL = 'https://plex.tv/api/downloads/5.json' JSON_PATH = '.computer.Linux.version' BUILD_VERSION_ARG = 'PLEX_RELEASE' @@ -331,12 +330,12 @@ pipeline { else echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} fi - mkdir -p ${TEMPDIR}/gitbook - git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/gitbook/docker-documentation - if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/ - cd ${TEMPDIR}/gitbook/docker-documentation/ - git add images/docker-${CONTAINER_NAME}.md + mkdir -p ${TEMPDIR}/docs + git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation + if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/docs/docker-documentation/docs/images/ + cd ${TEMPDIR}/docs/docker-documentation + git add docs/images/docker-${CONTAINER_NAME}.md git commit -m 'Bot Updating Documentation' git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git --all fi @@ -427,35 +426,6 @@ pipeline { "visibility":"public"}' ''' } } - /* ####################### - Scarf.sh package registry - ####################### */ - // Add package to Scarf.sh and set permissions - stage("Scarf.sh package registry"){ - when { - branch "master" - environment name: 'EXIT_STATUS', value: '' - } - steps{ - sh '''#! /bin/bash - PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/organizations/linuxserver-ci/packages | jq -r '.[] | select(.name=="linuxserver/plex") | .uuid' || :) - if [ -z "${PACKAGE_UUID}" ]; then - echo "Adding package to Scarf.sh" - curl -sX POST https://scarf.sh/api/v1/organizations/linuxserver-ci/packages \ - -H "Authorization: Bearer ${SCARF_TOKEN}" \ - -H "Content-Type: application/json" \ - -d '{"name":"linuxserver/plex",\ - "shortDescription":"example description",\ - "libraryType":"docker",\ - "website":"https://github.com/linuxserver/docker-plex",\ - "backendUrl":"https://ghcr.io/linuxserver/plex",\ - "publicUrl":"https://lscr.io/linuxserver/plex"}' || : - else - echo "Package already exists on Scarf.sh" - fi - ''' - } - } /* ############### Build Container ############### */ @@ -851,6 +821,41 @@ pipeline { curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done''' } } + // Add protection to the release branch + stage('Github-Release-Branch-Protection') { + when { + branch "master" + environment name: 'CHANGE_ID', value: '' + environment name: 'EXIT_STATUS', value: '' + } + steps { + echo "Setting up protection for release branch master" + sh '''#! /bin/bash + curl -H "Authorization: token ${GITHUB_TOKEN}" -X PUT https://api.github.com/repos/${LS_USER}/${LS_REPO}/branches/master/protection \ + -d $(jq -c . << EOF + { + "required_status_checks": null, + "enforce_admins": false, + "required_pull_request_reviews": { + "dismiss_stale_reviews": false, + "require_code_owner_reviews": false, + "require_last_push_approval": false, + "required_approving_review_count": 1 + }, + "restrictions": null, + "required_linear_history": false, + "allow_force_pushes": false, + "allow_deletions": false, + "block_creations": false, + "required_conversation_resolution": true, + "lock_branch": false, + "allow_fork_syncing": false, + "required_signatures": false + } +EOF + ) ''' + } + } // Use helper container to sync the current README on master to the dockerhub endpoint stage('Sync-README') { when { From 61aa5ea7fa88410d688725e7b9c6c81d728e13c0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 9 Oct 2023 09:19:56 +0000 Subject: [PATCH 355/514] Bot Updating Templated Files --- README.md | 135 ++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 100 insertions(+), 35 deletions(-) diff --git a/README.md b/README.md index 5a4999c..7f627e3 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ -<!-- DO NOT EDIT THIS FILE MANUALLY --> -<!-- Please read the https://github.com/linuxserver/docker-plex/blob/master/.github/CONTRIBUTING.md --> - +<!-- DO NOT EDIT THIS FILE MANUALLY --> +<!-- Please read https://github.com/linuxserver/docker-plex/blob/master/.github/CONTRIBUTING.md --> [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io) [![Blog](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!") @@ -97,7 +96,7 @@ We automatically add the necessary environment variable that will utilise all th ## Usage -Here are some example snippets to help you get started creating a container. +To help you get started creating a container from this image you can either use docker-compose or the docker cli. ### docker-compose (recommended, [click here for more info](https://docs.linuxserver.io/general/docker-compose)) @@ -138,12 +137,11 @@ docker run -d \ -v /path/to/movies:/movies \ --restart unless-stopped \ lscr.io/linuxserver/plex:latest - ``` ## Parameters -Container images are configured using parameters passed at runtime (such as those above). These parameters are separated by a colon and indicate `<external>:<internal>` respectively. For example, `-p 8080:80` would expose port `80` from inside the container to be accessible from the host's IP on port `8080` outside the container. +Containers are configured using parameters passed at runtime (such as those above). These parameters are separated by a colon and indicate `<external>:<internal>` respectively. For example, `-p 8080:80` would expose port `80` from inside the container to be accessible from the host's IP on port `8080` outside the container. | Parameter | Function | | :----: | --- | @@ -164,10 +162,10 @@ You can set any environment variable from a file by using a special prepend `FIL As an example: ```bash --e FILE__PASSWORD=/run/secrets/mysecretpassword +-e FILE__MYVAR=/run/secrets/mysecretvariable ``` -Will set the environment variable `PASSWORD` based on the contents of the `/run/secrets/mysecretpassword` file. +Will set the environment variable `MYVAR` based on the contents of the `/run/secrets/mysecretvariable` file. ## Umask for running applications @@ -203,15 +201,20 @@ The application accepts a series of environment variables to further customize i ## User / Group Identifiers -When using volumes (`-v` flags) permissions issues can arise between the host OS and the container, we avoid this issue by allowing you to specify the user `PUID` and group `PGID`. +When using volumes (`-v` flags), permissions issues can arise between the host OS and the container, we avoid this issue by allowing you to specify the user `PUID` and group `PGID`. Ensure any volume directories on the host are owned by the same user you specify and any permissions issues will vanish like magic. -In this instance `PUID=1000` and `PGID=1000`, to find yours use `id user` as below: +In this instance `PUID=1000` and `PGID=1000`, to find yours use `id your_user` as below: ```bash - $ id username - uid=1000(dockeruser) gid=1000(dockergroup) groups=1000(dockergroup) +id your_user +``` + +Example output: + +```text +uid=1000(your_user) gid=1000(your_user) groups=1000(your_user) ``` ## Docker Mods @@ -222,12 +225,29 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to ## Support Info -* Shell access whilst the container is running: `docker exec -it plex /bin/bash` -* To monitor the logs of the container in realtime: `docker logs -f plex` -* container version number - * `docker inspect -f '{{ index .Config.Labels "build_version" }}' plex` -* image version number - * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/plex:latest` +* Shell access whilst the container is running: + + ```bash + docker exec -it plex /bin/bash + ``` + +* To monitor the logs of the container in realtime: + + ```bash + docker logs -f plex + ``` + +* Container version number: + + ```bash + docker inspect -f '{{ index .Config.Labels "build_version" }}' plex + ``` + +* Image version number: + + ```bash + docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/plex:latest + ``` ## Updating Info @@ -237,38 +257,83 @@ Below are the instructions for updating containers: ### Via Docker Compose -* Update all images: `docker-compose pull` - * or update a single image: `docker-compose pull plex` -* Let compose update all containers as necessary: `docker-compose up -d` - * or update a single container: `docker-compose up -d plex` -* You can also remove the old dangling images: `docker image prune` +* Update images: + * All images: + + ```bash + docker-compose pull + ``` + + * Single image: + + ```bash + docker-compose pull plex + ``` + +* Update containers: + * All containers: + + ```bash + docker-compose up -d + ``` + + * Single container: + + ```bash + docker-compose up -d plex + ``` + +* You can also remove the old dangling images: + + ```bash + docker image prune + ``` ### Via Docker Run -* Update the image: `docker pull lscr.io/linuxserver/plex:latest` -* Stop the running container: `docker stop plex` -* Delete the container: `docker rm plex` +* Update the image: + + ```bash + docker pull lscr.io/linuxserver/plex:latest + ``` + +* Stop the running container: + + ```bash + docker stop plex + ``` + +* Delete the container: + + ```bash + docker rm plex + ``` + * Recreate a new container with the same docker run parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved) -* You can also remove the old dangling images: `docker image prune` +* You can also remove the old dangling images: + + ```bash + docker image prune + ``` ### Via Watchtower auto-updater (only use if you don't remember the original parameters) * Pull the latest image at its tag and replace it with the same env variables in one run: - ```bash - docker run --rm \ - -v /var/run/docker.sock:/var/run/docker.sock \ - containrrr/watchtower \ - --run-once plex - ``` + ```bash + docker run --rm \ + -v /var/run/docker.sock:/var/run/docker.sock \ + containrrr/watchtower \ + --run-once plex + ``` * You can also remove the old dangling images: `docker image prune` -**Note:** We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using [Docker Compose](https://docs.linuxserver.io/general/docker-compose). +**warning**: We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using [Docker Compose](https://docs.linuxserver.io/general/docker-compose). ### Image Update Notifications - Diun (Docker Image Update Notifier) -* We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported. +**tip**: We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported. ## Building locally From 753a52efc20160347338e1ac17751d09495dc3e1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 9 Oct 2023 09:22:35 +0000 Subject: [PATCH 356/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 5ad9033..3fd4d5f 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -118,7 +118,7 @@ libunistring2 1.0-1 deb libuuid1 2.37.2-4ubuntu3 deb libxxhash0 0.8.1-1 deb libzstd1 1.4.8+dfsg-3build1 deb -locales 2.35-0ubuntu3.3 deb +locales 2.35-0ubuntu3.4 deb login 1:4.8.1-2ubuntu2.1 deb logsave 1.46.5-2ubuntu1.1 deb lsb-base 11.1.0ubuntu4 deb From 8eba6bbc02c10e107a5522431ff0c144cc58fec1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 23 Oct 2023 09:20:34 +0000 Subject: [PATCH 357/514] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 3fd4d5f..c67697a 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -9,7 +9,7 @@ bash 5.1.16 binary bsdutils 1:2.37.2-4ubuntu3 deb ca-certificates 20230311ubuntu0.22.04.1 deb coreutils 8.32-4.1ubuntu1 deb -curl 7.81.0-1ubuntu1.13 deb +curl 7.81.0-1ubuntu1.14 deb dash 0.5.11+git20210903+057cd650a4ed-3build1 deb debconf 1.5.79ubuntu1 deb debianutils 5.5-1ubuntu2 deb @@ -50,7 +50,7 @@ libcap-ng0 0.7.9-2.2build3 deb libcap2 1:2.44-1ubuntu0.22.04.1 deb libcom-err2 1.46.5-2ubuntu1.1 deb libcrypt1 1:4.4.27-1 deb -libcurl4 7.81.0-1ubuntu1.13 deb +libcurl4 7.81.0-1ubuntu1.14 deb libdb5.3 5.3.28+dfsg1-0.8ubuntu3 deb libdebconfclient0 0.261ubuntu1 deb libext2fs2 1.46.5-2ubuntu1.1 deb From 7e2bca34ccdf24bddd3d8a984e8d087c77cf2af5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 30 Oct 2023 09:17:47 +0000 Subject: [PATCH 358/514] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index c67697a..b1b3184 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -113,7 +113,7 @@ libtasn1-6 4.18.0-4build1 deb libtinfo6 6.3-2ubuntu0.1 deb libtirpc-common 1.3.2-2ubuntu0.1 deb libtirpc3 1.3.2-2ubuntu0.1 deb -libudev1 249.11-0ubuntu3.10 deb +libudev1 249.11-0ubuntu3.11 deb libunistring2 1.0-1 deb libuuid1 2.37.2-4ubuntu3 deb libxxhash0 0.8.1-1 deb @@ -128,7 +128,7 @@ ncurses-base 6.3-2ubuntu0.1 deb ncurses-bin 6.3-2ubuntu0.1 deb netcat 1.218-4ubuntu1 deb netcat-openbsd 1.218-4ubuntu1 deb -openssl 3.0.2-0ubuntu1.10 deb +openssl 3.0.2-0ubuntu1.12 deb passwd 1:4.8.1-2ubuntu2.1 deb perl-base 5.34.0-3ubuntu1.2 deb pinentry-curses 1.1.1-1build2 deb @@ -143,7 +143,7 @@ sysvinit-utils 3.01-1ubuntu1 deb tar 1.34+dfsg-1ubuntu0.1.22.04.1 deb tzdata 2023c-0ubuntu0.22.04.2 deb ubuntu-keyring 2021.03.26 deb -udev 249.11-0ubuntu3.10 deb +udev 249.11-0ubuntu3.11 deb usrmerge 25ubuntu2 deb util-linux 2.37.2-4ubuntu3 deb wget 1.21.2-2ubuntu1 deb From 02f8e58e475ca5951e65cd2513146876a885dcc9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 30 Oct 2023 20:26:18 +0000 Subject: [PATCH 359/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index b1b3184..6e6bcee 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -132,7 +132,7 @@ openssl 3.0.2-0ubuntu1.12 deb passwd 1:4.8.1-2ubuntu2.1 deb perl-base 5.34.0-3ubuntu1.2 deb pinentry-curses 1.1.1-1build2 deb -plexmediaserver 1.32.6.7557-1cf77d501 deb +plexmediaserver 1.32.7.7621-871adbd44 deb procps 2:3.3.17-6ubuntu2 deb publicsuffix 20211207.1025-1 deb readline-common 8.1.2-1 deb From 3cced1d3349fdf05d90a686dcba615b720f5099f Mon Sep 17 00:00:00 2001 From: jaannnis <jfedermair@gmail.com> Date: Sun, 24 Sep 2023 15:15:54 +0200 Subject: [PATCH 360/514] Update Dockerfile install wireguard copy wireguard config added wireguarg config Update Dockerfile Update Dockerfile a cleanup --- .gitignore | 2 ++ Dockerfile | 9 +++++++-- .../init-wireguard/dependencies.d/init-services | 0 root/etc/s6-overlay/s6-rc.d/init-wireguard/run | 10 ++++++++++ root/etc/s6-overlay/s6-rc.d/init-wireguard/type | 1 + root/etc/s6-overlay/s6-rc.d/init-wireguard/up | 0 root/etc/s6-overlay/s6-rc.d/svc-plex/run | 2 ++ .../s6-overlay/s6-rc.d/user/contents.d/init-wireguard | 0 8 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-wireguard/dependencies.d/init-services create mode 100755 root/etc/s6-overlay/s6-rc.d/init-wireguard/run create mode 100644 root/etc/s6-overlay/s6-rc.d/init-wireguard/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-wireguard/up create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-wireguard diff --git a/.gitignore b/.gitignore index 6e8ad97..b733b8b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +# Wireguard configs, you never know +wg*.conf # Windows image file caches Thumbs.db ehthumbs.db diff --git a/Dockerfile b/Dockerfile index 36ef5db..409d635 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,12 +26,14 @@ ENV DEBIAN_FRONTEND="noninteractive" \ PLEX_MEDIA_SERVER_INFO_DEVICE="Docker Container (LinuxServer.io)" RUN \ - echo "**** install runtime packages ****" && \ + echo "**** install runtime packages & wireguard ****" && \ apt-get update && \ apt-get install -y \ jq \ udev \ - wget && \ + wget \ + iproute2 \ + wireguard-tools &&\ echo "**** install plex ****" && \ if [ -z ${PLEX_RELEASE+x} ]; then \ PLEX_RELEASE=$(curl -sX GET 'https://plex.tv/api/downloads/5.json' \ @@ -54,6 +56,9 @@ RUN \ # add local files COPY root/ / +# add wireguard config +COPY ./wg0.conf /etc/wireguard/wg0.conf + # add unrar COPY --from=unrar /usr/bin/unrar-ubuntu /usr/bin/unrar diff --git a/root/etc/s6-overlay/s6-rc.d/init-wireguard/dependencies.d/init-services b/root/etc/s6-overlay/s6-rc.d/init-wireguard/dependencies.d/init-services new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-wireguard/run b/root/etc/s6-overlay/s6-rc.d/init-wireguard/run new file mode 100755 index 0000000..e5989a5 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-wireguard/run @@ -0,0 +1,10 @@ +#!/usr/bin/with-contenv bash +# Bring up WireGuard if not already up +if ! ip link show dev wg0 > /dev/null 2>&1; then + wg-quick up wg0 +else +sleep 60 +fi + +# Exit after running +exit 0 diff --git a/root/etc/s6-overlay/s6-rc.d/init-wireguard/type b/root/etc/s6-overlay/s6-rc.d/init-wireguard/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-wireguard/type @@ -0,0 +1 @@ +longrun diff --git a/root/etc/s6-overlay/s6-rc.d/init-wireguard/up b/root/etc/s6-overlay/s6-rc.d/init-wireguard/up new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-plex/run b/root/etc/s6-overlay/s6-rc.d/svc-plex/run index 8486676..6a5aefa 100755 --- a/root/etc/s6-overlay/s6-rc.d/svc-plex/run +++ b/root/etc/s6-overlay/s6-rc.d/svc-plex/run @@ -1,5 +1,7 @@ #!/usr/bin/with-contenv bash +# Wait for WireGuard to be up + echo "Starting Plex Media Server. . . (you can ignore the libusb_init error)" export PLEX_MEDIA_SERVER_INFO_MODEL=$(uname -m) export PLEX_MEDIA_SERVER_INFO_PLATFORM_VERSION=$(uname -r) diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-wireguard b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-wireguard new file mode 100644 index 0000000..e69de29 From fa08911915af91282592fff1f8049316d496f677 Mon Sep 17 00:00:00 2001 From: jaannnis <jfedermair@gmail.com> Date: Sat, 30 Sep 2023 11:16:44 +0200 Subject: [PATCH 361/514] Update README.md --- README.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/README.md b/README.md index e5d3a36..ae07615 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,19 @@ +<<<<<<< HEAD <!-- DO NOT EDIT THIS FILE MANUALLY --> <!-- Please read https://github.com/linuxserver/docker-plex/blob/master/.github/CONTRIBUTING.md --> +======= +due to the recent purge of Hosters by plex, this fork adds wireguard functionallity to the plex container as a quick workaround. all traffic gets tunneled. + +wireguard onfig file has to be mounted in /etc/wireguard/wg0.conf. e.g.: +``` + volumes: + - ./wg0.conf:/etc/wireguard/wg0.conf +``` + +<!-- DO NOT EDIT THIS FILE MANUALLY --> +<!-- Please read the https://github.com/linuxserver/docker-plex/blob/master/.github/CONTRIBUTING.md --> + +>>>>>>> 72bdfaa (Update README.md) [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io) [![Blog](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!") From 603a79335fd9c6a747b17669a1a5e13275befd30 Mon Sep 17 00:00:00 2001 From: BuildTools <unconfigured@null.spigotmc.org> Date: Sat, 30 Sep 2023 09:24:28 +0000 Subject: [PATCH 362/514] removed wg0 at build --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 409d635..7488ceb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -56,8 +56,6 @@ RUN \ # add local files COPY root/ / -# add wireguard config -COPY ./wg0.conf /etc/wireguard/wg0.conf # add unrar COPY --from=unrar /usr/bin/unrar-ubuntu /usr/bin/unrar From 2d577f3a6779b386083e38f5518d71e1c2902dc3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 6 Nov 2023 09:20:32 +0000 Subject: [PATCH 363/514] Bot Updating Package Versions --- package_versions.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/package_versions.txt b/package_versions.txt index 6e6bcee..2ace155 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -9,6 +9,7 @@ bash 5.1.16 binary bsdutils 1:2.37.2-4ubuntu3 deb ca-certificates 20230311ubuntu0.22.04.1 deb coreutils 8.32-4.1ubuntu1 deb +cron 3.0pl1-137ubuntu3 deb curl 7.81.0-1ubuntu1.14 deb dash 0.5.11+git20210903+057cd650a4ed-3build1 deb debconf 1.5.79ubuntu1 deb From 256415b0e15e33d67c40d2ebc4d9f7d986217e23 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 20 Nov 2023 09:19:39 +0000 Subject: [PATCH 364/514] Bot Updating Templated Files --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e5d3a36..37bda75 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ Find us at: ## Supported Architectures -We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/). +We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://distribution.github.io/distribution/spec/manifest-v2-2/#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/). Simply pulling `lscr.io/linuxserver/plex:latest` should retrieve the correct image for your arch, but you can also pull specific arch images via tags. From 4015f1ce1f739858f0257de6a0c3ef893485a06d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 20 Nov 2023 09:22:40 +0000 Subject: [PATCH 365/514] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 2ace155..704c901 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,7 +1,7 @@ NAME VERSION TYPE adduser 3.118ubuntu5 deb -apt 2.4.10 deb -apt-utils 2.4.10 deb +apt 2.4.11 deb +apt-utils 2.4.11 deb base-files 12ubuntu4.3 deb base-passwd 3.5.52build1 deb bash 5.1-6ubuntu1 deb @@ -36,7 +36,7 @@ hostname 3.23ubuntu2 deb init-system-helpers 1.62 deb jq 1.6-2.1ubuntu3 deb libacl1 2.3.1-1 deb -libapt-pkg6.0 2.4.10 deb +libapt-pkg6.0 2.4.11 deb libassuan0 2.5.5-1build1 deb libattr1 1:2.5.1-1build1 deb libaudit-common 1:3.0.7-1build1 deb From a6e953eb0b4bff47e834c698b36e519a1365ef52 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 4 Dec 2023 09:20:42 +0000 Subject: [PATCH 366/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 704c901..f8f97a5 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -80,7 +80,7 @@ libmount1 2.37.2-4ubuntu3 deb libncurses6 6.3-2ubuntu0.1 deb libncursesw6 6.3-2ubuntu0.1 deb libnettle8 3.7.3-1build2 deb -libnghttp2-14 1.43.0-1build3 deb +libnghttp2-14 1.43.0-1ubuntu0.1 deb libnpth0 1.6-3build2 deb libnsl2 1.3.0-2build2 deb libonig5 6.9.7.1-2build1 deb From a76b3f5ae51424fed29ed48061a8a6e0a45bd93b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 4 Dec 2023 20:28:04 +0000 Subject: [PATCH 367/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index f8f97a5..f71be0a 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -133,7 +133,7 @@ openssl 3.0.2-0ubuntu1.12 deb passwd 1:4.8.1-2ubuntu2.1 deb perl-base 5.34.0-3ubuntu1.2 deb pinentry-curses 1.1.1-1build2 deb -plexmediaserver 1.32.7.7621-871adbd44 deb +plexmediaserver 1.32.8.7639-fb6452ebf deb procps 2:3.3.17-6ubuntu2 deb publicsuffix 20211207.1025-1 deb readline-common 8.1.2-1 deb From f5373d8b8bac03dd845cd631d75306036c0509e4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 18 Dec 2023 09:19:11 +0000 Subject: [PATCH 368/514] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index f71be0a..65c2163 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -10,7 +10,7 @@ bsdutils 1:2.37.2-4ubuntu3 deb ca-certificates 20230311ubuntu0.22.04.1 deb coreutils 8.32-4.1ubuntu1 deb cron 3.0pl1-137ubuntu3 deb -curl 7.81.0-1ubuntu1.14 deb +curl 7.81.0-1ubuntu1.15 deb dash 0.5.11+git20210903+057cd650a4ed-3build1 deb debconf 1.5.79ubuntu1 deb debianutils 5.5-1ubuntu2 deb @@ -51,7 +51,7 @@ libcap-ng0 0.7.9-2.2build3 deb libcap2 1:2.44-1ubuntu0.22.04.1 deb libcom-err2 1.46.5-2ubuntu1.1 deb libcrypt1 1:4.4.27-1 deb -libcurl4 7.81.0-1ubuntu1.14 deb +libcurl4 7.81.0-1ubuntu1.15 deb libdb5.3 5.3.28+dfsg1-0.8ubuntu3 deb libdebconfclient0 0.261ubuntu1 deb libext2fs2 1.46.5-2ubuntu1.1 deb @@ -119,7 +119,7 @@ libunistring2 1.0-1 deb libuuid1 2.37.2-4ubuntu3 deb libxxhash0 0.8.1-1 deb libzstd1 1.4.8+dfsg-3build1 deb -locales 2.35-0ubuntu3.4 deb +locales 2.35-0ubuntu3.5 deb login 1:4.8.1-2ubuntu2.1 deb logsave 1.46.5-2ubuntu1.1 deb lsb-base 11.1.0ubuntu4 deb @@ -139,7 +139,7 @@ publicsuffix 20211207.1025-1 deb readline-common 8.1.2-1 deb sed 4.8-1ubuntu2 deb sensible-utils 0.0.17 deb -systemd-hwe-hwdb 249.11.3 deb +systemd-hwe-hwdb 249.11.4 deb sysvinit-utils 3.01-1ubuntu1 deb tar 1.34+dfsg-1ubuntu0.1.22.04.1 deb tzdata 2023c-0ubuntu0.22.04.2 deb From d5e04e319311c2e81bfcae6ad2feefa7c97ad603 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 25 Dec 2023 09:18:00 +0000 Subject: [PATCH 369/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 65c2163..608d418 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -106,7 +106,7 @@ libsepol2 3.3-1build1 deb libsmartcols1 2.37.2-4ubuntu3 deb libsqlite3-0 3.37.2-2ubuntu0.1 deb libss2 1.46.5-2ubuntu1.1 deb -libssh-4 0.9.6-2ubuntu0.22.04.1 deb +libssh-4 0.9.6-2ubuntu0.22.04.2 deb libssl3 3.0.2-0ubuntu1.10 deb libstdc++6 12.1.0-2ubuntu1~22.04 deb libsystemd0 249.11-0ubuntu3.9 deb From b046c3ffb44ecda558b49496ebc211cbc5e6957a Mon Sep 17 00:00:00 2001 From: Eric Nemchik <eric@nemchik.com> Date: Mon, 8 Jan 2024 20:02:48 -0600 Subject: [PATCH 370/514] Replace existing chown with lsiown Signed-off-by: Eric Nemchik <eric@nemchik.com> --- root/etc/s6-overlay/s6-rc.d/init-plex-chown/run | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-chown/run b/root/etc/s6-overlay/s6-rc.d/init-plex-chown/run index b64fe98..3496fb4 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-plex-chown/run +++ b/root/etc/s6-overlay/s6-rc.d/init-plex-chown/run @@ -3,7 +3,7 @@ # create folders if [ ! -d "${PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR}" ]; then \ mkdir -p "${PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR}" - chown -R abc:abc /config + lsiown -R abc:abc /config fi # check Library permissions @@ -11,7 +11,7 @@ PUID=${PUID:-911} if [ ! "$(stat -c %u /config/Library)" = "$PUID" ]; then echo "Change in ownership detected, please be patient while we chown existing files" echo "This could take some time" - chown abc:abc -R \ + lsiown abc:abc -R \ /config/Library fi @@ -21,6 +21,6 @@ if [[ -f "/config/Library/Application Support/Plex Media Server/plexmediaserver. fi # permissions (non-recursive) on config root and folders -chown abc:abc \ +lsiown abc:abc \ /config \ /config/* From b9fdee8cb86e69c7211b73840b8ad8053b4712c3 Mon Sep 17 00:00:00 2001 From: Eric Nemchik <eric@nemchik.com> Date: Mon, 8 Jan 2024 20:22:56 -0600 Subject: [PATCH 371/514] set permissions on Plex Transcoder Temp Directory Signed-off-by: Eric Nemchik <eric@nemchik.com> --- root/etc/s6-overlay/s6-rc.d/init-plex-chown/run | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-chown/run b/root/etc/s6-overlay/s6-rc.d/init-plex-chown/run index 3496fb4..1a50eab 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-plex-chown/run +++ b/root/etc/s6-overlay/s6-rc.d/init-plex-chown/run @@ -20,6 +20,18 @@ if [[ -f "/config/Library/Application Support/Plex Media Server/plexmediaserver. rm -f "/config/Library/Application Support/Plex Media Server/plexmediaserver.pid" fi +# set permissions on Plex Transcoder Temp Directory +PREFNAME="/config/Library/Application Support/Plex Media Server/Preferences.xml" +if [[ -f "${PREFNAME}" ]]; then + TranscoderTempDirectory='\bTranscoderTempDirectory="([^"]+)"' + while IFS= read -r line; do + if [[ ${line} =~ ${TranscoderTempDirectory} ]] && [[ -d "${BASH_REMATCH[1]}" ]]; then + echo "Setting permissions on ${BASH_REMATCH[1]}" + lsiown -R abc:abc "${BASH_REMATCH[1]}" + fi + done <"${PREFNAME}" +fi + # permissions (non-recursive) on config root and folders lsiown abc:abc \ /config \ From 4b79b7759e22eea31d4041386517037a2a21ca8e Mon Sep 17 00:00:00 2001 From: Eric Nemchik <eric@nemchik.com> Date: Mon, 8 Jan 2024 21:07:50 -0600 Subject: [PATCH 372/514] Remove unused file Signed-off-by: Eric Nemchik <eric@nemchik.com> --- root/defaults/plexmediaserver | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 root/defaults/plexmediaserver diff --git a/root/defaults/plexmediaserver b/root/defaults/plexmediaserver deleted file mode 100644 index 071c896..0000000 --- a/root/defaults/plexmediaserver +++ /dev/null @@ -1,16 +0,0 @@ -# default script for Plex Media Server - -# the number of plugins that can run at the same time -PLEX_MEDIA_SERVER_MAX_PLUGIN_PROCS=6 - -# ulimit -s $PLEX_MEDIA_SERVER_MAX_STACK_SIZE -PLEX_MEDIA_SERVER_MAX_STACK_SIZE=3000 - -# uncomment to set it to something else -PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR="/config/Library/Application Support" - -# the user that PMS should run as, defaults to 'plex' -# note that if you change this you might need to move -# the Application Support directory to not lose your -# media library -PLEX_MEDIA_SERVER_USER=abc From 56562f49564b5b6b1a4e251c8790b38d80771a25 Mon Sep 17 00:00:00 2001 From: Eric Nemchik <eric@nemchik.com> Date: Mon, 8 Jan 2024 21:17:32 -0600 Subject: [PATCH 373/514] Fix various shellcheck concerns Signed-off-by: Eric Nemchik <eric@nemchik.com> --- .../s6-overlay/s6-rc.d/init-plex-chown/run | 13 ++-- .../s6-overlay/s6-rc.d/init-plex-claim/run | 58 ++++++++++-------- .../s6-rc.d/init-plex-gid-video/run | 10 +-- .../s6-overlay/s6-rc.d/init-plex-update/run | 61 ++++++++++--------- root/etc/s6-overlay/s6-rc.d/svc-plex/run | 9 ++- 5 files changed, 83 insertions(+), 68 deletions(-) diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-chown/run b/root/etc/s6-overlay/s6-rc.d/init-plex-chown/run index 1a50eab..e7863da 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-plex-chown/run +++ b/root/etc/s6-overlay/s6-rc.d/init-plex-chown/run @@ -1,18 +1,19 @@ #!/usr/bin/with-contenv bash +# shellcheck shell=bash # create folders -if [ ! -d "${PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR}" ]; then \ +if [[ ! -d "${PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR}" ]]; then mkdir -p "${PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR}" lsiown -R abc:abc /config fi # check Library permissions PUID=${PUID:-911} -if [ ! "$(stat -c %u /config/Library)" = "$PUID" ]; then +if [[ ! "$(stat -c %u /config/Library)" == "${PUID}" ]]; then echo "Change in ownership detected, please be patient while we chown existing files" echo "This could take some time" lsiown abc:abc -R \ - /config/Library + /config/Library fi # remove plex pid after unclean stop @@ -21,15 +22,15 @@ if [[ -f "/config/Library/Application Support/Plex Media Server/plexmediaserver. fi # set permissions on Plex Transcoder Temp Directory -PREFNAME="/config/Library/Application Support/Plex Media Server/Preferences.xml" -if [[ -f "${PREFNAME}" ]]; then +PLEX_MEDIA_SERVER_PREFERENCES="${PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR}/Plex Media Server/Preferences.xml" +if [[ -f "${PLEX_MEDIA_SERVER_PREFERENCES}" ]]; then TranscoderTempDirectory='\bTranscoderTempDirectory="([^"]+)"' while IFS= read -r line; do if [[ ${line} =~ ${TranscoderTempDirectory} ]] && [[ -d "${BASH_REMATCH[1]}" ]]; then echo "Setting permissions on ${BASH_REMATCH[1]}" lsiown -R abc:abc "${BASH_REMATCH[1]}" fi - done <"${PREFNAME}" + done <"${PLEX_MEDIA_SERVER_PREFERENCES}" fi # permissions (non-recursive) on config root and folders diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-claim/run b/root/etc/s6-overlay/s6-rc.d/init-plex-claim/run index c597876..a94451e 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-plex-claim/run +++ b/root/etc/s6-overlay/s6-rc.d/init-plex-claim/run @@ -1,83 +1,89 @@ #!/usr/bin/with-contenv bash +# shellcheck shell=bash -if grep -qs "PlexOnlineToken" "/config/Library/Application Support/Plex Media Server/Preferences.xml"; then +PLEX_MEDIA_SERVER_PREFERENCES="${PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR}/Plex Media Server/Preferences.xml" + +if grep -qs "PlexOnlineToken" "${PLEX_MEDIA_SERVER_PREFERENCES}"; then echo "**** Server already claimed ****" exit 0 -elif [ -z "$PLEX_CLAIM" ]; then +elif [[ -z "$PLEX_CLAIM" ]]; then echo "**** Server is unclaimed, but no claim token has been set ****" exit 0 fi -PREFNAME="/config/Library/Application Support/Plex Media Server/Preferences.xml" -if [ ! -f "${PREFNAME}" ]; then + +if [[ ! -f "${PLEX_MEDIA_SERVER_PREFERENCES}" ]]; then UMASK_SET="${UMASK_SET:-022}" umask "$UMASK_SET" echo "Temporarily starting Plex Media Server." - export PLEX_MEDIA_SERVER_INFO_MODEL=$(uname -m) - export PLEX_MEDIA_SERVER_INFO_PLATFORM_VERSION=$(uname -r) + PLEX_MEDIA_SERVER_INFO_MODEL=$(uname -m) + export PLEX_MEDIA_SERVER_INFO_MODEL + PLEX_MEDIA_SERVER_INFO_PLATFORM_VERSION=$(uname -r) + export PLEX_MEDIA_SERVER_INFO_PLATFORM_VERSION s6-setuidgid abc /bin/bash -c \ - 'LD_LIBRARY_PATH=/usr/lib/plexmediaserver:/usr/lib/plexmediaserver/lib /usr/lib/plexmediaserver/Plex\ Media\ Server' & PID=$! + 'LD_LIBRARY_PATH=/usr/lib/plexmediaserver:/usr/lib/plexmediaserver/lib /usr/lib/plexmediaserver/Plex\ Media\ Server' & + PID=$! echo "Waiting for Plex to generate its config" DBNAME="/config/Library/Application Support/Plex Media Server/Plug-in Support/Databases/com.plexapp.plugins.library.db-wal" - until [ -f "${DBNAME}" ]; do + until [[ -f "${DBNAME}" ]]; do sleep 1 done while true; do echo "Waiting for database creation to complete..." - if [ -z "${COMPARE_MD5+x}" ]; then - COMPARE_MD5=$(md5sum "${DBNAME}"| cut -c1-8) + if [[ -z "${COMPARE_MD5+x}" ]]; then + COMPARE_MD5=$(md5sum "${DBNAME}" | cut -c1-8) sleep 3 else sleep 3 - CURRENT_MD5=$(md5sum "${DBNAME}"| cut -c1-8) - if [ "${CURRENT_MD5}" == "${COMPARE_MD5}" ]; then + CURRENT_MD5=$(md5sum "${DBNAME}" | cut -c1-8) + if [[ "${CURRENT_MD5}" == "${COMPARE_MD5}" ]]; then break else - COMPARE_MD5=$(md5sum "${DBNAME}"| cut -c1-8) + COMPARE_MD5=$(md5sum "${DBNAME}" | cut -c1-8) fi fi done - until grep -qs "ProcessedMachineIdentifier" "${PREFNAME}"; do + until grep -qs "ProcessedMachineIdentifier" "${PLEX_MEDIA_SERVER_PREFERENCES}"; do sleep 1 done while true; do echo "Waiting for pref file creation to complete..." - if [ -z "${PREF_COMPARE_MD5+x}" ]; then - PREF_COMPARE_MD5=$(md5sum "${PREFNAME}"| cut -c1-8) + if [[ -z "${PREF_COMPARE_MD5+x}" ]]; then + PREF_COMPARE_MD5=$(md5sum "${PLEX_MEDIA_SERVER_PREFERENCES}" | cut -c1-8) sleep 3 else sleep 3 - PREF_CURRENT_MD5=$(md5sum "${PREFNAME}"| cut -c1-8) - if [ "${PREF_CURRENT_MD5}" == "${PREF_COMPARE_MD5}" ]; then + PREF_CURRENT_MD5=$(md5sum "${PLEX_MEDIA_SERVER_PREFERENCES}" | cut -c1-8) + if [[ "${PREF_CURRENT_MD5}" == "${PREF_COMPARE_MD5}" ]]; then break else - PREF_COMPARE_MD5=$(md5sum "${PREFNAME}"| cut -c1-8) + PREF_COMPARE_MD5=$(md5sum "${PLEX_MEDIA_SERVER_PREFERENCES}" | cut -c1-8) fi fi done echo "Stopping Plex to claim server" - while ps -p $PID > /dev/null; do + while ps -p $PID >/dev/null; do kill $PID sleep 1 done echo "Plex stopped" fi -ProcessedMachineIdentifier=$(sed -n "s/^.*ProcessedMachineIdentifier=\"\([^\"]*\)\".*$/\1/p" "${PREFNAME}") +ProcessedMachineIdentifier=$(sed -n "s/^.*ProcessedMachineIdentifier=\"\([^\"]*\)\".*$/\1/p" "${PLEX_MEDIA_SERVER_PREFERENCES}") PlexOnlineToken="$(curl -X POST \ -H 'X-Plex-Client-Identifier: '"${ProcessedMachineIdentifier}" \ - -H 'X-Plex-Product: Plex Media Server'\ + -H 'X-Plex-Product: Plex Media Server' \ -H 'X-Plex-Version: 1.1' \ -H 'X-Plex-Provides: server' \ -H 'X-Plex-Platform: Linux' \ -H 'X-Plex-Platform-Version: 1.0' \ -H 'X-Plex-Device-Name: PlexMediaServer' \ -H 'X-Plex-Device: Linux' \ - "https://plex.tv/api/claim/exchange?token=${PLEX_CLAIM}" \ - | sed -n 's/.*<authentication-token>\(.*\)<\/authentication-token>.*/\1/p')" + "https://plex.tv/api/claim/exchange?token=${PLEX_CLAIM}" | + sed -n 's/.*<authentication-token>\(.*\)<\/authentication-token>.*/\1/p')" -if [ -n "$PlexOnlineToken" ]; then +if [[ -n "$PlexOnlineToken" ]]; then echo "Server claimed successfully, navigate to http://serverip:32400/web to complete plex setup." - sed -i "s/\/>/ PlexOnlineToken=\"${PlexOnlineToken}\"\/>/g" "${PREFNAME}" + sed -i "s/\/>/ PlexOnlineToken=\"${PlexOnlineToken}\"\/>/g" "${PLEX_MEDIA_SERVER_PREFERENCES}" else echo "Unable to claim Plex server. Either manually claim by connecting to http://serverip:32400/web from the same network subnet, or recreate container with a new claim token." fi diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/run b/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/run index c07fe60..cd01d81 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/run +++ b/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/run @@ -1,9 +1,9 @@ #!/usr/bin/with-contenv bash +# shellcheck shell=bash FILES=$(find /dev/dri /dev/dvb -type c -print 2>/dev/null) -for i in $FILES -do +for i in ${FILES}; do VIDEO_GID=$(stat -c '%g' "${i}") VIDEO_UID=$(stat -c '%u' "${i}") # check if user matches device @@ -11,13 +11,13 @@ do echo "**** permissions for ${i} are good ****" else # check if group matches and that device has group rw - if id -G abc | grep -qw "${VIDEO_GID}" && [ $(stat -c '%A' "${i}" | cut -b 5,6) = "rw" ]; then + if id -G abc | grep -qw "${VIDEO_GID}" && [[ $(stat -c '%A' "${i}" | cut -b 5,6) == "rw" ]]; then echo "**** permissions for ${i} are good ****" # check if device needs to be added to video group elif ! id -G abc | grep -qw "${VIDEO_GID}"; then # check if video group needs to be created VIDEO_NAME=$(getent group "${VIDEO_GID}" | awk -F: '{print $1}') - if [ -z "${VIDEO_NAME}" ]; then + if [[ -z "${VIDEO_NAME}" ]]; then VIDEO_NAME="video$(head /dev/urandom | tr -dc 'a-z0-9' | head -c4)" groupadd "${VIDEO_NAME}" groupmod -g "${VIDEO_GID}" "${VIDEO_NAME}" @@ -27,7 +27,7 @@ do usermod -a -G "${VIDEO_NAME}" abc fi # check if device has group rw - if [ $(stat -c '%A' "${i}" | cut -b 5,6) != "rw" ]; then + if [[ $(stat -c '%A' "${i}" | cut -b 5,6) != "rw" ]]; then echo -e "**** The device ${i} does not have group read/write permissions, attempting to fix inside the container. ****" chmod g+rw "${i}" fi diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-update/run b/root/etc/s6-overlay/s6-rc.d/init-plex-update/run index 6e2b65b..33b9968 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-plex-update/run +++ b/root/etc/s6-overlay/s6-rc.d/init-plex-update/run @@ -1,7 +1,8 @@ #!/usr/bin/with-contenv bash +# shellcheck shell=bash # If docker manages versioning exit -if [ "${VERSION}" ] && [ "${VERSION}" == 'docker' ]; then +if [[ -n "${VERSION}" ]] && [[ "${VERSION}" == "docker" ]]; then echo "Docker is used for versioning skip update check" exit 0 fi @@ -12,19 +13,20 @@ if (dpkg --get-selections plexmediaserver | grep -wq "install"); then else echo "for some reason plex doesn't appear to be installed, pulling a new copy and exiting out of update script" curl -o /tmp/plexmediaserver.deb -L \ - "${PLEX_DOWNLOAD}/${REMOTE_VERSION}/debian/plexmediaserver_${REMOTE_VERSION}_${PLEX_ARCH}.deb" && \ + "${PLEX_DOWNLOAD}/${REMOTE_VERSION}/debian/plexmediaserver_${REMOTE_VERSION}_${PLEX_ARCH}.deb" dpkg -i --force-confold /tmp/plexmediaserver.deb rm -f /tmp/plexmediaserver.deb exit 0 fi # set no update message -[[ -e /tmp/no-version.nfo ]] && \ +if [[ -e /tmp/no-version.nfo ]]; then rm /tmp/no-version.nfo +fi NOVERSION_SET='/tmp/no-version.nfo' -cat > "${NOVERSION_SET}" <<-EOFVERSION +cat >"${NOVERSION_SET}" <<-EOFVERSION ####################################################### -# Update routine will not run because you havent set # +# Update routine will not run because you haven't set # # the VERSION variable or you opted out of updates. # # For more information checkout :- # # https://github.com/linuxserver/docker-plex # @@ -32,10 +34,11 @@ cat > "${NOVERSION_SET}" <<-EOFVERSION EOFVERSION # set update failed message -[[ -e /tmp/update_fail.nfo ]] && \ +if [[ -e /tmp/update_fail.nfo ]]; then rm /tmp/update_fail.nfo +fi UPGRADE_FAIL='/tmp/update_fail.nfo' -cat > "${UPGRADE_FAIL}" <<-EOFFAIL +cat >"${UPGRADE_FAIL}" <<-EOFFAIL ######################################################## # Upgrade attempt failed, this could be because either # # plex update site is down, local network issues, or # @@ -45,25 +48,27 @@ cat > "${UPGRADE_FAIL}" <<-EOFFAIL ######################################################## EOFFAIL -# test for no version set or opt out for autoupdates -if [[ -z "$VERSION" ]] || [[ "$VERSION" == "0" ]] || [[ -n "$ADVANCED_DISABLEUPDATES" ]]; then +# test for no version set or opt out for auto updates +if [[ -z "${VERSION}" ]] || [[ "${VERSION}" == "0" ]] || [[ -n "${ADVANCED_DISABLEUPDATES}" ]]; then printf '\n\n\n%s\n\n\n' "$(</tmp/no-version.nfo)" exit 0 fi # set header for no preferences/token message -[[ -e /tmp/no-token.nfo ]] && \ +if [[ -e /tmp/no-token.nfo ]]; then rm /tmp/no-token.nfo +fi NOTOKEN_SET='/tmp/no-token.nfo' -cat > "${NOTOKEN_SET}" <<-EOFTOKEN +cat >"${NOTOKEN_SET}" <<-EOFTOKEN ##################################################### # Login via the webui at http://<ip>:32400/web # # and restart the container, because there was no # EOFTOKEN # if preferences files doesn't exist, exit out -if [ ! -e "/config/Library/Application Support/Plex Media Server/Preferences.xml" ]; then - cat >> "${NOTOKEN_SET}" <<-EOFTOKEN +PLEX_MEDIA_SERVER_PREFERENCES="${PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR}/Plex Media Server/Preferences.xml" +if [[ ! -e "${PLEX_MEDIA_SERVER_PREFERENCES}" ]]; then + cat >>"${NOTOKEN_SET}" <<-EOFTOKEN # preference file found, possibly first startup. # ##################################################### EOFTOKEN @@ -72,13 +77,13 @@ EOFTOKEN fi # attempt to read plex token -PLEX_TOKEN=$( sed -n 's/.*PlexOnlineToken="//p' \ - "/config/Library/Application Support/Plex Media Server/Preferences.xml" \ - | sed "s/\".*//") +PLEX_TOKEN=$(sed -n 's/.*PlexOnlineToken="//p' \ + "${PLEX_MEDIA_SERVER_PREFERENCES}" | + sed "s/\".*//") # if plex token isn't found, exit out -if [ -z "$PLEX_TOKEN" ]; then - cat >> "${NOTOKEN_SET}" <<-EOFTOKEN +if [[ -z "${PLEX_TOKEN}" ]]; then + cat >>"${NOTOKEN_SET}" <<-EOFTOKEN # plex token found in the preference file # ##################################################### EOFTOKEN @@ -90,22 +95,22 @@ fi INSTALLED_VERSION=$(dpkg-query -W -f='${Version}' plexmediaserver) # start update routine -if [[ "${VERSION,,}" = latest ]] || [[ "${VERSION,,}" = plexpass ]] || [[ "$PLEXPASS" == "1" ]]; then - if [[ "${PLEX_ARCH}" = amd64 ]]; then +if [[ "${VERSION,,}" == "latest" ]] || [[ "${VERSION,,}" == "plexpass" ]] || [[ "${PLEXPASS}" == "1" ]]; then + if [[ "${PLEX_ARCH}" == "amd64" ]]; then PLEX_URL_ARCH="x86_64" - elif [[ "${PLEX_ARCH}" = armhf ]]; then + elif [[ "${PLEX_ARCH}" == "armhf" ]]; then PLEX_URL_ARCH="armv7hf_neon" - elif [[ "${PLEX_ARCH}" = arm64 ]]; then + elif [[ "${PLEX_ARCH}" == "arm64" ]]; then PLEX_URL_ARCH="aarch64" fi - REMOTE_VERSION=$(curl -s "https://plex.tv/downloads/details/5?distro=debian&build=linux-${PLEX_URL_ARCH}&channel=8&X-Plex-Token=$PLEX_TOKEN"| grep -oP 'version="\K[^"]+' | tail -n 1 ) -elif [[ "${VERSION,,}" = public ]]; then + REMOTE_VERSION=$(curl -s "https://plex.tv/downloads/details/5?distro=debian&build=linux-${PLEX_URL_ARCH}&channel=8&X-Plex-Token=${PLEX_TOKEN}" | grep -oP 'version="\K[^"]+' | tail -n 1) +elif [[ "${VERSION,,}" == "public" ]]; then REMOTE_VERSION=$(curl -s 'https://plex.tv/api/downloads/5.json' | jq -r '.computer.Linux.version') else REMOTE_VERSION="${VERSION}" fi -if [[ "$REMOTE_VERSION" == "$INSTALLED_VERSION" ]]; then +if [[ "${REMOTE_VERSION}" == "${INSTALLED_VERSION}" ]]; then echo "No update required" exit 0 fi @@ -115,18 +120,18 @@ if [[ -z "${REMOTE_VERSION}" ]]; then exit 0 fi -echo "Atempting to upgrade to: $REMOTE_VERSION" +echo "Attempting to upgrade to: ${REMOTE_VERSION}" rm -f /tmp/plexmediaserver_*.deb wget -nv -P /tmp \ "${PLEX_DOWNLOAD}/${REMOTE_VERSION}/debian/plexmediaserver_${REMOTE_VERSION}_${PLEX_ARCH}.deb" last=$? # test if deb file size is ok, or if download failed -if [[ "$last" -gt "0" ]] || [[ $(stat -c %s /tmp/plexmediaserver_"${REMOTE_VERSION}"_${PLEX_ARCH}.deb) -lt 10000 ]]; then +if [[ "${last}" -gt "0" ]] || [[ $(stat -c %s "/tmp/plexmediaserver_${REMOTE_VERSION}_${PLEX_ARCH}.deb") -lt 10000 ]]; then printf '\n\n\n%s\n\n\n' "$(</tmp/update_fail.nfo)" exit 0 # if ok, try to install it. else - dpkg -i --force-confold /tmp/plexmediaserver_"${REMOTE_VERSION}"_${PLEX_ARCH}.deb + dpkg -i --force-confold "/tmp/plexmediaserver_${REMOTE_VERSION}_${PLEX_ARCH}.deb" rm -f /tmp/plexmediaserver_*.deb fi diff --git a/root/etc/s6-overlay/s6-rc.d/svc-plex/run b/root/etc/s6-overlay/s6-rc.d/svc-plex/run index 8486676..09fe8df 100755 --- a/root/etc/s6-overlay/s6-rc.d/svc-plex/run +++ b/root/etc/s6-overlay/s6-rc.d/svc-plex/run @@ -1,8 +1,11 @@ #!/usr/bin/with-contenv bash +# shellcheck shell=bash echo "Starting Plex Media Server. . . (you can ignore the libusb_init error)" -export PLEX_MEDIA_SERVER_INFO_MODEL=$(uname -m) -export PLEX_MEDIA_SERVER_INFO_PLATFORM_VERSION=$(uname -r) +PLEX_MEDIA_SERVER_INFO_MODEL=$(uname -m) +export PLEX_MEDIA_SERVER_INFO_MODEL +PLEX_MEDIA_SERVER_INFO_PLATFORM_VERSION=$(uname -r) +export PLEX_MEDIA_SERVER_INFO_PLATFORM_VERSION exec \ s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 32400" \ - s6-setuidgid abc "/usr/lib/plexmediaserver/Plex Media Server" + s6-setuidgid abc "/usr/lib/plexmediaserver/Plex Media Server" From 79f29db0172c4726b5e6c6eca075ae96fb5756be Mon Sep 17 00:00:00 2001 From: Eric Nemchik <eric@nemchik.com> Date: Tue, 9 Jan 2024 08:19:08 -0600 Subject: [PATCH 374/514] Update readme-vars.yml Changelog for https://github.com/linuxserver/docker-plex/pull/387 --- readme-vars.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/readme-vars.yml b/readme-vars.yml index 1d11f38..f8a8d87 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -95,6 +95,7 @@ app_setup_block: | We automatically add the necessary environment variable that will utilise all the features available on a GPU on the host. Once nvidia-docker is installed on your host you will need to re/create the docker container with the nvidia container runtime `--runtime=nvidia` and add an environment variable `-e NVIDIA_VISIBLE_DEVICES=all` (can also be set to a specific gpu's UUID, this can be discovered by running `nvidia-smi --query-gpu=gpu_name,gpu_uuid --format=csv` ). NVIDIA automatically mounts the GPU and drivers from your host into the plex docker. # changelog changelogs: + - {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: "03.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"} - {date: "16.10.22:", desc: "Rebase to jammy. Update to s6v3. Remove opencl packages (bundled with plex)."} From d3542cce1940f614fa35b61a4996a5010c6b44fb Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 13 Jan 2024 02:02:01 +0000 Subject: [PATCH 375/514] Bot Updating Templated Files --- Jenkinsfile | 295 +++++++++++++++++++++++++++------------------------- 1 file changed, 152 insertions(+), 143 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index dee1443..1d41743 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,6 +16,7 @@ pipeline { GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab') GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0') GITLAB_NAMESPACE=credentials('gitlab-namespace-id') + DOCKERHUB_TOKEN=credentials('docker-hub-ci-pat') JSON_URL = 'https://plex.tv/api/downloads/5.json' JSON_PATH = '.computer.Linux.version' BUILD_VERSION_ARG = 'PLEX_RELEASE' @@ -60,11 +61,16 @@ pipeline { env.COMMIT_SHA = sh( script: '''git rev-parse HEAD''', returnStdout: true).trim() + env.GH_DEFAULT_BRANCH = sh( + script: '''git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||' ''', + returnStdout: true).trim() env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/' env.PULL_REQUEST = env.CHANGE_ID env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/call_issue_pr_tracker.yml ./.github/workflows/call_issues_cron.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml' } + sh '''#! /bin/bash + echo "The default github branch detected as ${GH_DEFAULT_BRANCH}" ''' script{ env.LS_RELEASE_NUMBER = sh( script: '''echo ${LS_RELEASE} |sed 's/^.*-ls//g' ''', @@ -122,7 +128,7 @@ pipeline { steps{ script{ env.EXT_RELEASE_CLEAN = sh( - script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g' ''', + script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/ ]//g' ''', returnStdout: true).trim() def semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)\.(\d+)/ @@ -140,7 +146,7 @@ pipeline { } if (env.SEMVER != null) { - if (BRANCH_NAME != "master" && BRANCH_NAME != "main") { + if (BRANCH_NAME != "${env.GH_DEFAULT_BRANCH}") { env.SEMVER = "${env.SEMVER}-${BRANCH_NAME}" } println("SEMVER: ${env.SEMVER}") @@ -258,115 +264,150 @@ pipeline { } } steps { - sh '''#! /bin/bash - set -e - TEMPDIR=$(mktemp -d) - docker pull ghcr.io/linuxserver/jenkins-builder:latest - docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest - # Stage 1 - Jenkinsfile update - if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then - mkdir -p ${TEMPDIR}/repo - git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} - cd ${TEMPDIR}/repo/${LS_REPO} - git checkout -f master - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/ - git add Jenkinsfile - git commit -m 'Bot Updating Templated Files' - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all - echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} - echo "Updating Jenkinsfile" - rm -Rf ${TEMPDIR} - exit 0 - else - echo "Jenkinsfile is up to date." - fi - # Stage 2 - Delete old templates - OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml Dockerfile.armhf" - for i in ${OLD_TEMPLATES}; do - if [[ -f "${i}" ]]; then - TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}" - fi - done - if [[ -n "${TEMPLATES_TO_DELETE}" ]]; then - mkdir -p ${TEMPDIR}/repo - git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} - cd ${TEMPDIR}/repo/${LS_REPO} - git checkout -f master - for i in ${TEMPLATES_TO_DELETE}; do - git rm "${i}" - done - git commit -m 'Bot Updating Templated Files' - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all - echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} - echo "Deleting old and deprecated templates" - rm -Rf ${TEMPDIR} - exit 0 - else - echo "No templates to delete" - fi - # Stage 3 - Update templates - CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) - cd ${TEMPDIR}/docker-${CONTAINER_NAME} - NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) - if [[ "${CURRENTHASH}" != "${NEWHASH}" ]] || ! grep -q '.jenkins-external' "${WORKSPACE}/.gitignore" 2>/dev/null; then - mkdir -p ${TEMPDIR}/repo - git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} - cd ${TEMPDIR}/repo/${LS_REPO} - git checkout -f master - cd ${TEMPDIR}/docker-${CONTAINER_NAME} - mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows - mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE - cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || : - cp --parents readme-vars.yml ${TEMPDIR}/repo/${LS_REPO}/ || : - cd ${TEMPDIR}/repo/${LS_REPO}/ - if ! grep -q '.jenkins-external' .gitignore 2>/dev/null; then - echo ".jenkins-external" >> .gitignore - git add .gitignore - fi - git add readme-vars.yml ${TEMPLATED_FILES} - git commit -m 'Bot Updating Templated Files' - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all - echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} - else - echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} - fi - mkdir -p ${TEMPDIR}/docs - git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation - if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/docs/docker-documentation/docs/images/ - cd ${TEMPDIR}/docs/docker-documentation - git add docs/images/docker-${CONTAINER_NAME}.md - git commit -m 'Bot Updating Documentation' - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git --all - fi - mkdir -p ${TEMPDIR}/unraid - git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates - git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates - if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-logo.png ]]; then - sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-logo.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml - elif [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then - sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml - fi - if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then - cd ${TEMPDIR}/unraid/templates/ - if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then - echo "Image is on the ignore list, marking Unraid template as deprecated" - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ - git add -u unraid/${CONTAINER_NAME}.xml - git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || : - git commit -m 'Bot Moving Deprecated Unraid Template' || : + withCredentials([ + [ + $class: 'UsernamePasswordMultiBinding', + credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', + usernameVariable: 'DOCKERUSER', + passwordVariable: 'DOCKERPASS' + ] + ]) { + sh '''#! /bin/bash + set -e + TEMPDIR=$(mktemp -d) + docker pull ghcr.io/linuxserver/jenkins-builder:latest + docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest + # Stage 1 - Jenkinsfile update + if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then + mkdir -p ${TEMPDIR}/repo + git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} + cd ${TEMPDIR}/repo/${LS_REPO} + git checkout -f master + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/ + git add Jenkinsfile + git commit -m 'Bot Updating Templated Files' + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master + echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + echo "Updating Jenkinsfile" + rm -Rf ${TEMPDIR} + exit 0 else - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ - git add unraid/${CONTAINER_NAME}.xml - git commit -m 'Bot Updating Unraid Template' + echo "Jenkinsfile is up to date." fi - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git --all - fi - rm -Rf ${TEMPDIR}''' - script{ - env.FILES_UPDATED = sh( - script: '''cat /tmp/${COMMIT_SHA}-${BUILD_NUMBER}''', - returnStdout: true).trim() + # Stage 2 - Delete old templates + OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml Dockerfile.armhf" + for i in ${OLD_TEMPLATES}; do + if [[ -f "${i}" ]]; then + TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}" + fi + done + if [[ -n "${TEMPLATES_TO_DELETE}" ]]; then + mkdir -p ${TEMPDIR}/repo + git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} + cd ${TEMPDIR}/repo/${LS_REPO} + git checkout -f master + for i in ${TEMPLATES_TO_DELETE}; do + git rm "${i}" + done + git commit -m 'Bot Updating Templated Files' + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master + echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + echo "Deleting old and deprecated templates" + rm -Rf ${TEMPDIR} + exit 0 + else + echo "No templates to delete" + fi + # Stage 3 - Update templates + CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) + cd ${TEMPDIR}/docker-${CONTAINER_NAME} + NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) + if [[ "${CURRENTHASH}" != "${NEWHASH}" ]] || ! grep -q '.jenkins-external' "${WORKSPACE}/.gitignore" 2>/dev/null; then + mkdir -p ${TEMPDIR}/repo + git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} + cd ${TEMPDIR}/repo/${LS_REPO} + git checkout -f master + cd ${TEMPDIR}/docker-${CONTAINER_NAME} + mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows + mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE + cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || : + cp --parents readme-vars.yml ${TEMPDIR}/repo/${LS_REPO}/ || : + cd ${TEMPDIR}/repo/${LS_REPO}/ + if ! grep -q '.jenkins-external' .gitignore 2>/dev/null; then + echo ".jenkins-external" >> .gitignore + git add .gitignore + fi + git add readme-vars.yml ${TEMPLATED_FILES} + git commit -m 'Bot Updating Templated Files' + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master + echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + else + echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + fi + mkdir -p ${TEMPDIR}/docs + git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation + if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]] && [[ (! -f ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/docs/docker-documentation/docs/images/ + cd ${TEMPDIR}/docs/docker-documentation + GH_DOCS_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||') + git add docs/images/docker-${CONTAINER_NAME}.md + git commit -m 'Bot Updating Documentation' + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} + fi + mkdir -p ${TEMPDIR}/unraid + git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates + git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates + if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-logo.png ]]; then + sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-logo.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml + elif [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then + sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml + fi + if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then + cd ${TEMPDIR}/unraid/templates/ + GH_TEMPLATES_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||') + if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then + echo "Image is on the ignore list, marking Unraid template as deprecated" + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ + git add -u unraid/${CONTAINER_NAME}.xml + git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || : + git commit -m 'Bot Moving Deprecated Unraid Template' || : + else + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ + git add unraid/${CONTAINER_NAME}.xml + git commit -m 'Bot Updating Unraid Template' + fi + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} + fi + # Stage 4 - Sync Readme to Docker Hub + if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]]; then + if [[ $(cat ${TEMPDIR}/docker-${CONTAINER_NAME}/README.md | wc -m) > 25000 ]]; then + echo "Readme is longer than 25,000 characters. Syncing the lite version to Docker Hub" + DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/README.lite" + else + echo "Syncing readme to Docker Hub" + DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/README.md" + fi + DH_TOKEN=$(curl -d '{"username":"'${DOCKERUSER}'", "password":"'${DOCKERHUB_TOKEN}'"}' -H "Content-Type: application/json" -X POST https://hub.docker.com/v2/users/login | jq -r '.token') + curl -s \ + -H "Authorization: JWT ${DH_TOKEN}" \ + -H "Content-Type: application/json" \ + -X PATCH \ + -d "{\\"full_description\\":$(jq -Rsa . ${DH_README_SYNC_PATH})}" \ + https://hub.docker.com/v2/repositories/${DOCKERHUB_IMAGE} || : + else + echo "Not the default Github branch. Skipping readme sync to Docker Hub." + fi + rm -Rf ${TEMPDIR}''' + script{ + env.FILES_UPDATED = sh( + script: '''cat /tmp/${COMMIT_SHA}-${BUILD_NUMBER}''', + returnStdout: true).trim() + } } } } @@ -560,7 +601,8 @@ pipeline { wait git add package_versions.txt git commit -m 'Bot Updating Package Versions' - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master echo "true" > /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER} echo "Package tag updated, stopping build process" else @@ -856,39 +898,6 @@ EOF ) ''' } } - // Use helper container to sync the current README on master to the dockerhub endpoint - stage('Sync-README') { - when { - environment name: 'CHANGE_ID', value: '' - environment name: 'EXIT_STATUS', value: '' - } - steps { - withCredentials([ - [ - $class: 'UsernamePasswordMultiBinding', - credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', - usernameVariable: 'DOCKERUSER', - passwordVariable: 'DOCKERPASS' - ] - ]) { - sh '''#! /bin/bash - set -e - TEMPDIR=$(mktemp -d) - docker pull ghcr.io/linuxserver/jenkins-builder:latest - docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH="${BRANCH_NAME}" -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest - docker pull ghcr.io/linuxserver/readme-sync - docker run --rm=true \ - -e DOCKERHUB_USERNAME=$DOCKERUSER \ - -e DOCKERHUB_PASSWORD=$DOCKERPASS \ - -e GIT_REPOSITORY=${LS_USER}/${LS_REPO} \ - -e DOCKER_REPOSITORY=${IMAGE} \ - -e GIT_BRANCH=master \ - -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/mnt \ - ghcr.io/linuxserver/readme-sync bash -c 'node sync' - rm -Rf ${TEMPDIR} ''' - } - } - } // If this is a Pull request send the CI link as a comment on it stage('Pull Request Comment') { when { From d7744c21df875472b6cb84d655ca9ec71041df5a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 13 Jan 2024 02:03:34 +0000 Subject: [PATCH 376/514] Bot Updating Templated Files --- README.md | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 37bda75..724f0f8 100644 --- a/README.md +++ b/README.md @@ -102,7 +102,6 @@ To help you get started creating a container from this image you can either use ```yaml --- -version: "2.1" services: plex: image: lscr.io/linuxserver/plex:latest @@ -251,7 +250,7 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to ## Updating Info -Most of our images are static, versioned, and require an image update and container recreation to update the app inside. With some exceptions (ie. nextcloud, plex), we do not recommend or support updating apps inside the container. Please consult the [Application Setup](#application-setup) section above to see if it is recommended for the image. +Most of our images are static, versioned, and require an image update and container recreation to update the app inside. With some exceptions (noted in the relevant readme.md), we do not recommend or support updating apps inside the container. Please consult the [Application Setup](#application-setup) section above to see if it is recommended for the image. Below are the instructions for updating containers: @@ -316,21 +315,6 @@ Below are the instructions for updating containers: docker image prune ``` -### Via Watchtower auto-updater (only use if you don't remember the original parameters) - -* Pull the latest image at its tag and replace it with the same env variables in one run: - - ```bash - docker run --rm \ - -v /var/run/docker.sock:/var/run/docker.sock \ - containrrr/watchtower \ - --run-once plex - ``` - -* You can also remove the old dangling images: `docker image prune` - -**warning**: We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using [Docker Compose](https://docs.linuxserver.io/general/docker-compose). - ### Image Update Notifications - Diun (Docker Image Update Notifier) **tip**: We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported. @@ -358,6 +342,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **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). * **03.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf) * **16.10.22:** - Rebase to jammy. Update to s6v3. Remove opencl packages (bundled with plex). From d20a2429e4a9b66bb5835cea7008e01131787ad5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 13 Jan 2024 02:06:22 +0000 Subject: [PATCH 377/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 608d418..21abbe9 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -104,7 +104,7 @@ libsemanage-common 3.3-1build2 deb libsemanage2 3.3-1build2 deb libsepol2 3.3-1build1 deb libsmartcols1 2.37.2-4ubuntu3 deb -libsqlite3-0 3.37.2-2ubuntu0.1 deb +libsqlite3-0 3.37.2-2ubuntu0.3 deb libss2 1.46.5-2ubuntu1.1 deb libssh-4 0.9.6-2ubuntu0.22.04.2 deb libssl3 3.0.2-0ubuntu1.10 deb From 0ae63a4bc562b57bed6b749b9ad0ff750be1c75f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 22 Jan 2024 09:20:00 +0000 Subject: [PATCH 378/514] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 21abbe9..5fc70b6 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -119,7 +119,7 @@ libunistring2 1.0-1 deb libuuid1 2.37.2-4ubuntu3 deb libxxhash0 0.8.1-1 deb libzstd1 1.4.8+dfsg-3build1 deb -locales 2.35-0ubuntu3.5 deb +locales 2.35-0ubuntu3.6 deb login 1:4.8.1-2ubuntu2.1 deb logsave 1.46.5-2ubuntu1.1 deb lsb-base 11.1.0ubuntu4 deb @@ -139,10 +139,10 @@ publicsuffix 20211207.1025-1 deb readline-common 8.1.2-1 deb sed 4.8-1ubuntu2 deb sensible-utils 0.0.17 deb -systemd-hwe-hwdb 249.11.4 deb +systemd-hwe-hwdb 249.11.5 deb sysvinit-utils 3.01-1ubuntu1 deb tar 1.34+dfsg-1ubuntu0.1.22.04.1 deb -tzdata 2023c-0ubuntu0.22.04.2 deb +tzdata 2023d-0ubuntu0.22.04 deb ubuntu-keyring 2021.03.26 deb udev 249.11-0ubuntu3.11 deb usrmerge 25ubuntu2 deb From e3027d6d978cc29c34694b8458ac649feea4819c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 29 Jan 2024 09:18:09 +0000 Subject: [PATCH 379/514] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 5fc70b6..18d883d 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -106,7 +106,7 @@ libsepol2 3.3-1build1 deb libsmartcols1 2.37.2-4ubuntu3 deb libsqlite3-0 3.37.2-2ubuntu0.3 deb libss2 1.46.5-2ubuntu1.1 deb -libssh-4 0.9.6-2ubuntu0.22.04.2 deb +libssh-4 0.9.6-2ubuntu0.22.04.3 deb libssl3 3.0.2-0ubuntu1.10 deb libstdc++6 12.1.0-2ubuntu1~22.04 deb libsystemd0 249.11-0ubuntu3.9 deb @@ -114,7 +114,7 @@ libtasn1-6 4.18.0-4build1 deb libtinfo6 6.3-2ubuntu0.1 deb libtirpc-common 1.3.2-2ubuntu0.1 deb libtirpc3 1.3.2-2ubuntu0.1 deb -libudev1 249.11-0ubuntu3.11 deb +libudev1 249.11-0ubuntu3.12 deb libunistring2 1.0-1 deb libuuid1 2.37.2-4ubuntu3 deb libxxhash0 0.8.1-1 deb @@ -144,7 +144,7 @@ sysvinit-utils 3.01-1ubuntu1 deb tar 1.34+dfsg-1ubuntu0.1.22.04.1 deb tzdata 2023d-0ubuntu0.22.04 deb ubuntu-keyring 2021.03.26 deb -udev 249.11-0ubuntu3.11 deb +udev 249.11-0ubuntu3.12 deb usrmerge 25ubuntu2 deb util-linux 2.37.2-4ubuntu3 deb wget 1.21.2-2ubuntu1 deb From 46f56aecf89aa2df9800aac7a9cfa7648b6445ed Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 5 Feb 2024 09:18:09 +0000 Subject: [PATCH 380/514] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 18d883d..4aff971 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -71,8 +71,8 @@ libkmod2 29-1ubuntu1 deb libkrb5-3 1.19.2-2ubuntu0.2 deb libkrb5support0 1.19.2-2ubuntu0.2 deb libksba8 1.6.0-2ubuntu0.2 deb -libldap-2.5-0 2.5.16+dfsg-0ubuntu0.22.04.1 deb -libldap-common 2.5.16+dfsg-0ubuntu0.22.04.1 deb +libldap-2.5-0 2.5.16+dfsg-0ubuntu0.22.04.2 deb +libldap-common 2.5.16+dfsg-0ubuntu0.22.04.2 deb liblz4-1 1.9.3-2build2 deb liblzma5 5.2.5-2ubuntu1 deb libmd0 1.0.4-1build1 deb @@ -129,7 +129,7 @@ ncurses-base 6.3-2ubuntu0.1 deb ncurses-bin 6.3-2ubuntu0.1 deb netcat 1.218-4ubuntu1 deb netcat-openbsd 1.218-4ubuntu1 deb -openssl 3.0.2-0ubuntu1.12 deb +openssl 3.0.2-0ubuntu1.13 deb passwd 1:4.8.1-2ubuntu2.1 deb perl-base 5.34.0-3ubuntu1.2 deb pinentry-curses 1.1.1-1build2 deb From 230cccde16900e0a8ed14cf09b0c1e26d993a976 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 12 Feb 2024 09:20:18 +0000 Subject: [PATCH 381/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 4aff971..ac976d6 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -129,7 +129,7 @@ ncurses-base 6.3-2ubuntu0.1 deb ncurses-bin 6.3-2ubuntu0.1 deb netcat 1.218-4ubuntu1 deb netcat-openbsd 1.218-4ubuntu1 deb -openssl 3.0.2-0ubuntu1.13 deb +openssl 3.0.2-0ubuntu1.14 deb passwd 1:4.8.1-2ubuntu2.1 deb perl-base 5.34.0-3ubuntu1.2 deb pinentry-curses 1.1.1-1build2 deb From c41c4b18157bcf599c00eacac9c5702cc9a415dd Mon Sep 17 00:00:00 2001 From: Roxedus <me@roxedus.dev> Date: Mon, 12 Feb 2024 19:07:45 +0100 Subject: [PATCH 382/514] Switch to readme_hwaccel --- README.md | 26 ++++++++++++++++---------- readme-vars.yml | 27 +++++---------------------- 2 files changed, 21 insertions(+), 32 deletions(-) diff --git a/README.md b/README.md index 724f0f8..01e953c 100644 --- a/README.md +++ b/README.md @@ -61,38 +61,43 @@ The architectures supported by this image are: Webui can be found at `<your-ip>:32400/web` -** Note about updates, if there is no value set for the VERSION variable, then no updates will take place.** +**note**: If there is no value set for the VERSION variable, then no updates will take place. -** For new users, no updates will take place on the first run of the container as there is no preferences file to read your token from, to update restart the Docker container after logging in through the webui** +**note**: For new users, no updates will take place on the first run of the container as there is no preferences file to read your token from, to update restart the Docker container after logging in through the webui. Valid settings for VERSION are:- -`IMPORTANT NOTE:- YOU CANNOT UPDATE TO A PLEXPASS ONLY (BETA) VERSION IF YOU ARE NOT LOGGED IN WITH A PLEXPASS ACCOUNT` +**info**: YOU CANNOT UPDATE TO A PLEXPASS ONLY (BETA) VERSION IF YOU ARE NOT LOGGED IN WITH A PLEXPASS ACCOUNT. + **`docker`**: Let Docker handle the Plex Version, we keep our Dockerhub Endpoint up to date with the latest public builds. This is the same as leaving this setting out of your create command. + **`latest`**: will update plex to the latest version available that you are entitled to. + **`public`**: will update plexpass users to the latest public version, useful for plexpass users that don't want to be on the bleeding edge but still want the latest public updates. + **`<specific-version>`**: will select a specific version (eg 0.9.12.4.1192-9a47d21) of plex to install, note you cannot use this to access plexpass versions if you do not have plexpass. -## Hardware Acceleration +### Hardware Acceleration -### Intel +Many desktop application will need access to a GPU to function properly and even some Desktop Environments have compisitor effects that will not function without a GPU. This is not a hard requirement and all base images will function without a video device mounted into the container. -Hardware acceleration users for Intel Quicksync will need to mount their /dev/dri video device inside of the container by passing the following command when running or creating the container: +#### Intel/ATI/AMD -``` +To leverage hardware acceleration you will need to mount /dev/dri video device inside of the container. + +```text --device=/dev/dri:/dev/dri ``` We will automatically ensure the abc user inside of the container has the proper permissions to access this device. -### Nvidia +#### Nvidia Hardware acceleration users for Nvidia will need to install the container runtime provided by Nvidia on their host, instructions can be found here: - https://github.com/NVIDIA/nvidia-docker -We automatically add the necessary environment variable that will utilise all the features available on a GPU on the host. Once nvidia-docker is installed on your host you will need to re/create the docker container with the nvidia container runtime `--runtime=nvidia` and add an environment variable `-e NVIDIA_VISIBLE_DEVICES=all` (can also be set to a specific gpu's UUID, this can be discovered by running `nvidia-smi --query-gpu=gpu_name,gpu_uuid --format=csv` ). NVIDIA automatically mounts the GPU and drivers from your host into the plex docker. +We automatically add the necessary environment variable that will utilise all the features available on a GPU on the host. Once nvidia-docker is installed on your host you will need to re/create the docker container with the nvidia container runtime `--runtime=nvidia` and add an environment variable `-e NVIDIA_VISIBLE_DEVICES=all` (can also be set to a specific gpu's UUID, this can be discovered by running `nvidia-smi --query-gpu=gpu_name,gpu_uuid --format=csv` ). NVIDIA automatically mounts the GPU and drivers from your host into the container. + +#### Arm Devices + +Best effort is made to install tools to allow mounting in /dev/dri on Arm devices. In most cases if /dev/dri exists on the host it should just work. If running a Raspberry Pi 4 be sure to enable `dtoverlay=vc4-fkms-v3d` in your usercfg.txt. ## Usage @@ -342,6 +347,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **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). * **03.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf) diff --git a/readme-vars.yml b/readme-vars.yml index f8a8d87..d37392e 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -61,40 +61,23 @@ app_setup_block_enabled: true app_setup_block: | Webui can be found at `<your-ip>:32400/web` - ** Note about updates, if there is no value set for the VERSION variable, then no updates will take place.** + ?+note[Updates](|If there is no value set for the VERSION variable, then no updates will take place.|) - ** For new users, no updates will take place on the first run of the container as there is no preferences file to read your token from, to update restart the Docker container after logging in through the webui** + ?+note[New users](|For new users, no updates will take place on the first run of the container as there is no preferences file to read your token from, to update restart the Docker container after logging in through the webui.|) Valid settings for VERSION are:- - `IMPORTANT NOTE:- YOU CANNOT UPDATE TO A PLEXPASS ONLY (BETA) VERSION IF YOU ARE NOT LOGGED IN WITH A PLEXPASS ACCOUNT` + ?+info[Plexpass](|YOU CANNOT UPDATE TO A PLEXPASS ONLY (BETA) VERSION IF YOU ARE NOT LOGGED IN WITH A PLEXPASS ACCOUNT.|) + **`docker`**: Let Docker handle the Plex Version, we keep our Dockerhub Endpoint up to date with the latest public builds. This is the same as leaving this setting out of your create command. + **`latest`**: will update plex to the latest version available that you are entitled to. + **`public`**: will update plexpass users to the latest public version, useful for plexpass users that don't want to be on the bleeding edge but still want the latest public updates. + **`<specific-version>`**: will select a specific version (eg 0.9.12.4.1192-9a47d21) of plex to install, note you cannot use this to access plexpass versions if you do not have plexpass. - ## Hardware Acceleration - - ### Intel - - Hardware acceleration users for Intel Quicksync will need to mount their /dev/dri video device inside of the container by passing the following command when running or creating the container: - - ``` - --device=/dev/dri:/dev/dri - ``` - - We will automatically ensure the abc user inside of the container has the proper permissions to access this device. - - ### Nvidia - - Hardware acceleration users for Nvidia will need to install the container runtime provided by Nvidia on their host, instructions can be found here: - - https://github.com/NVIDIA/nvidia-docker - - We automatically add the necessary environment variable that will utilise all the features available on a GPU on the host. Once nvidia-docker is installed on your host you will need to re/create the docker container with the nvidia container runtime `--runtime=nvidia` and add an environment variable `-e NVIDIA_VISIBLE_DEVICES=all` (can also be set to a specific gpu's UUID, this can be discovered by running `nvidia-smi --query-gpu=gpu_name,gpu_uuid --format=csv` ). NVIDIA automatically mounts the GPU and drivers from your host into the plex docker. +readme_hwaccel: true # changelog changelogs: + - {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)."} - {date: "03.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"} From f561004964cdb2cb06bdd2f6c9253b35c4c680c9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 13 Feb 2024 17:29:18 +0000 Subject: [PATCH 383/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index ac976d6..8e06ea2 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -133,7 +133,7 @@ openssl 3.0.2-0ubuntu1.14 deb passwd 1:4.8.1-2ubuntu2.1 deb perl-base 5.34.0-3ubuntu1.2 deb pinentry-curses 1.1.1-1build2 deb -plexmediaserver 1.32.8.7639-fb6452ebf deb +plexmediaserver 1.40.0.7998-c29d4c0c8 deb procps 2:3.3.17-6ubuntu2 deb publicsuffix 20211207.1025-1 deb readline-common 8.1.2-1 deb From 2b397aa4b54a25fee3a480d6184558074ced5005 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 26 Feb 2024 09:18:23 +0000 Subject: [PATCH 384/514] Bot Updating Templated Files --- Jenkinsfile | 297 +++++++++++++++++++++++++--------------------------- 1 file changed, 143 insertions(+), 154 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1d41743..5ca3a68 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -247,9 +247,11 @@ pipeline { -v ${WORKSPACE}:/mnt \ -e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \ -e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \ - ghcr.io/linuxserver/baseimage-alpine:3.17 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\ - apk add --no-cache py3-pip && \ - pip install s3cmd && \ + ghcr.io/linuxserver/baseimage-alpine:3.19 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\ + apk add --no-cache python3 && \ + python3 -m venv /lsiopy && \ + pip install --no-cache-dir -U pip && \ + pip install --no-cache-dir s3cmd && \ s3cmd put --no-preserve --acl-public -m text/xml /mnt/shellcheck-result.xml s3://ci-tests.linuxserver.io/${IMAGE}/${META_TAG}/shellcheck-result.xml" || :''' } } @@ -264,150 +266,149 @@ pipeline { } } steps { - withCredentials([ - [ - $class: 'UsernamePasswordMultiBinding', - credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', - usernameVariable: 'DOCKERUSER', - passwordVariable: 'DOCKERPASS' - ] - ]) { - sh '''#! /bin/bash - set -e - TEMPDIR=$(mktemp -d) - docker pull ghcr.io/linuxserver/jenkins-builder:latest - docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest - # Stage 1 - Jenkinsfile update - if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then - mkdir -p ${TEMPDIR}/repo - git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} - cd ${TEMPDIR}/repo/${LS_REPO} - git checkout -f master - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/ - git add Jenkinsfile - git commit -m 'Bot Updating Templated Files' - git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master - echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} - echo "Updating Jenkinsfile" - rm -Rf ${TEMPDIR} - exit 0 - else - echo "Jenkinsfile is up to date." + sh '''#! /bin/bash + set -e + TEMPDIR=$(mktemp -d) + docker pull ghcr.io/linuxserver/jenkins-builder:latest + docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest + # Stage 1 - Jenkinsfile update + if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then + mkdir -p ${TEMPDIR}/repo + git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} + cd ${TEMPDIR}/repo/${LS_REPO} + git checkout -f master + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/ + git add Jenkinsfile + git commit -m 'Bot Updating Templated Files' + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master + echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + echo "Updating Jenkinsfile" + rm -Rf ${TEMPDIR} + exit 0 + else + echo "Jenkinsfile is up to date." + fi + # Stage 2 - Delete old templates + OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml Dockerfile.armhf" + for i in ${OLD_TEMPLATES}; do + if [[ -f "${i}" ]]; then + TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}" fi - # Stage 2 - Delete old templates - OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml Dockerfile.armhf" - for i in ${OLD_TEMPLATES}; do - if [[ -f "${i}" ]]; then - TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}" - fi + done + if [[ -n "${TEMPLATES_TO_DELETE}" ]]; then + mkdir -p ${TEMPDIR}/repo + git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} + cd ${TEMPDIR}/repo/${LS_REPO} + git checkout -f master + for i in ${TEMPLATES_TO_DELETE}; do + git rm "${i}" done - if [[ -n "${TEMPLATES_TO_DELETE}" ]]; then - mkdir -p ${TEMPDIR}/repo - git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} - cd ${TEMPDIR}/repo/${LS_REPO} - git checkout -f master - for i in ${TEMPLATES_TO_DELETE}; do - git rm "${i}" - done - git commit -m 'Bot Updating Templated Files' - git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master - echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} - echo "Deleting old and deprecated templates" - rm -Rf ${TEMPDIR} - exit 0 - else - echo "No templates to delete" - fi - # Stage 3 - Update templates - CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) + git commit -m 'Bot Updating Templated Files' + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master + echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + echo "Deleting old and deprecated templates" + rm -Rf ${TEMPDIR} + exit 0 + else + echo "No templates to delete" + fi + # Stage 3 - Update templates + CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) + cd ${TEMPDIR}/docker-${CONTAINER_NAME} + NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) + if [[ "${CURRENTHASH}" != "${NEWHASH}" ]] || ! grep -q '.jenkins-external' "${WORKSPACE}/.gitignore" 2>/dev/null; then + mkdir -p ${TEMPDIR}/repo + git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} + cd ${TEMPDIR}/repo/${LS_REPO} + git checkout -f master cd ${TEMPDIR}/docker-${CONTAINER_NAME} - NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) - if [[ "${CURRENTHASH}" != "${NEWHASH}" ]] || ! grep -q '.jenkins-external' "${WORKSPACE}/.gitignore" 2>/dev/null; then - mkdir -p ${TEMPDIR}/repo - git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} - cd ${TEMPDIR}/repo/${LS_REPO} - git checkout -f master - cd ${TEMPDIR}/docker-${CONTAINER_NAME} - mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows - mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE - cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || : - cp --parents readme-vars.yml ${TEMPDIR}/repo/${LS_REPO}/ || : - cd ${TEMPDIR}/repo/${LS_REPO}/ - if ! grep -q '.jenkins-external' .gitignore 2>/dev/null; then - echo ".jenkins-external" >> .gitignore - git add .gitignore - fi - git add readme-vars.yml ${TEMPLATED_FILES} - git commit -m 'Bot Updating Templated Files' - git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master - echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows + mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE + cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || : + cp --parents readme-vars.yml ${TEMPDIR}/repo/${LS_REPO}/ || : + cd ${TEMPDIR}/repo/${LS_REPO}/ + if ! grep -q '.jenkins-external' .gitignore 2>/dev/null; then + echo ".jenkins-external" >> .gitignore + git add .gitignore + fi + git add readme-vars.yml ${TEMPLATED_FILES} + git commit -m 'Bot Updating Templated Files' + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master + echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + else + echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + fi + mkdir -p ${TEMPDIR}/docs + git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation + if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]] && [[ (! -f ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/docs/docker-documentation/docs/images/ + cd ${TEMPDIR}/docs/docker-documentation + GH_DOCS_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||') + git add docs/images/docker-${CONTAINER_NAME}.md + git commit -m 'Bot Updating Documentation' + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} --rebase + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} || \ + (MAXWAIT="10" && echo "Push to docs failed, trying again in ${MAXWAIT} seconds" && \ + sleep $((RANDOM % MAXWAIT)) && \ + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} --rebase && \ + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH}) + fi + mkdir -p ${TEMPDIR}/unraid + git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates + git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates + if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-logo.png ]]; then + sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-logo.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml + elif [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then + sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml + fi + if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then + cd ${TEMPDIR}/unraid/templates/ + GH_TEMPLATES_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||') + if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then + echo "Image is on the ignore list, marking Unraid template as deprecated" + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ + git add -u unraid/${CONTAINER_NAME}.xml + git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || : + git commit -m 'Bot Moving Deprecated Unraid Template' || : else - echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ + git add unraid/${CONTAINER_NAME}.xml + git commit -m 'Bot Updating Unraid Template' fi - mkdir -p ${TEMPDIR}/docs - git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation - if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]] && [[ (! -f ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/docs/docker-documentation/docs/images/ - cd ${TEMPDIR}/docs/docker-documentation - GH_DOCS_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||') - git add docs/images/docker-${CONTAINER_NAME}.md - git commit -m 'Bot Updating Documentation' - git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} - fi - mkdir -p ${TEMPDIR}/unraid - git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates - git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates - if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-logo.png ]]; then - sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-logo.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml - elif [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then - sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml - fi - if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then - cd ${TEMPDIR}/unraid/templates/ - GH_TEMPLATES_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||') - if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then - echo "Image is on the ignore list, marking Unraid template as deprecated" - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ - git add -u unraid/${CONTAINER_NAME}.xml - git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || : - git commit -m 'Bot Moving Deprecated Unraid Template' || : - else - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ - git add unraid/${CONTAINER_NAME}.xml - git commit -m 'Bot Updating Unraid Template' - fi - git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} - fi - # Stage 4 - Sync Readme to Docker Hub - if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]]; then - if [[ $(cat ${TEMPDIR}/docker-${CONTAINER_NAME}/README.md | wc -m) > 25000 ]]; then - echo "Readme is longer than 25,000 characters. Syncing the lite version to Docker Hub" - DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/README.lite" - else - echo "Syncing readme to Docker Hub" - DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/README.md" - fi - DH_TOKEN=$(curl -d '{"username":"'${DOCKERUSER}'", "password":"'${DOCKERHUB_TOKEN}'"}' -H "Content-Type: application/json" -X POST https://hub.docker.com/v2/users/login | jq -r '.token') - curl -s \ - -H "Authorization: JWT ${DH_TOKEN}" \ - -H "Content-Type: application/json" \ - -X PATCH \ - -d "{\\"full_description\\":$(jq -Rsa . ${DH_README_SYNC_PATH})}" \ - https://hub.docker.com/v2/repositories/${DOCKERHUB_IMAGE} || : + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} --rebase + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} || \ + (MAXWAIT="10" && echo "Push to unraid templates failed, trying again in ${MAXWAIT} seconds" && \ + sleep $((RANDOM % MAXWAIT)) && \ + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} --rebase && \ + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH}) + fi + # Stage 4 - Sync Readme to Docker Hub + if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]]; then + if [[ $(cat ${TEMPDIR}/docker-${CONTAINER_NAME}/README.md | wc -m) > 25000 ]]; then + echo "Readme is longer than 25,000 characters. Syncing the lite version to Docker Hub" + DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/README.lite" else - echo "Not the default Github branch. Skipping readme sync to Docker Hub." + echo "Syncing readme to Docker Hub" + DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/README.md" fi - rm -Rf ${TEMPDIR}''' - script{ - env.FILES_UPDATED = sh( - script: '''cat /tmp/${COMMIT_SHA}-${BUILD_NUMBER}''', - returnStdout: true).trim() - } + DH_TOKEN=$(curl -d '{"username":"linuxserverci", "password":"'${DOCKERHUB_TOKEN}'"}' -H "Content-Type: application/json" -X POST https://hub.docker.com/v2/users/login | jq -r '.token') + curl -s \ + -H "Authorization: JWT ${DH_TOKEN}" \ + -H "Content-Type: application/json" \ + -X PATCH \ + -d "{\\"full_description\\":$(jq -Rsa . ${DH_README_SYNC_PATH})}" \ + https://hub.docker.com/v2/repositories/${DOCKERHUB_IMAGE} || : + else + echo "Not the default Github branch. Skipping readme sync to Docker Hub." + fi + rm -Rf ${TEMPDIR}''' + script{ + env.FILES_UPDATED = sh( + script: '''cat /tmp/${COMMIT_SHA}-${BUILD_NUMBER}''', + returnStdout: true).trim() } } } @@ -705,12 +706,6 @@ pipeline { } steps { withCredentials([ - [ - $class: 'UsernamePasswordMultiBinding', - credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', - usernameVariable: 'DOCKERUSER', - passwordVariable: 'DOCKERPASS' - ], [ $class: 'UsernamePasswordMultiBinding', credentialsId: 'Quay.io-Robot', @@ -721,7 +716,7 @@ pipeline { retry(5) { sh '''#! /bin/bash set -e - echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin + echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin @@ -752,12 +747,6 @@ pipeline { } steps { withCredentials([ - [ - $class: 'UsernamePasswordMultiBinding', - credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', - usernameVariable: 'DOCKERUSER', - passwordVariable: 'DOCKERPASS' - ], [ $class: 'UsernamePasswordMultiBinding', credentialsId: 'Quay.io-Robot', @@ -768,7 +757,7 @@ pipeline { retry(5) { sh '''#! /bin/bash set -e - echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin + echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin From 094a15b4aae87e94988057c4fc266d595363e8c4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 26 Feb 2024 09:21:56 +0000 Subject: [PATCH 385/514] Bot Updating Templated Files --- .github/ISSUE_TEMPLATE/issue.bug.yml | 4 ++-- .github/workflows/external_trigger.yml | 2 +- .github/workflows/external_trigger_scheduler.yml | 2 +- .github/workflows/package_trigger.yml | 2 +- .github/workflows/package_trigger_scheduler.yml | 2 +- README.md | 6 +++--- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/issue.bug.yml b/.github/ISSUE_TEMPLATE/issue.bug.yml index ce3d19a..6c6659a 100755 --- a/.github/ISSUE_TEMPLATE/issue.bug.yml +++ b/.github/ISSUE_TEMPLATE/issue.bug.yml @@ -67,10 +67,10 @@ body: - type: textarea attributes: description: | - Provide a full docker log, output of "docker logs linuxserver.io" + Provide a full docker log, output of "docker logs plex" label: Container logs placeholder: | - Output of `docker logs linuxserver.io` + Output of `docker logs plex` render: bash validations: required: true diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 3323f8e..2c00913 100644 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -7,7 +7,7 @@ jobs: external-trigger-master: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.1.0 + - uses: actions/checkout@v4.1.1 - name: External Trigger if: github.ref == 'refs/heads/master' diff --git a/.github/workflows/external_trigger_scheduler.yml b/.github/workflows/external_trigger_scheduler.yml index c12a6ac..c48d8ed 100644 --- a/.github/workflows/external_trigger_scheduler.yml +++ b/.github/workflows/external_trigger_scheduler.yml @@ -9,7 +9,7 @@ jobs: external-trigger-scheduler: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.1.0 + - uses: actions/checkout@v4.1.1 with: fetch-depth: '0' diff --git a/.github/workflows/package_trigger.yml b/.github/workflows/package_trigger.yml index c6e55ef..42a5652 100644 --- a/.github/workflows/package_trigger.yml +++ b/.github/workflows/package_trigger.yml @@ -7,7 +7,7 @@ jobs: package-trigger-master: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.1.0 + - uses: actions/checkout@v4.1.1 - name: Package Trigger if: github.ref == 'refs/heads/master' diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml index 47a72fb..fb3926a 100644 --- a/.github/workflows/package_trigger_scheduler.yml +++ b/.github/workflows/package_trigger_scheduler.yml @@ -9,7 +9,7 @@ jobs: package-trigger-scheduler: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.1.0 + - uses: actions/checkout@v4.1.1 with: fetch-depth: '0' diff --git a/README.md b/README.md index 01e953c..9277b97 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,7 @@ Valid settings for VERSION are:- ### Hardware Acceleration -Many desktop application will need access to a GPU to function properly and even some Desktop Environments have compisitor effects that will not function without a GPU. This is not a hard requirement and all base images will function without a video device mounted into the container. +Many desktop applications need access to a GPU to function properly and even some Desktop Environments have compositor effects that will not function without a GPU. However this is not a hard requirement and all base images will function without a video device mounted into the container. #### Intel/ATI/AMD @@ -91,9 +91,9 @@ We will automatically ensure the abc user inside of the container has the proper #### Nvidia Hardware acceleration users for Nvidia will need to install the container runtime provided by Nvidia on their host, instructions can be found here: -https://github.com/NVIDIA/nvidia-docker +https://github.com/NVIDIA/nvidia-container-toolkit -We automatically add the necessary environment variable that will utilise all the features available on a GPU on the host. Once nvidia-docker is installed on your host you will need to re/create the docker container with the nvidia container runtime `--runtime=nvidia` and add an environment variable `-e NVIDIA_VISIBLE_DEVICES=all` (can also be set to a specific gpu's UUID, this can be discovered by running `nvidia-smi --query-gpu=gpu_name,gpu_uuid --format=csv` ). NVIDIA automatically mounts the GPU and drivers from your host into the container. +We automatically add the necessary environment variable that will utilise all the features available on a GPU on the host. Once nvidia-container-toolkit is installed on your host you will need to re/create the docker container with the nvidia container runtime `--runtime=nvidia` and add an environment variable `-e NVIDIA_VISIBLE_DEVICES=all` (can also be set to a specific gpu's UUID, this can be discovered by running `nvidia-smi --query-gpu=gpu_name,gpu_uuid --format=csv` ). NVIDIA automatically mounts the GPU and drivers from your host into the container. #### Arm Devices From 53f70c08bcc78ee43a5adada00779e1fbfda479b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 4 Mar 2024 11:11:30 +0000 Subject: [PATCH 386/514] Bot Updating Package Versions --- package_versions.txt | 302 +++++++++++++++++++++---------------------- 1 file changed, 151 insertions(+), 151 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 8e06ea2..27e1cb2 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,151 +1,151 @@ -NAME VERSION TYPE -adduser 3.118ubuntu5 deb -apt 2.4.11 deb -apt-utils 2.4.11 deb -base-files 12ubuntu4.3 deb -base-passwd 3.5.52build1 deb -bash 5.1-6ubuntu1 deb -bash 5.1.16 binary -bsdutils 1:2.37.2-4ubuntu3 deb -ca-certificates 20230311ubuntu0.22.04.1 deb -coreutils 8.32-4.1ubuntu1 deb -cron 3.0pl1-137ubuntu3 deb -curl 7.81.0-1ubuntu1.15 deb -dash 0.5.11+git20210903+057cd650a4ed-3build1 deb -debconf 1.5.79ubuntu1 deb -debianutils 5.5-1ubuntu2 deb -diffutils 1:3.8-0ubuntu2 deb -dirmngr 2.2.27-3ubuntu2.1 deb -dpkg 1.21.1ubuntu2.2 deb -e2fsprogs 1.46.5-2ubuntu1.1 deb -findutils 4.8.0-1ubuntu3 deb -gcc-12-base 12.1.0-2ubuntu1~22.04 deb -gnupg 2.2.27-3ubuntu2.1 deb -gnupg-l10n 2.2.27-3ubuntu2.1 deb -gnupg-utils 2.2.27-3ubuntu2.1 deb -gpg 2.2.27-3ubuntu2.1 deb -gpg-agent 2.2.27-3ubuntu2.1 deb -gpg-wks-client 2.2.27-3ubuntu2.1 deb -gpg-wks-server 2.2.27-3ubuntu2.1 deb -gpgconf 2.2.27-3ubuntu2.1 deb -gpgsm 2.2.27-3ubuntu2.1 deb -gpgv 2.2.27-3ubuntu2.1 deb -grep 3.7-1build1 deb -gzip 1.10-4ubuntu4.1 deb -hostname 3.23ubuntu2 deb -init-system-helpers 1.62 deb -jq 1.6-2.1ubuntu3 deb -libacl1 2.3.1-1 deb -libapt-pkg6.0 2.4.11 deb -libassuan0 2.5.5-1build1 deb -libattr1 1:2.5.1-1build1 deb -libaudit-common 1:3.0.7-1build1 deb -libaudit1 1:3.0.7-1build1 deb -libblkid1 2.37.2-4ubuntu3 deb -libbrotli1 1.0.9-2build6 deb -libbsd0 0.11.5-1 deb -libbz2-1.0 1.0.8-5build1 deb -libc-bin 2.35-0ubuntu3.1 deb -libc6 2.35-0ubuntu3.1 deb -libcap-ng0 0.7.9-2.2build3 deb -libcap2 1:2.44-1ubuntu0.22.04.1 deb -libcom-err2 1.46.5-2ubuntu1.1 deb -libcrypt1 1:4.4.27-1 deb -libcurl4 7.81.0-1ubuntu1.15 deb -libdb5.3 5.3.28+dfsg1-0.8ubuntu3 deb -libdebconfclient0 0.261ubuntu1 deb -libext2fs2 1.46.5-2ubuntu1.1 deb -libffi8 3.4.2-4 deb -libgcc-s1 12.1.0-2ubuntu1~22.04 deb -libgcrypt20 1.9.4-3ubuntu3 deb -libgmp10 2:6.2.1+dfsg-3ubuntu1 deb -libgnutls30 3.7.3-4ubuntu1.2 deb -libgpg-error0 1.43-3 deb -libgssapi-krb5-2 1.19.2-2ubuntu0.2 deb -libhogweed6 3.7.3-1build2 deb -libidn2-0 2.3.2-2build1 deb -libjq1 1.6-2.1ubuntu3 deb -libk5crypto3 1.19.2-2ubuntu0.2 deb -libkeyutils1 1.6.1-2ubuntu3 deb -libkmod2 29-1ubuntu1 deb -libkrb5-3 1.19.2-2ubuntu0.2 deb -libkrb5support0 1.19.2-2ubuntu0.2 deb -libksba8 1.6.0-2ubuntu0.2 deb -libldap-2.5-0 2.5.16+dfsg-0ubuntu0.22.04.2 deb -libldap-common 2.5.16+dfsg-0ubuntu0.22.04.2 deb -liblz4-1 1.9.3-2build2 deb -liblzma5 5.2.5-2ubuntu1 deb -libmd0 1.0.4-1build1 deb -libmount1 2.37.2-4ubuntu3 deb -libncurses6 6.3-2ubuntu0.1 deb -libncursesw6 6.3-2ubuntu0.1 deb -libnettle8 3.7.3-1build2 deb -libnghttp2-14 1.43.0-1ubuntu0.1 deb -libnpth0 1.6-3build2 deb -libnsl2 1.3.0-2build2 deb -libonig5 6.9.7.1-2build1 deb -libp11-kit0 0.24.0-6build1 deb -libpam-modules 1.4.0-11ubuntu2.3 deb -libpam-modules-bin 1.4.0-11ubuntu2.3 deb -libpam-runtime 1.4.0-11ubuntu2.3 deb -libpam0g 1.4.0-11ubuntu2.3 deb -libpcre2-8-0 10.39-3ubuntu0.1 deb -libpcre3 2:8.39-13ubuntu0.22.04.1 deb -libprocps8 2:3.3.17-6ubuntu2 deb -libpsl5 0.21.0-1.2build2 deb -libreadline8 8.1.2-1 deb -librtmp1 2.4+20151223.gitfa8646d.1-2build4 deb -libsasl2-2 2.1.27+dfsg2-3ubuntu1.2 deb -libsasl2-modules 2.1.27+dfsg2-3ubuntu1.2 deb -libsasl2-modules-db 2.1.27+dfsg2-3ubuntu1.2 deb -libseccomp2 2.5.3-2ubuntu2 deb -libselinux1 3.3-1build2 deb -libsemanage-common 3.3-1build2 deb -libsemanage2 3.3-1build2 deb -libsepol2 3.3-1build1 deb -libsmartcols1 2.37.2-4ubuntu3 deb -libsqlite3-0 3.37.2-2ubuntu0.3 deb -libss2 1.46.5-2ubuntu1.1 deb -libssh-4 0.9.6-2ubuntu0.22.04.3 deb -libssl3 3.0.2-0ubuntu1.10 deb -libstdc++6 12.1.0-2ubuntu1~22.04 deb -libsystemd0 249.11-0ubuntu3.9 deb -libtasn1-6 4.18.0-4build1 deb -libtinfo6 6.3-2ubuntu0.1 deb -libtirpc-common 1.3.2-2ubuntu0.1 deb -libtirpc3 1.3.2-2ubuntu0.1 deb -libudev1 249.11-0ubuntu3.12 deb -libunistring2 1.0-1 deb -libuuid1 2.37.2-4ubuntu3 deb -libxxhash0 0.8.1-1 deb -libzstd1 1.4.8+dfsg-3build1 deb -locales 2.35-0ubuntu3.6 deb -login 1:4.8.1-2ubuntu2.1 deb -logsave 1.46.5-2ubuntu1.1 deb -lsb-base 11.1.0ubuntu4 deb -mawk 1.3.4.20200120-3 deb -mount 2.37.2-4ubuntu3 deb -ncurses-base 6.3-2ubuntu0.1 deb -ncurses-bin 6.3-2ubuntu0.1 deb -netcat 1.218-4ubuntu1 deb -netcat-openbsd 1.218-4ubuntu1 deb -openssl 3.0.2-0ubuntu1.14 deb -passwd 1:4.8.1-2ubuntu2.1 deb -perl-base 5.34.0-3ubuntu1.2 deb -pinentry-curses 1.1.1-1build2 deb -plexmediaserver 1.40.0.7998-c29d4c0c8 deb -procps 2:3.3.17-6ubuntu2 deb -publicsuffix 20211207.1025-1 deb -readline-common 8.1.2-1 deb -sed 4.8-1ubuntu2 deb -sensible-utils 0.0.17 deb -systemd-hwe-hwdb 249.11.5 deb -sysvinit-utils 3.01-1ubuntu1 deb -tar 1.34+dfsg-1ubuntu0.1.22.04.1 deb -tzdata 2023d-0ubuntu0.22.04 deb -ubuntu-keyring 2021.03.26 deb -udev 249.11-0ubuntu3.12 deb -usrmerge 25ubuntu2 deb -util-linux 2.37.2-4ubuntu3 deb -wget 1.21.2-2ubuntu1 deb -zlib1g 1:1.2.11.dfsg-2ubuntu9.2 deb +NAME VERSION TYPE +adduser 3.118ubuntu5 deb +apt 2.4.11 deb +apt-utils 2.4.11 deb +base-files 12ubuntu4.3 deb +base-passwd 3.5.52build1 deb +bash 5.1-6ubuntu1 deb +bash 5.1.16 binary +bsdutils 1:2.37.2-4ubuntu3 deb +ca-certificates 20230311ubuntu0.22.04.1 deb +coreutils 8.32-4.1ubuntu1 deb +cron 3.0pl1-137ubuntu3 deb +curl 7.81.0-1ubuntu1.15 deb +dash 0.5.11+git20210903+057cd650a4ed-3build1 deb +debconf 1.5.79ubuntu1 deb +debianutils 5.5-1ubuntu2 deb +diffutils 1:3.8-0ubuntu2 deb +dirmngr 2.2.27-3ubuntu2.1 deb +dpkg 1.21.1ubuntu2.2 deb +e2fsprogs 1.46.5-2ubuntu1.1 deb +findutils 4.8.0-1ubuntu3 deb +gcc-12-base 12.1.0-2ubuntu1~22.04 deb +gnupg 2.2.27-3ubuntu2.1 deb +gnupg-l10n 2.2.27-3ubuntu2.1 deb +gnupg-utils 2.2.27-3ubuntu2.1 deb +gpg 2.2.27-3ubuntu2.1 deb +gpg-agent 2.2.27-3ubuntu2.1 deb +gpg-wks-client 2.2.27-3ubuntu2.1 deb +gpg-wks-server 2.2.27-3ubuntu2.1 deb +gpgconf 2.2.27-3ubuntu2.1 deb +gpgsm 2.2.27-3ubuntu2.1 deb +gpgv 2.2.27-3ubuntu2.1 deb +grep 3.7-1build1 deb +gzip 1.10-4ubuntu4.1 deb +hostname 3.23ubuntu2 deb +init-system-helpers 1.62 deb +jq 1.6-2.1ubuntu3 deb +libacl1 2.3.1-1 deb +libapt-pkg6.0 2.4.11 deb +libassuan0 2.5.5-1build1 deb +libattr1 1:2.5.1-1build1 deb +libaudit-common 1:3.0.7-1build1 deb +libaudit1 1:3.0.7-1build1 deb +libblkid1 2.37.2-4ubuntu3 deb +libbrotli1 1.0.9-2build6 deb +libbsd0 0.11.5-1 deb +libbz2-1.0 1.0.8-5build1 deb +libc-bin 2.35-0ubuntu3.1 deb +libc6 2.35-0ubuntu3.1 deb +libcap-ng0 0.7.9-2.2build3 deb +libcap2 1:2.44-1ubuntu0.22.04.1 deb +libcom-err2 1.46.5-2ubuntu1.1 deb +libcrypt1 1:4.4.27-1 deb +libcurl4 7.81.0-1ubuntu1.15 deb +libdb5.3 5.3.28+dfsg1-0.8ubuntu3 deb +libdebconfclient0 0.261ubuntu1 deb +libext2fs2 1.46.5-2ubuntu1.1 deb +libffi8 3.4.2-4 deb +libgcc-s1 12.1.0-2ubuntu1~22.04 deb +libgcrypt20 1.9.4-3ubuntu3 deb +libgmp10 2:6.2.1+dfsg-3ubuntu1 deb +libgnutls30 3.7.3-4ubuntu1.2 deb +libgpg-error0 1.43-3 deb +libgssapi-krb5-2 1.19.2-2ubuntu0.2 deb +libhogweed6 3.7.3-1build2 deb +libidn2-0 2.3.2-2build1 deb +libjq1 1.6-2.1ubuntu3 deb +libk5crypto3 1.19.2-2ubuntu0.2 deb +libkeyutils1 1.6.1-2ubuntu3 deb +libkmod2 29-1ubuntu1 deb +libkrb5-3 1.19.2-2ubuntu0.2 deb +libkrb5support0 1.19.2-2ubuntu0.2 deb +libksba8 1.6.0-2ubuntu0.2 deb +libldap-2.5-0 2.5.16+dfsg-0ubuntu0.22.04.2 deb +libldap-common 2.5.16+dfsg-0ubuntu0.22.04.2 deb +liblz4-1 1.9.3-2build2 deb +liblzma5 5.2.5-2ubuntu1 deb +libmd0 1.0.4-1build1 deb +libmount1 2.37.2-4ubuntu3 deb +libncurses6 6.3-2ubuntu0.1 deb +libncursesw6 6.3-2ubuntu0.1 deb +libnettle8 3.7.3-1build2 deb +libnghttp2-14 1.43.0-1ubuntu0.1 deb +libnpth0 1.6-3build2 deb +libnsl2 1.3.0-2build2 deb +libonig5 6.9.7.1-2build1 deb +libp11-kit0 0.24.0-6build1 deb +libpam-modules 1.4.0-11ubuntu2.3 deb +libpam-modules-bin 1.4.0-11ubuntu2.3 deb +libpam-runtime 1.4.0-11ubuntu2.3 deb +libpam0g 1.4.0-11ubuntu2.3 deb +libpcre2-8-0 10.39-3ubuntu0.1 deb +libpcre3 2:8.39-13ubuntu0.22.04.1 deb +libprocps8 2:3.3.17-6ubuntu2 deb +libpsl5 0.21.0-1.2build2 deb +libreadline8 8.1.2-1 deb +librtmp1 2.4+20151223.gitfa8646d.1-2build4 deb +libsasl2-2 2.1.27+dfsg2-3ubuntu1.2 deb +libsasl2-modules 2.1.27+dfsg2-3ubuntu1.2 deb +libsasl2-modules-db 2.1.27+dfsg2-3ubuntu1.2 deb +libseccomp2 2.5.3-2ubuntu2 deb +libselinux1 3.3-1build2 deb +libsemanage-common 3.3-1build2 deb +libsemanage2 3.3-1build2 deb +libsepol2 3.3-1build1 deb +libsmartcols1 2.37.2-4ubuntu3 deb +libsqlite3-0 3.37.2-2ubuntu0.3 deb +libss2 1.46.5-2ubuntu1.1 deb +libssh-4 0.9.6-2ubuntu0.22.04.3 deb +libssl3 3.0.2-0ubuntu1.10 deb +libstdc++6 12.1.0-2ubuntu1~22.04 deb +libsystemd0 249.11-0ubuntu3.9 deb +libtasn1-6 4.18.0-4build1 deb +libtinfo6 6.3-2ubuntu0.1 deb +libtirpc-common 1.3.2-2ubuntu0.1 deb +libtirpc3 1.3.2-2ubuntu0.1 deb +libudev1 249.11-0ubuntu3.12 deb +libunistring2 1.0-1 deb +libuuid1 2.37.2-4ubuntu3 deb +libxxhash0 0.8.1-1 deb +libzstd1 1.4.8+dfsg-3build1 deb +locales 2.35-0ubuntu3.6 deb +login 1:4.8.1-2ubuntu2.1 deb +logsave 1.46.5-2ubuntu1.1 deb +lsb-base 11.1.0ubuntu4 deb +mawk 1.3.4.20200120-3 deb +mount 2.37.2-4ubuntu3 deb +ncurses-base 6.3-2ubuntu0.1 deb +ncurses-bin 6.3-2ubuntu0.1 deb +netcat 1.218-4ubuntu1 deb +netcat-openbsd 1.218-4ubuntu1 deb +openssl 3.0.2-0ubuntu1.15 deb +passwd 1:4.8.1-2ubuntu2.1 deb +perl-base 5.34.0-3ubuntu1.2 deb +pinentry-curses 1.1.1-1build2 deb +plexmediaserver 1.40.0.7998-c29d4c0c8 deb +procps 2:3.3.17-6ubuntu2 deb +publicsuffix 20211207.1025-1 deb +readline-common 8.1.2-1 deb +sed 4.8-1ubuntu2 deb +sensible-utils 0.0.17 deb +systemd-hwe-hwdb 249.11.5 deb +sysvinit-utils 3.01-1ubuntu1 deb +tar 1.34+dfsg-1ubuntu0.1.22.04.1 deb +tzdata 2023d-0ubuntu0.22.04 deb +ubuntu-keyring 2021.03.26 deb +udev 249.11-0ubuntu3.12 deb +usrmerge 25ubuntu2 deb +util-linux 2.37.2-4ubuntu3 deb +wget 1.21.2-2ubuntu1 deb +zlib1g 1:1.2.11.dfsg-2ubuntu9.2 deb From 90e8122203c59b36659f12e4b57535a246bba0d6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 11 Mar 2024 09:19:18 +0000 Subject: [PATCH 387/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 27e1cb2..8461be4 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -142,7 +142,7 @@ sensible-utils 0.0.17 deb systemd-hwe-hwdb 249.11.5 deb sysvinit-utils 3.01-1ubuntu1 deb tar 1.34+dfsg-1ubuntu0.1.22.04.1 deb -tzdata 2023d-0ubuntu0.22.04 deb +tzdata 2024a-0ubuntu0.22.04 deb ubuntu-keyring 2021.03.26 deb udev 249.11-0ubuntu3.12 deb usrmerge 25ubuntu2 deb From fdf0d7700aca4c47ce972a9fcf41a8f7a4f05d97 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 14 Mar 2024 21:22:19 +0000 Subject: [PATCH 388/514] Bot Updating Templated Files --- Jenkinsfile | 61 +++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 45 insertions(+), 16 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5ca3a68..5d7a8d5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -270,8 +270,15 @@ pipeline { set -e TEMPDIR=$(mktemp -d) docker pull ghcr.io/linuxserver/jenkins-builder:latest - docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest - # Stage 1 - Jenkinsfile update + # Cloned repo paths for templating: + # ${TEMPDIR}/docker-${CONTAINER_NAME}: Cloned branch master of ${LS_USER}/${LS_REPO} for running the jenkins builder on + # ${TEMPDIR}/repo/${LS_REPO}: Cloned branch master of ${LS_USER}/${LS_REPO} for commiting various templated file changes and pushing back to Github + # ${TEMPDIR}/docs/docker-documentation: Cloned docs repo for pushing docs updates to Github + # ${TEMPDIR}/unraid/docker-templates: Cloned docker-templates repo to check for logos + # ${TEMPDIR}/unraid/templates: Cloned templates repo for commiting unraid template changes and pushing back to Github + git clone --branch master --depth 1 https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/docker-${CONTAINER_NAME} + docker run --rm -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/tmp -e LOCAL=true ghcr.io/linuxserver/jenkins-builder:latest + echo "Starting Stage 1 - Jenkinsfile update" if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then mkdir -p ${TEMPDIR}/repo git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} @@ -283,13 +290,13 @@ pipeline { git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} - echo "Updating Jenkinsfile" + echo "Updating Jenkinsfile and exiting build, new one will trigger based on commit" rm -Rf ${TEMPDIR} exit 0 else echo "Jenkinsfile is up to date." fi - # Stage 2 - Delete old templates + echo "Starting Stage 2 - Delete old templates" OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml Dockerfile.armhf" for i in ${OLD_TEMPLATES}; do if [[ -f "${i}" ]]; then @@ -308,13 +315,13 @@ pipeline { git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} - echo "Deleting old and deprecated templates" + echo "Deleting old/deprecated templates and exiting build, new one will trigger based on commit" rm -Rf ${TEMPDIR} exit 0 else echo "No templates to delete" fi - # Stage 3 - Update templates + echo "Starting Stage 3 - Update templates" CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) cd ${TEMPDIR}/docker-${CONTAINER_NAME} NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) @@ -338,9 +345,14 @@ pipeline { git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + echo "Updating templates and exiting build, new one will trigger based on commit" + rm -Rf ${TEMPDIR} + exit 0 else echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + echo "No templates to update" fi + echo "Starting Stage 4 - External repo updates: Docs, Unraid Template and Readme Sync to Docker Hub" mkdir -p ${TEMPDIR}/docs git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]] && [[ (! -f ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then @@ -348,6 +360,7 @@ pipeline { cd ${TEMPDIR}/docs/docker-documentation GH_DOCS_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||') git add docs/images/docker-${CONTAINER_NAME}.md + echo "Updating docs repo" git commit -m 'Bot Updating Documentation' git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} --rebase git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} || \ @@ -355,6 +368,8 @@ pipeline { sleep $((RANDOM % MAXWAIT)) && \ git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} --rebase && \ git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH}) + else + echo "Docs update not needed, skipping" fi mkdir -p ${TEMPDIR}/unraid git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates @@ -365,6 +380,7 @@ pipeline { sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml fi if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then + echo "Updating Unraid template" cd ${TEMPDIR}/unraid/templates/ GH_TEMPLATES_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||') if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then @@ -384,16 +400,27 @@ pipeline { sleep $((RANDOM % MAXWAIT)) && \ git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} --rebase && \ git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH}) + else + echo "No updates to Unraid template needed, skipping" fi - # Stage 4 - Sync Readme to Docker Hub if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]]; then - if [[ $(cat ${TEMPDIR}/docker-${CONTAINER_NAME}/README.md | wc -m) > 25000 ]]; then + if [[ $(cat ${TEMPDIR}/docker-${CONTAINER_NAME}/README.md | wc -m) -gt 25000 ]]; then echo "Readme is longer than 25,000 characters. Syncing the lite version to Docker Hub" DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/README.lite" else echo "Syncing readme to Docker Hub" DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/README.md" fi + if curl -s https://hub.docker.com/v2/namespaces/${DOCKERHUB_IMAGE%%/*}/repositories/${DOCKERHUB_IMAGE##*/}/tags | jq -r '.message' | grep -q 404; then + echo "Docker Hub endpoint doesn't exist. Creating endpoint first." + DH_TOKEN=$(curl -d '{"username":"linuxserverci", "password":"'${DOCKERHUB_TOKEN}'"}' -H "Content-Type: application/json" -X POST https://hub.docker.com/v2/users/login | jq -r '.token') + curl -s \ + -H "Authorization: JWT ${DH_TOKEN}" \ + -H "Content-Type: application/json" \ + -X POST \ + -d '{"name":"'${DOCKERHUB_IMAGE##*/}'", "namespace":"'${DOCKERHUB_IMAGE%%/*}'"}' \ + https://hub.docker.com/v2/repositories/ || : + fi DH_TOKEN=$(curl -d '{"username":"linuxserverci", "password":"'${DOCKERHUB_TOKEN}'"}' -H "Content-Type: application/json" -X POST https://hub.docker.com/v2/users/login | jq -r '.token') curl -s \ -H "Authorization: JWT ${DH_TOKEN}" \ @@ -458,14 +485,16 @@ pipeline { } steps{ sh '''curl -H "Content-Type: application/json" -H "Private-Token: ${GITLAB_TOKEN}" -X POST https://gitlab.com/api/v4/projects \ - -d '{"namespace_id":'${GITLAB_NAMESPACE}',\ - "name":"'${LS_REPO}'", - "mirror":true,\ - "import_url":"https://github.com/linuxserver/'${LS_REPO}'.git",\ - "issues_access_level":"disabled",\ - "merge_requests_access_level":"disabled",\ - "repository_access_level":"enabled",\ - "visibility":"public"}' ''' + -d '{"namespace_id":'${GITLAB_NAMESPACE}',\ + "name":"'${LS_REPO}'", + "mirror":true,\ + "import_url":"https://github.com/linuxserver/'${LS_REPO}'.git",\ + "issues_access_level":"disabled",\ + "merge_requests_access_level":"disabled",\ + "repository_access_level":"enabled",\ + "visibility":"public"}' ''' + sh '''curl -H "Private-Token: ${GITLAB_TOKEN}" -X PUT "https://gitlab.com/api/v4/projects/Linuxserver.io%2F${LS_REPO}" \ + -d "mirror=true&import_url=https://github.com/linuxserver/${LS_REPO}.git" ''' } } /* ############### From 31b4fbb6b7cbe3131becb1ededbb6f1e5d1d98bc Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 14 Mar 2024 21:25:28 +0000 Subject: [PATCH 389/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 8461be4..26200ae 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -133,7 +133,7 @@ openssl 3.0.2-0ubuntu1.15 deb passwd 1:4.8.1-2ubuntu2.1 deb perl-base 5.34.0-3ubuntu1.2 deb pinentry-curses 1.1.1-1build2 deb -plexmediaserver 1.40.0.7998-c29d4c0c8 deb +plexmediaserver 1.40.1.8227-c0dd5a73e deb procps 2:3.3.17-6ubuntu2 deb publicsuffix 20211207.1025-1 deb readline-common 8.1.2-1 deb From 7e8f9d66876fe8e2f98ed69f20f79dc143a3c4f8 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 25 Mar 2024 09:18:03 +0000 Subject: [PATCH 390/514] Bot Updating Package Versions --- package_versions.txt | 56 ++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 26200ae..0e86511 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -2,13 +2,13 @@ NAME VERSION TYPE adduser 3.118ubuntu5 deb apt 2.4.11 deb apt-utils 2.4.11 deb -base-files 12ubuntu4.3 deb +base-files 12ubuntu4.6 deb base-passwd 3.5.52build1 deb -bash 5.1-6ubuntu1 deb +bash 5.1-6ubuntu1.1 deb bash 5.1.16 binary bsdutils 1:2.37.2-4ubuntu3 deb ca-certificates 20230311ubuntu0.22.04.1 deb -coreutils 8.32-4.1ubuntu1 deb +coreutils 8.32-4.1ubuntu1.1 deb cron 3.0pl1-137ubuntu3 deb curl 7.81.0-1ubuntu1.15 deb dash 0.5.11+git20210903+057cd650a4ed-3build1 deb @@ -16,10 +16,10 @@ debconf 1.5.79ubuntu1 deb debianutils 5.5-1ubuntu2 deb diffutils 1:3.8-0ubuntu2 deb dirmngr 2.2.27-3ubuntu2.1 deb -dpkg 1.21.1ubuntu2.2 deb +dpkg 1.21.1ubuntu2.3 deb e2fsprogs 1.46.5-2ubuntu1.1 deb findutils 4.8.0-1ubuntu3 deb -gcc-12-base 12.1.0-2ubuntu1~22.04 deb +gcc-12-base 12.3.0-1ubuntu1~22.04 deb gnupg 2.2.27-3ubuntu2.1 deb gnupg-l10n 2.2.27-3ubuntu2.1 deb gnupg-utils 2.2.27-3ubuntu2.1 deb @@ -45,8 +45,8 @@ libblkid1 2.37.2-4ubuntu3 deb libbrotli1 1.0.9-2build6 deb libbsd0 0.11.5-1 deb libbz2-1.0 1.0.8-5build1 deb -libc-bin 2.35-0ubuntu3.1 deb -libc6 2.35-0ubuntu3.1 deb +libc-bin 2.35-0ubuntu3.6 deb +libc6 2.35-0ubuntu3.6 deb libcap-ng0 0.7.9-2.2build3 deb libcap2 1:2.44-1ubuntu0.22.04.1 deb libcom-err2 1.46.5-2ubuntu1.1 deb @@ -56,23 +56,23 @@ libdb5.3 5.3.28+dfsg1-0.8ubuntu3 deb libdebconfclient0 0.261ubuntu1 deb libext2fs2 1.46.5-2ubuntu1.1 deb libffi8 3.4.2-4 deb -libgcc-s1 12.1.0-2ubuntu1~22.04 deb +libgcc-s1 12.3.0-1ubuntu1~22.04 deb libgcrypt20 1.9.4-3ubuntu3 deb libgmp10 2:6.2.1+dfsg-3ubuntu1 deb -libgnutls30 3.7.3-4ubuntu1.2 deb +libgnutls30 3.7.3-4ubuntu1.4 deb libgpg-error0 1.43-3 deb -libgssapi-krb5-2 1.19.2-2ubuntu0.2 deb +libgssapi-krb5-2 1.19.2-2ubuntu0.3 deb libhogweed6 3.7.3-1build2 deb libidn2-0 2.3.2-2build1 deb libjq1 1.6-2.1ubuntu3 deb -libk5crypto3 1.19.2-2ubuntu0.2 deb +libk5crypto3 1.19.2-2ubuntu0.3 deb libkeyutils1 1.6.1-2ubuntu3 deb libkmod2 29-1ubuntu1 deb -libkrb5-3 1.19.2-2ubuntu0.2 deb -libkrb5support0 1.19.2-2ubuntu0.2 deb +libkrb5-3 1.19.2-2ubuntu0.3 deb +libkrb5support0 1.19.2-2ubuntu0.3 deb libksba8 1.6.0-2ubuntu0.2 deb -libldap-2.5-0 2.5.16+dfsg-0ubuntu0.22.04.2 deb -libldap-common 2.5.16+dfsg-0ubuntu0.22.04.2 deb +libldap-2.5-0 2.5.17+dfsg-0ubuntu0.22.04.1 deb +libldap-common 2.5.17+dfsg-0ubuntu0.22.04.1 deb liblz4-1 1.9.3-2build2 deb liblzma5 5.2.5-2ubuntu1 deb libmd0 1.0.4-1build1 deb @@ -85,13 +85,13 @@ libnpth0 1.6-3build2 deb libnsl2 1.3.0-2build2 deb libonig5 6.9.7.1-2build1 deb libp11-kit0 0.24.0-6build1 deb -libpam-modules 1.4.0-11ubuntu2.3 deb -libpam-modules-bin 1.4.0-11ubuntu2.3 deb -libpam-runtime 1.4.0-11ubuntu2.3 deb -libpam0g 1.4.0-11ubuntu2.3 deb +libpam-modules 1.4.0-11ubuntu2.4 deb +libpam-modules-bin 1.4.0-11ubuntu2.4 deb +libpam-runtime 1.4.0-11ubuntu2.4 deb +libpam0g 1.4.0-11ubuntu2.4 deb libpcre2-8-0 10.39-3ubuntu0.1 deb libpcre3 2:8.39-13ubuntu0.22.04.1 deb -libprocps8 2:3.3.17-6ubuntu2 deb +libprocps8 2:3.3.17-6ubuntu2.1 deb libpsl5 0.21.0-1.2build2 deb libreadline8 8.1.2-1 deb librtmp1 2.4+20151223.gitfa8646d.1-2build4 deb @@ -107,9 +107,9 @@ libsmartcols1 2.37.2-4ubuntu3 deb libsqlite3-0 3.37.2-2ubuntu0.3 deb libss2 1.46.5-2ubuntu1.1 deb libssh-4 0.9.6-2ubuntu0.22.04.3 deb -libssl3 3.0.2-0ubuntu1.10 deb -libstdc++6 12.1.0-2ubuntu1~22.04 deb -libsystemd0 249.11-0ubuntu3.9 deb +libssl3 3.0.2-0ubuntu1.15 deb +libstdc++6 12.3.0-1ubuntu1~22.04 deb +libsystemd0 249.11-0ubuntu3.12 deb libtasn1-6 4.18.0-4build1 deb libtinfo6 6.3-2ubuntu0.1 deb libtirpc-common 1.3.2-2ubuntu0.1 deb @@ -120,7 +120,7 @@ libuuid1 2.37.2-4ubuntu3 deb libxxhash0 0.8.1-1 deb libzstd1 1.4.8+dfsg-3build1 deb locales 2.35-0ubuntu3.6 deb -login 1:4.8.1-2ubuntu2.1 deb +login 1:4.8.1-2ubuntu2.2 deb logsave 1.46.5-2ubuntu1.1 deb lsb-base 11.1.0ubuntu4 deb mawk 1.3.4.20200120-3 deb @@ -130,18 +130,18 @@ ncurses-bin 6.3-2ubuntu0.1 deb netcat 1.218-4ubuntu1 deb netcat-openbsd 1.218-4ubuntu1 deb openssl 3.0.2-0ubuntu1.15 deb -passwd 1:4.8.1-2ubuntu2.1 deb -perl-base 5.34.0-3ubuntu1.2 deb +passwd 1:4.8.1-2ubuntu2.2 deb +perl-base 5.34.0-3ubuntu1.3 deb pinentry-curses 1.1.1-1build2 deb plexmediaserver 1.40.1.8227-c0dd5a73e deb -procps 2:3.3.17-6ubuntu2 deb +procps 2:3.3.17-6ubuntu2.1 deb publicsuffix 20211207.1025-1 deb readline-common 8.1.2-1 deb sed 4.8-1ubuntu2 deb sensible-utils 0.0.17 deb systemd-hwe-hwdb 249.11.5 deb sysvinit-utils 3.01-1ubuntu1 deb -tar 1.34+dfsg-1ubuntu0.1.22.04.1 deb +tar 1.34+dfsg-1ubuntu0.1.22.04.2 deb tzdata 2024a-0ubuntu0.22.04 deb ubuntu-keyring 2021.03.26 deb udev 249.11-0ubuntu3.12 deb From 0403f38ad4821d52952371c8b9bd75a64aa1bda9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 8 Apr 2024 09:19:12 +0000 Subject: [PATCH 391/514] Bot Updating Package Versions --- package_versions.txt | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 0e86511..8fb5b3b 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,16 +1,16 @@ NAME VERSION TYPE adduser 3.118ubuntu5 deb -apt 2.4.11 deb -apt-utils 2.4.11 deb +apt 2.4.12 deb +apt-utils 2.4.12 deb base-files 12ubuntu4.6 deb base-passwd 3.5.52build1 deb bash 5.1-6ubuntu1.1 deb bash 5.1.16 binary -bsdutils 1:2.37.2-4ubuntu3 deb +bsdutils 1:2.37.2-4ubuntu3.3 deb ca-certificates 20230311ubuntu0.22.04.1 deb -coreutils 8.32-4.1ubuntu1.1 deb +coreutils 8.32-4.1ubuntu1.2 deb cron 3.0pl1-137ubuntu3 deb -curl 7.81.0-1ubuntu1.15 deb +curl 7.81.0-1ubuntu1.16 deb dash 0.5.11+git20210903+057cd650a4ed-3build1 deb debconf 1.5.79ubuntu1 deb debianutils 5.5-1ubuntu2 deb @@ -36,12 +36,12 @@ hostname 3.23ubuntu2 deb init-system-helpers 1.62 deb jq 1.6-2.1ubuntu3 deb libacl1 2.3.1-1 deb -libapt-pkg6.0 2.4.11 deb +libapt-pkg6.0 2.4.12 deb libassuan0 2.5.5-1build1 deb libattr1 1:2.5.1-1build1 deb libaudit-common 1:3.0.7-1build1 deb libaudit1 1:3.0.7-1build1 deb -libblkid1 2.37.2-4ubuntu3 deb +libblkid1 2.37.2-4ubuntu3.3 deb libbrotli1 1.0.9-2build6 deb libbsd0 0.11.5-1 deb libbz2-1.0 1.0.8-5build1 deb @@ -51,7 +51,7 @@ libcap-ng0 0.7.9-2.2build3 deb libcap2 1:2.44-1ubuntu0.22.04.1 deb libcom-err2 1.46.5-2ubuntu1.1 deb libcrypt1 1:4.4.27-1 deb -libcurl4 7.81.0-1ubuntu1.15 deb +libcurl4 7.81.0-1ubuntu1.16 deb libdb5.3 5.3.28+dfsg1-0.8ubuntu3 deb libdebconfclient0 0.261ubuntu1 deb libext2fs2 1.46.5-2ubuntu1.1 deb @@ -76,7 +76,7 @@ libldap-common 2.5.17+dfsg-0ubuntu0.22.04.1 deb liblz4-1 1.9.3-2build2 deb liblzma5 5.2.5-2ubuntu1 deb libmd0 1.0.4-1build1 deb -libmount1 2.37.2-4ubuntu3 deb +libmount1 2.37.2-4ubuntu3.3 deb libncurses6 6.3-2ubuntu0.1 deb libncursesw6 6.3-2ubuntu0.1 deb libnettle8 3.7.3-1build2 deb @@ -103,7 +103,7 @@ libselinux1 3.3-1build2 deb libsemanage-common 3.3-1build2 deb libsemanage2 3.3-1build2 deb libsepol2 3.3-1build1 deb -libsmartcols1 2.37.2-4ubuntu3 deb +libsmartcols1 2.37.2-4ubuntu3.3 deb libsqlite3-0 3.37.2-2ubuntu0.3 deb libss2 1.46.5-2ubuntu1.1 deb libssh-4 0.9.6-2ubuntu0.22.04.3 deb @@ -116,7 +116,7 @@ libtirpc-common 1.3.2-2ubuntu0.1 deb libtirpc3 1.3.2-2ubuntu0.1 deb libudev1 249.11-0ubuntu3.12 deb libunistring2 1.0-1 deb -libuuid1 2.37.2-4ubuntu3 deb +libuuid1 2.37.2-4ubuntu3.3 deb libxxhash0 0.8.1-1 deb libzstd1 1.4.8+dfsg-3build1 deb locales 2.35-0ubuntu3.6 deb @@ -124,7 +124,7 @@ login 1:4.8.1-2ubuntu2.2 deb logsave 1.46.5-2ubuntu1.1 deb lsb-base 11.1.0ubuntu4 deb mawk 1.3.4.20200120-3 deb -mount 2.37.2-4ubuntu3 deb +mount 2.37.2-4ubuntu3.3 deb ncurses-base 6.3-2ubuntu0.1 deb ncurses-bin 6.3-2ubuntu0.1 deb netcat 1.218-4ubuntu1 deb @@ -146,6 +146,6 @@ tzdata 2024a-0ubuntu0.22.04 deb ubuntu-keyring 2021.03.26 deb udev 249.11-0ubuntu3.12 deb usrmerge 25ubuntu2 deb -util-linux 2.37.2-4ubuntu3 deb +util-linux 2.37.2-4ubuntu3.3 deb wget 1.21.2-2ubuntu1 deb zlib1g 1:1.2.11.dfsg-2ubuntu9.2 deb From 1d0b652eda61cb4a43a8be43485b6adeef564a7d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 18 Apr 2024 21:24:11 +0000 Subject: [PATCH 392/514] Bot Updating Package Versions --- package_versions.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 8fb5b3b..f413bd3 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -6,7 +6,7 @@ base-files 12ubuntu4.6 deb base-passwd 3.5.52build1 deb bash 5.1-6ubuntu1.1 deb bash 5.1.16 binary -bsdutils 1:2.37.2-4ubuntu3.3 deb +bsdutils 1:2.37.2-4ubuntu3.4 deb ca-certificates 20230311ubuntu0.22.04.1 deb coreutils 8.32-4.1ubuntu1.2 deb cron 3.0pl1-137ubuntu3 deb @@ -41,7 +41,7 @@ libassuan0 2.5.5-1build1 deb libattr1 1:2.5.1-1build1 deb libaudit-common 1:3.0.7-1build1 deb libaudit1 1:3.0.7-1build1 deb -libblkid1 2.37.2-4ubuntu3.3 deb +libblkid1 2.37.2-4ubuntu3.4 deb libbrotli1 1.0.9-2build6 deb libbsd0 0.11.5-1 deb libbz2-1.0 1.0.8-5build1 deb @@ -59,7 +59,7 @@ libffi8 3.4.2-4 deb libgcc-s1 12.3.0-1ubuntu1~22.04 deb libgcrypt20 1.9.4-3ubuntu3 deb libgmp10 2:6.2.1+dfsg-3ubuntu1 deb -libgnutls30 3.7.3-4ubuntu1.4 deb +libgnutls30 3.7.3-4ubuntu1.5 deb libgpg-error0 1.43-3 deb libgssapi-krb5-2 1.19.2-2ubuntu0.3 deb libhogweed6 3.7.3-1build2 deb @@ -76,7 +76,7 @@ libldap-common 2.5.17+dfsg-0ubuntu0.22.04.1 deb liblz4-1 1.9.3-2build2 deb liblzma5 5.2.5-2ubuntu1 deb libmd0 1.0.4-1build1 deb -libmount1 2.37.2-4ubuntu3.3 deb +libmount1 2.37.2-4ubuntu3.4 deb libncurses6 6.3-2ubuntu0.1 deb libncursesw6 6.3-2ubuntu0.1 deb libnettle8 3.7.3-1build2 deb @@ -103,7 +103,7 @@ libselinux1 3.3-1build2 deb libsemanage-common 3.3-1build2 deb libsemanage2 3.3-1build2 deb libsepol2 3.3-1build1 deb -libsmartcols1 2.37.2-4ubuntu3.3 deb +libsmartcols1 2.37.2-4ubuntu3.4 deb libsqlite3-0 3.37.2-2ubuntu0.3 deb libss2 1.46.5-2ubuntu1.1 deb libssh-4 0.9.6-2ubuntu0.22.04.3 deb @@ -116,7 +116,7 @@ libtirpc-common 1.3.2-2ubuntu0.1 deb libtirpc3 1.3.2-2ubuntu0.1 deb libudev1 249.11-0ubuntu3.12 deb libunistring2 1.0-1 deb -libuuid1 2.37.2-4ubuntu3.3 deb +libuuid1 2.37.2-4ubuntu3.4 deb libxxhash0 0.8.1-1 deb libzstd1 1.4.8+dfsg-3build1 deb locales 2.35-0ubuntu3.6 deb @@ -124,7 +124,7 @@ login 1:4.8.1-2ubuntu2.2 deb logsave 1.46.5-2ubuntu1.1 deb lsb-base 11.1.0ubuntu4 deb mawk 1.3.4.20200120-3 deb -mount 2.37.2-4ubuntu3.3 deb +mount 2.37.2-4ubuntu3.4 deb ncurses-base 6.3-2ubuntu0.1 deb ncurses-bin 6.3-2ubuntu0.1 deb netcat 1.218-4ubuntu1 deb @@ -133,7 +133,7 @@ openssl 3.0.2-0ubuntu1.15 deb passwd 1:4.8.1-2ubuntu2.2 deb perl-base 5.34.0-3ubuntu1.3 deb pinentry-curses 1.1.1-1build2 deb -plexmediaserver 1.40.1.8227-c0dd5a73e deb +plexmediaserver 1.40.2.8395-c67dce28e deb procps 2:3.3.17-6ubuntu2.1 deb publicsuffix 20211207.1025-1 deb readline-common 8.1.2-1 deb @@ -146,6 +146,6 @@ tzdata 2024a-0ubuntu0.22.04 deb ubuntu-keyring 2021.03.26 deb udev 249.11-0ubuntu3.12 deb usrmerge 25ubuntu2 deb -util-linux 2.37.2-4ubuntu3.3 deb +util-linux 2.37.2-4ubuntu3.4 deb wget 1.21.2-2ubuntu1 deb zlib1g 1:1.2.11.dfsg-2ubuntu9.2 deb From aa31fd17bfea4461729e0d631fcffc7be9c192ef Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 29 Apr 2024 09:22:57 +0000 Subject: [PATCH 393/514] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index f413bd3..16a4213 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -45,8 +45,8 @@ libblkid1 2.37.2-4ubuntu3.4 deb libbrotli1 1.0.9-2build6 deb libbsd0 0.11.5-1 deb libbz2-1.0 1.0.8-5build1 deb -libc-bin 2.35-0ubuntu3.6 deb -libc6 2.35-0ubuntu3.6 deb +libc-bin 2.35-0ubuntu3.7 deb +libc6 2.35-0ubuntu3.7 deb libcap-ng0 0.7.9-2.2build3 deb libcap2 1:2.44-1ubuntu0.22.04.1 deb libcom-err2 1.46.5-2ubuntu1.1 deb @@ -119,7 +119,7 @@ libunistring2 1.0-1 deb libuuid1 2.37.2-4ubuntu3.4 deb libxxhash0 0.8.1-1 deb libzstd1 1.4.8+dfsg-3build1 deb -locales 2.35-0ubuntu3.6 deb +locales 2.35-0ubuntu3.7 deb login 1:4.8.1-2ubuntu2.2 deb logsave 1.46.5-2ubuntu1.1 deb lsb-base 11.1.0ubuntu4 deb From a65f53bcdd42133a7007d908b566ee4b74e89317 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 6 May 2024 09:20:47 +0000 Subject: [PATCH 394/514] Bot Updating Templated Files --- Jenkinsfile | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5d7a8d5..c151e9d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -277,7 +277,7 @@ pipeline { # ${TEMPDIR}/unraid/docker-templates: Cloned docker-templates repo to check for logos # ${TEMPDIR}/unraid/templates: Cloned templates repo for commiting unraid template changes and pushing back to Github git clone --branch master --depth 1 https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/docker-${CONTAINER_NAME} - docker run --rm -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/tmp -e LOCAL=true ghcr.io/linuxserver/jenkins-builder:latest + docker run --rm -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/tmp -e LOCAL=true -e PUID=$(id -u) -e PGID=$(id -g) ghcr.io/linuxserver/jenkins-builder:latest echo "Starting Stage 1 - Jenkinsfile update" if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then mkdir -p ${TEMPDIR}/repo @@ -384,11 +384,15 @@ pipeline { cd ${TEMPDIR}/unraid/templates/ GH_TEMPLATES_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||') if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then - echo "Image is on the ignore list, marking Unraid template as deprecated" - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ - git add -u unraid/${CONTAINER_NAME}.xml - git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || : - git commit -m 'Bot Moving Deprecated Unraid Template' || : + if [[ -f ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ]]; then + echo "Image is on the ignore list, marking Unraid template as deprecated" + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ + git add -u unraid/${CONTAINER_NAME}.xml + git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || : + git commit -m 'Bot Moving Deprecated Unraid Template' || : + else + echo "Image is on the ignore list, but no template exist, skipping deprecation" + fi else cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ git add unraid/${CONTAINER_NAME}.xml @@ -610,7 +614,7 @@ pipeline { sh '''#! /bin/bash set -e TEMPDIR=$(mktemp -d) - if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then + if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" != "true" ]; then LOCAL_CONTAINER=${IMAGE}:amd64-${META_TAG} else LOCAL_CONTAINER=${IMAGE}:${META_TAG} From 301c61cb0920b3d2b131c25f17586d23154e2690 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 6 May 2024 09:25:17 +0000 Subject: [PATCH 395/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 16a4213..ab53eca 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -80,7 +80,7 @@ libmount1 2.37.2-4ubuntu3.4 deb libncurses6 6.3-2ubuntu0.1 deb libncursesw6 6.3-2ubuntu0.1 deb libnettle8 3.7.3-1build2 deb -libnghttp2-14 1.43.0-1ubuntu0.1 deb +libnghttp2-14 1.43.0-1ubuntu0.2 deb libnpth0 1.6-3build2 deb libnsl2 1.3.0-2build2 deb libonig5 6.9.7.1-2build1 deb From 748b66a8233131b846a3ba2e2300df783937ff64 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 13 May 2024 09:19:01 +0000 Subject: [PATCH 396/514] Bot Updating Templated Files --- Jenkinsfile | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c151e9d..de04de7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -383,16 +383,14 @@ pipeline { echo "Updating Unraid template" cd ${TEMPDIR}/unraid/templates/ GH_TEMPLATES_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||') - if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then - if [[ -f ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ]]; then - echo "Image is on the ignore list, marking Unraid template as deprecated" - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ - git add -u unraid/${CONTAINER_NAME}.xml - git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || : - git commit -m 'Bot Moving Deprecated Unraid Template' || : - else - echo "Image is on the ignore list, but no template exist, skipping deprecation" - fi + if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list && [[ -f ${TEMPDIR}/unraid/templates/unraid/deprecated/${CONTAINER_NAME}.xml ]]; then + echo "Image is on the ignore list, and already in the deprecation folder." + elif grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then + echo "Image is on the ignore list, marking Unraid template as deprecated" + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ + git add -u unraid/${CONTAINER_NAME}.xml + git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || : + git commit -m 'Bot Moving Deprecated Unraid Template' || : else cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ git add unraid/${CONTAINER_NAME}.xml From 19113971c7c07a992ebcb2a5693d3c1682ee3730 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 13 May 2024 09:22:11 +0000 Subject: [PATCH 397/514] Bot Updating Package Versions --- package_versions.txt | 302 +++++++++++++++++++++---------------------- 1 file changed, 151 insertions(+), 151 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index ab53eca..3d34dd8 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,151 +1,151 @@ -NAME VERSION TYPE -adduser 3.118ubuntu5 deb -apt 2.4.12 deb -apt-utils 2.4.12 deb -base-files 12ubuntu4.6 deb -base-passwd 3.5.52build1 deb -bash 5.1-6ubuntu1.1 deb -bash 5.1.16 binary -bsdutils 1:2.37.2-4ubuntu3.4 deb -ca-certificates 20230311ubuntu0.22.04.1 deb -coreutils 8.32-4.1ubuntu1.2 deb -cron 3.0pl1-137ubuntu3 deb -curl 7.81.0-1ubuntu1.16 deb -dash 0.5.11+git20210903+057cd650a4ed-3build1 deb -debconf 1.5.79ubuntu1 deb -debianutils 5.5-1ubuntu2 deb -diffutils 1:3.8-0ubuntu2 deb -dirmngr 2.2.27-3ubuntu2.1 deb -dpkg 1.21.1ubuntu2.3 deb -e2fsprogs 1.46.5-2ubuntu1.1 deb -findutils 4.8.0-1ubuntu3 deb -gcc-12-base 12.3.0-1ubuntu1~22.04 deb -gnupg 2.2.27-3ubuntu2.1 deb -gnupg-l10n 2.2.27-3ubuntu2.1 deb -gnupg-utils 2.2.27-3ubuntu2.1 deb -gpg 2.2.27-3ubuntu2.1 deb -gpg-agent 2.2.27-3ubuntu2.1 deb -gpg-wks-client 2.2.27-3ubuntu2.1 deb -gpg-wks-server 2.2.27-3ubuntu2.1 deb -gpgconf 2.2.27-3ubuntu2.1 deb -gpgsm 2.2.27-3ubuntu2.1 deb -gpgv 2.2.27-3ubuntu2.1 deb -grep 3.7-1build1 deb -gzip 1.10-4ubuntu4.1 deb -hostname 3.23ubuntu2 deb -init-system-helpers 1.62 deb -jq 1.6-2.1ubuntu3 deb -libacl1 2.3.1-1 deb -libapt-pkg6.0 2.4.12 deb -libassuan0 2.5.5-1build1 deb -libattr1 1:2.5.1-1build1 deb -libaudit-common 1:3.0.7-1build1 deb -libaudit1 1:3.0.7-1build1 deb -libblkid1 2.37.2-4ubuntu3.4 deb -libbrotli1 1.0.9-2build6 deb -libbsd0 0.11.5-1 deb -libbz2-1.0 1.0.8-5build1 deb -libc-bin 2.35-0ubuntu3.7 deb -libc6 2.35-0ubuntu3.7 deb -libcap-ng0 0.7.9-2.2build3 deb -libcap2 1:2.44-1ubuntu0.22.04.1 deb -libcom-err2 1.46.5-2ubuntu1.1 deb -libcrypt1 1:4.4.27-1 deb -libcurl4 7.81.0-1ubuntu1.16 deb -libdb5.3 5.3.28+dfsg1-0.8ubuntu3 deb -libdebconfclient0 0.261ubuntu1 deb -libext2fs2 1.46.5-2ubuntu1.1 deb -libffi8 3.4.2-4 deb -libgcc-s1 12.3.0-1ubuntu1~22.04 deb -libgcrypt20 1.9.4-3ubuntu3 deb -libgmp10 2:6.2.1+dfsg-3ubuntu1 deb -libgnutls30 3.7.3-4ubuntu1.5 deb -libgpg-error0 1.43-3 deb -libgssapi-krb5-2 1.19.2-2ubuntu0.3 deb -libhogweed6 3.7.3-1build2 deb -libidn2-0 2.3.2-2build1 deb -libjq1 1.6-2.1ubuntu3 deb -libk5crypto3 1.19.2-2ubuntu0.3 deb -libkeyutils1 1.6.1-2ubuntu3 deb -libkmod2 29-1ubuntu1 deb -libkrb5-3 1.19.2-2ubuntu0.3 deb -libkrb5support0 1.19.2-2ubuntu0.3 deb -libksba8 1.6.0-2ubuntu0.2 deb -libldap-2.5-0 2.5.17+dfsg-0ubuntu0.22.04.1 deb -libldap-common 2.5.17+dfsg-0ubuntu0.22.04.1 deb -liblz4-1 1.9.3-2build2 deb -liblzma5 5.2.5-2ubuntu1 deb -libmd0 1.0.4-1build1 deb -libmount1 2.37.2-4ubuntu3.4 deb -libncurses6 6.3-2ubuntu0.1 deb -libncursesw6 6.3-2ubuntu0.1 deb -libnettle8 3.7.3-1build2 deb -libnghttp2-14 1.43.0-1ubuntu0.2 deb -libnpth0 1.6-3build2 deb -libnsl2 1.3.0-2build2 deb -libonig5 6.9.7.1-2build1 deb -libp11-kit0 0.24.0-6build1 deb -libpam-modules 1.4.0-11ubuntu2.4 deb -libpam-modules-bin 1.4.0-11ubuntu2.4 deb -libpam-runtime 1.4.0-11ubuntu2.4 deb -libpam0g 1.4.0-11ubuntu2.4 deb -libpcre2-8-0 10.39-3ubuntu0.1 deb -libpcre3 2:8.39-13ubuntu0.22.04.1 deb -libprocps8 2:3.3.17-6ubuntu2.1 deb -libpsl5 0.21.0-1.2build2 deb -libreadline8 8.1.2-1 deb -librtmp1 2.4+20151223.gitfa8646d.1-2build4 deb -libsasl2-2 2.1.27+dfsg2-3ubuntu1.2 deb -libsasl2-modules 2.1.27+dfsg2-3ubuntu1.2 deb -libsasl2-modules-db 2.1.27+dfsg2-3ubuntu1.2 deb -libseccomp2 2.5.3-2ubuntu2 deb -libselinux1 3.3-1build2 deb -libsemanage-common 3.3-1build2 deb -libsemanage2 3.3-1build2 deb -libsepol2 3.3-1build1 deb -libsmartcols1 2.37.2-4ubuntu3.4 deb -libsqlite3-0 3.37.2-2ubuntu0.3 deb -libss2 1.46.5-2ubuntu1.1 deb -libssh-4 0.9.6-2ubuntu0.22.04.3 deb -libssl3 3.0.2-0ubuntu1.15 deb -libstdc++6 12.3.0-1ubuntu1~22.04 deb -libsystemd0 249.11-0ubuntu3.12 deb -libtasn1-6 4.18.0-4build1 deb -libtinfo6 6.3-2ubuntu0.1 deb -libtirpc-common 1.3.2-2ubuntu0.1 deb -libtirpc3 1.3.2-2ubuntu0.1 deb -libudev1 249.11-0ubuntu3.12 deb -libunistring2 1.0-1 deb -libuuid1 2.37.2-4ubuntu3.4 deb -libxxhash0 0.8.1-1 deb -libzstd1 1.4.8+dfsg-3build1 deb -locales 2.35-0ubuntu3.7 deb -login 1:4.8.1-2ubuntu2.2 deb -logsave 1.46.5-2ubuntu1.1 deb -lsb-base 11.1.0ubuntu4 deb -mawk 1.3.4.20200120-3 deb -mount 2.37.2-4ubuntu3.4 deb -ncurses-base 6.3-2ubuntu0.1 deb -ncurses-bin 6.3-2ubuntu0.1 deb -netcat 1.218-4ubuntu1 deb -netcat-openbsd 1.218-4ubuntu1 deb -openssl 3.0.2-0ubuntu1.15 deb -passwd 1:4.8.1-2ubuntu2.2 deb -perl-base 5.34.0-3ubuntu1.3 deb -pinentry-curses 1.1.1-1build2 deb -plexmediaserver 1.40.2.8395-c67dce28e deb -procps 2:3.3.17-6ubuntu2.1 deb -publicsuffix 20211207.1025-1 deb -readline-common 8.1.2-1 deb -sed 4.8-1ubuntu2 deb -sensible-utils 0.0.17 deb -systemd-hwe-hwdb 249.11.5 deb -sysvinit-utils 3.01-1ubuntu1 deb -tar 1.34+dfsg-1ubuntu0.1.22.04.2 deb -tzdata 2024a-0ubuntu0.22.04 deb -ubuntu-keyring 2021.03.26 deb -udev 249.11-0ubuntu3.12 deb -usrmerge 25ubuntu2 deb -util-linux 2.37.2-4ubuntu3.4 deb -wget 1.21.2-2ubuntu1 deb -zlib1g 1:1.2.11.dfsg-2ubuntu9.2 deb +NAME VERSION TYPE +adduser 3.118ubuntu5 deb +apt 2.4.12 deb +apt-utils 2.4.12 deb +base-files 12ubuntu4.6 deb +base-passwd 3.5.52build1 deb +bash 5.1-6ubuntu1.1 deb +bsdutils 1:2.37.2-4ubuntu3.4 deb +ca-certificates 20230311ubuntu0.22.04.1 deb +catatonit 0.1.7-1 deb +coreutils 8.32-4.1ubuntu1.2 deb +cron 3.0pl1-137ubuntu3 deb +curl 7.81.0-1ubuntu1.16 deb +dash 0.5.11+git20210903+057cd650a4ed-3build1 deb +debconf 1.5.79ubuntu1 deb +debianutils 5.5-1ubuntu2 deb +diffutils 1:3.8-0ubuntu2 deb +dirmngr 2.2.27-3ubuntu2.1 deb +dpkg 1.21.1ubuntu2.3 deb +e2fsprogs 1.46.5-2ubuntu1.1 deb +findutils 4.8.0-1ubuntu3 deb +gcc-12-base 12.3.0-1ubuntu1~22.04 deb +gnupg 2.2.27-3ubuntu2.1 deb +gnupg-l10n 2.2.27-3ubuntu2.1 deb +gnupg-utils 2.2.27-3ubuntu2.1 deb +gpg 2.2.27-3ubuntu2.1 deb +gpg-agent 2.2.27-3ubuntu2.1 deb +gpg-wks-client 2.2.27-3ubuntu2.1 deb +gpg-wks-server 2.2.27-3ubuntu2.1 deb +gpgconf 2.2.27-3ubuntu2.1 deb +gpgsm 2.2.27-3ubuntu2.1 deb +gpgv 2.2.27-3ubuntu2.1 deb +grep 3.7-1build1 deb +gzip 1.10-4ubuntu4.1 deb +hostname 3.23ubuntu2 deb +init-system-helpers 1.62 deb +jq 1.6-2.1ubuntu3 deb +libacl1 2.3.1-1 deb +libapt-pkg6.0 2.4.12 deb +libassuan0 2.5.5-1build1 deb +libattr1 1:2.5.1-1build1 deb +libaudit-common 1:3.0.7-1build1 deb +libaudit1 1:3.0.7-1build1 deb +libblkid1 2.37.2-4ubuntu3.4 deb +libbrotli1 1.0.9-2build6 deb +libbsd0 0.11.5-1 deb +libbz2-1.0 1.0.8-5build1 deb +libc-bin 2.35-0ubuntu3.7 deb +libc6 2.35-0ubuntu3.7 deb +libcap-ng0 0.7.9-2.2build3 deb +libcap2 1:2.44-1ubuntu0.22.04.1 deb +libcom-err2 1.46.5-2ubuntu1.1 deb +libcrypt1 1:4.4.27-1 deb +libcurl4 7.81.0-1ubuntu1.16 deb +libdb5.3 5.3.28+dfsg1-0.8ubuntu3 deb +libdebconfclient0 0.261ubuntu1 deb +libext2fs2 1.46.5-2ubuntu1.1 deb +libffi8 3.4.2-4 deb +libgcc-s1 12.3.0-1ubuntu1~22.04 deb +libgcrypt20 1.9.4-3ubuntu3 deb +libgmp10 2:6.2.1+dfsg-3ubuntu1 deb +libgnutls30 3.7.3-4ubuntu1.5 deb +libgpg-error0 1.43-3 deb +libgssapi-krb5-2 1.19.2-2ubuntu0.3 deb +libhogweed6 3.7.3-1build2 deb +libidn2-0 2.3.2-2build1 deb +libjq1 1.6-2.1ubuntu3 deb +libk5crypto3 1.19.2-2ubuntu0.3 deb +libkeyutils1 1.6.1-2ubuntu3 deb +libkmod2 29-1ubuntu1 deb +libkrb5-3 1.19.2-2ubuntu0.3 deb +libkrb5support0 1.19.2-2ubuntu0.3 deb +libksba8 1.6.0-2ubuntu0.2 deb +libldap-2.5-0 2.5.17+dfsg-0ubuntu0.22.04.1 deb +libldap-common 2.5.17+dfsg-0ubuntu0.22.04.1 deb +liblz4-1 1.9.3-2build2 deb +liblzma5 5.2.5-2ubuntu1 deb +libmd0 1.0.4-1build1 deb +libmount1 2.37.2-4ubuntu3.4 deb +libncurses6 6.3-2ubuntu0.1 deb +libncursesw6 6.3-2ubuntu0.1 deb +libnettle8 3.7.3-1build2 deb +libnghttp2-14 1.43.0-1ubuntu0.2 deb +libnpth0 1.6-3build2 deb +libnsl2 1.3.0-2build2 deb +libonig5 6.9.7.1-2build1 deb +libp11-kit0 0.24.0-6build1 deb +libpam-modules 1.4.0-11ubuntu2.4 deb +libpam-modules-bin 1.4.0-11ubuntu2.4 deb +libpam-runtime 1.4.0-11ubuntu2.4 deb +libpam0g 1.4.0-11ubuntu2.4 deb +libpcre2-8-0 10.39-3ubuntu0.1 deb +libpcre3 2:8.39-13ubuntu0.22.04.1 deb +libprocps8 2:3.3.17-6ubuntu2.1 deb +libpsl5 0.21.0-1.2build2 deb +libreadline8 8.1.2-1 deb +librtmp1 2.4+20151223.gitfa8646d.1-2build4 deb +libsasl2-2 2.1.27+dfsg2-3ubuntu1.2 deb +libsasl2-modules 2.1.27+dfsg2-3ubuntu1.2 deb +libsasl2-modules-db 2.1.27+dfsg2-3ubuntu1.2 deb +libseccomp2 2.5.3-2ubuntu2 deb +libselinux1 3.3-1build2 deb +libsemanage-common 3.3-1build2 deb +libsemanage2 3.3-1build2 deb +libsepol2 3.3-1build1 deb +libsmartcols1 2.37.2-4ubuntu3.4 deb +libsqlite3-0 3.37.2-2ubuntu0.3 deb +libss2 1.46.5-2ubuntu1.1 deb +libssh-4 0.9.6-2ubuntu0.22.04.3 deb +libssl3 3.0.2-0ubuntu1.15 deb +libstdc++6 12.3.0-1ubuntu1~22.04 deb +libsystemd0 249.11-0ubuntu3.12 deb +libtasn1-6 4.18.0-4build1 deb +libtinfo6 6.3-2ubuntu0.1 deb +libtirpc-common 1.3.2-2ubuntu0.1 deb +libtirpc3 1.3.2-2ubuntu0.1 deb +libudev1 249.11-0ubuntu3.12 deb +libunistring2 1.0-1 deb +libuuid1 2.37.2-4ubuntu3.4 deb +libxxhash0 0.8.1-1 deb +libzstd1 1.4.8+dfsg-3build1 deb +locales 2.35-0ubuntu3.7 deb +login 1:4.8.1-2ubuntu2.2 deb +logsave 1.46.5-2ubuntu1.1 deb +lsb-base 11.1.0ubuntu4 deb +mawk 1.3.4.20200120-3 deb +mount 2.37.2-4ubuntu3.4 deb +ncurses-base 6.3-2ubuntu0.1 deb +ncurses-bin 6.3-2ubuntu0.1 deb +netcat 1.218-4ubuntu1 deb +netcat-openbsd 1.218-4ubuntu1 deb +openssl 3.0.2-0ubuntu1.15 deb +passwd 1:4.8.1-2ubuntu2.2 deb +perl-base 5.34.0-3ubuntu1.3 deb +pinentry-curses 1.1.1-1build2 deb +plexmediaserver 1.40.2.8395-c67dce28e deb +procps 2:3.3.17-6ubuntu2.1 deb +publicsuffix 20211207.1025-1 deb +readline-common 8.1.2-1 deb +sed 4.8-1ubuntu2 deb +sensible-utils 0.0.17 deb +systemd-hwe-hwdb 249.11.5 deb +sysvinit-utils 3.01-1ubuntu1 deb +tar 1.34+dfsg-1ubuntu0.1.22.04.2 deb +tzdata 2024a-0ubuntu0.22.04 deb +ubuntu-keyring 2021.03.26 deb +udev 249.11-0ubuntu3.12 deb +usrmerge 25ubuntu2 deb +util-linux 2.37.2-4ubuntu3.4 deb +wget 1.21.2-2ubuntu1 deb +zlib1g 1:1.2.11.dfsg-2ubuntu9.2 deb From 1ff7b7ceee1b54cd32dfed2b164c4978185b7d60 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 27 May 2024 09:20:07 +0000 Subject: [PATCH 398/514] Bot Updating Templated Files --- Jenkinsfile | 41 +++++++++++------------------------------ 1 file changed, 11 insertions(+), 30 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index de04de7..83efa01 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -297,7 +297,7 @@ pipeline { echo "Jenkinsfile is up to date." fi echo "Starting Stage 2 - Delete old templates" - OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml Dockerfile.armhf" + OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml" for i in ${OLD_TEMPLATES}; do if [[ -f "${i}" ]]; then TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}" @@ -527,6 +527,7 @@ pipeline { --label \"org.opencontainers.image.title=Plex\" \ --label \"org.opencontainers.image.description=[Plex](https://plex.tv) organizes video, music and photos from personal media libraries and streams them to smart TVs, streaming boxes and mobile devices. This container is packaged as a standalone Plex Media Server. Straightforward design and bulk actions mean getting things done faster.\" \ --no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \ + --provenance=false --sbom=false \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." } } @@ -558,6 +559,7 @@ pipeline { --label \"org.opencontainers.image.title=Plex\" \ --label \"org.opencontainers.image.description=[Plex](https://plex.tv) organizes video, music and photos from personal media libraries and streams them to smart TVs, streaming boxes and mobile devices. This container is packaged as a standalone Plex Media Server. Straightforward design and bulk actions mean getting things done faster.\" \ --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \ + --provenance=false --sbom=false \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." } } @@ -586,6 +588,7 @@ pipeline { --label \"org.opencontainers.image.title=Plex\" \ --label \"org.opencontainers.image.description=[Plex](https://plex.tv) organizes video, music and photos from personal media libraries and streams them to smart TVs, streaming boxes and mobile devices. This container is packaged as a standalone Plex Media Server. Straightforward design and bulk actions mean getting things done faster.\" \ --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \ + --provenance=false --sbom=false \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" retry(5) { @@ -709,7 +712,7 @@ pipeline { --shm-size=1gb \ -v /var/run/docker.sock:/var/run/docker.sock \ -e IMAGE=\"${IMAGE}\" \ - -e DELAY_START=\"${CI_DELAY}\" \ + -e DOCKER_LOGS_TIMEOUT=\"${CI_DELAY}\" \ -e TAGS=\"${CI_TAGS}\" \ -e META_TAG=\"${META_TAG}\" \ -e PORT=\"${CI_PORT}\" \ @@ -817,35 +820,13 @@ pipeline { docker push ${MANIFESTIMAGE}:amd64-${SEMVER} docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER} fi - docker manifest push --purge ${MANIFESTIMAGE}:latest || : - docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest - docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8 - docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || : - docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} - docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8 - docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} || : - docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} - docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8 + done + for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do + docker buildx imagetools create -t ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest + docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} + docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} if [ -n "${SEMVER}" ]; then - docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || : - docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} - docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8 - fi - token=$(curl -sX GET "https://ghcr.io/token?scope=repository%3Alinuxserver%2F${CONTAINER_NAME}%3Apull" | jq -r '.token') - digest=$(curl -s \ - --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \ - --header "Authorization: Bearer ${token}" \ - "https://ghcr.io/v2/linuxserver/${CONTAINER_NAME}/manifests/arm32v7-latest") - if [[ $(echo "$digest" | jq -r '.layers') != "null" ]]; then - docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-latest || : - docker manifest create ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:amd64-latest - docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-latest - fi - docker manifest push --purge ${MANIFESTIMAGE}:latest - docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} - docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} - if [ -n "${SEMVER}" ]; then - docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} + docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} fi done ''' From c8f5da91cab0578bf49b20dcf04bd9106de34f11 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 27 May 2024 09:22:01 +0000 Subject: [PATCH 399/514] Bot Updating Templated Files --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9277b97..9f4f97e 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Find us at: # [linuxserver/plex](https://github.com/linuxserver/docker-plex) -[![Scarf.io pulls](https://scarf.sh/installs-badge/linuxserver-ci/linuxserver%2Fplex?color=94398d&label-color=555555&logo-color=ffffff&style=for-the-badge&package-type=docker)](https://scarf.sh/gateway/linuxserver-ci/docker/linuxserver%2Fplex) +[![Scarf.io pulls](https://scarf.sh/installs-badge/linuxserver-ci/linuxserver%2Fplex?color=94398d&label-color=555555&logo-color=ffffff&style=for-the-badge&package-type=docker)](https://scarf.sh) [![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-plex.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-plex) [![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-plex.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-plex/releases) [![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-plex/packages) From 49a138b64f2a7e0ad0912753a1087e3166adb146 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 10 Jun 2024 09:24:34 +0000 Subject: [PATCH 400/514] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 3d34dd8..a920272 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -45,8 +45,8 @@ libblkid1 2.37.2-4ubuntu3.4 deb libbrotli1 1.0.9-2build6 deb libbsd0 0.11.5-1 deb libbz2-1.0 1.0.8-5build1 deb -libc-bin 2.35-0ubuntu3.7 deb -libc6 2.35-0ubuntu3.7 deb +libc-bin 2.35-0ubuntu3.8 deb +libc6 2.35-0ubuntu3.8 deb libcap-ng0 0.7.9-2.2build3 deb libcap2 1:2.44-1ubuntu0.22.04.1 deb libcom-err2 1.46.5-2ubuntu1.1 deb @@ -119,7 +119,7 @@ libunistring2 1.0-1 deb libuuid1 2.37.2-4ubuntu3.4 deb libxxhash0 0.8.1-1 deb libzstd1 1.4.8+dfsg-3build1 deb -locales 2.35-0ubuntu3.7 deb +locales 2.35-0ubuntu3.8 deb login 1:4.8.1-2ubuntu2.2 deb logsave 1.46.5-2ubuntu1.1 deb lsb-base 11.1.0ubuntu4 deb From 697a72fd75e015160fac68241f4c02ba463f7bb5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 13 Jun 2024 13:29:49 +0000 Subject: [PATCH 401/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index a920272..fe787bf 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -133,7 +133,7 @@ openssl 3.0.2-0ubuntu1.15 deb passwd 1:4.8.1-2ubuntu2.2 deb perl-base 5.34.0-3ubuntu1.3 deb pinentry-curses 1.1.1-1build2 deb -plexmediaserver 1.40.2.8395-c67dce28e deb +plexmediaserver 1.40.3.8555-fef15d30c deb procps 2:3.3.17-6ubuntu2.1 deb publicsuffix 20211207.1025-1 deb readline-common 8.1.2-1 deb From 35101cc18032dda16cc7c97898d054d0c554b15b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 1 Jul 2024 09:24:41 +0000 Subject: [PATCH 402/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index fe787bf..46c9c3a 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -147,5 +147,5 @@ ubuntu-keyring 2021.03.26 deb udev 249.11-0ubuntu3.12 deb usrmerge 25ubuntu2 deb util-linux 2.37.2-4ubuntu3.4 deb -wget 1.21.2-2ubuntu1 deb +wget 1.21.2-2ubuntu1.1 deb zlib1g 1:1.2.11.dfsg-2ubuntu9.2 deb From df28c3dffb47a96083fb12732b0613111f24c790 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 8 Jul 2024 09:21:58 +0000 Subject: [PATCH 403/514] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 46c9c3a..0a6db4e 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -107,7 +107,7 @@ libsmartcols1 2.37.2-4ubuntu3.4 deb libsqlite3-0 3.37.2-2ubuntu0.3 deb libss2 1.46.5-2ubuntu1.1 deb libssh-4 0.9.6-2ubuntu0.22.04.3 deb -libssl3 3.0.2-0ubuntu1.15 deb +libssl3 3.0.2-0ubuntu1.16 deb libstdc++6 12.3.0-1ubuntu1~22.04 deb libsystemd0 249.11-0ubuntu3.12 deb libtasn1-6 4.18.0-4build1 deb @@ -129,7 +129,7 @@ ncurses-base 6.3-2ubuntu0.1 deb ncurses-bin 6.3-2ubuntu0.1 deb netcat 1.218-4ubuntu1 deb netcat-openbsd 1.218-4ubuntu1 deb -openssl 3.0.2-0ubuntu1.15 deb +openssl 3.0.2-0ubuntu1.16 deb passwd 1:4.8.1-2ubuntu2.2 deb perl-base 5.34.0-3ubuntu1.3 deb pinentry-curses 1.1.1-1build2 deb From 80fc8c4237febe9deabc84ad6412fdb18fbc11ba Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Wed, 10 Jul 2024 17:29:34 +0000 Subject: [PATCH 404/514] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 0a6db4e..ec97a44 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -133,7 +133,7 @@ openssl 3.0.2-0ubuntu1.16 deb passwd 1:4.8.1-2ubuntu2.2 deb perl-base 5.34.0-3ubuntu1.3 deb pinentry-curses 1.1.1-1build2 deb -plexmediaserver 1.40.3.8555-fef15d30c deb +plexmediaserver 1.40.4.8679-424562606 deb procps 2:3.3.17-6ubuntu2.1 deb publicsuffix 20211207.1025-1 deb readline-common 8.1.2-1 deb @@ -142,7 +142,7 @@ sensible-utils 0.0.17 deb systemd-hwe-hwdb 249.11.5 deb sysvinit-utils 3.01-1ubuntu1 deb tar 1.34+dfsg-1ubuntu0.1.22.04.2 deb -tzdata 2024a-0ubuntu0.22.04 deb +tzdata 2024a-0ubuntu0.22.04.1 deb ubuntu-keyring 2021.03.26 deb udev 249.11-0ubuntu3.12 deb usrmerge 25ubuntu2 deb From a3a21e9824e4f35895f3730c8dbc6efb7fa731e9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 15 Jul 2024 09:21:05 +0000 Subject: [PATCH 405/514] Bot Updating Templated Files --- Jenkinsfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 83efa01..006613b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -247,7 +247,7 @@ pipeline { -v ${WORKSPACE}:/mnt \ -e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \ -e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \ - ghcr.io/linuxserver/baseimage-alpine:3.19 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\ + ghcr.io/linuxserver/baseimage-alpine:3.20 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\ apk add --no-cache python3 && \ python3 -m venv /lsiopy && \ pip install --no-cache-dir -U pip && \ @@ -354,7 +354,7 @@ pipeline { fi echo "Starting Stage 4 - External repo updates: Docs, Unraid Template and Readme Sync to Docker Hub" mkdir -p ${TEMPDIR}/docs - git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation + git clone --depth=1 https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]] && [[ (! -f ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/docs/docker-documentation/docs/images/ cd ${TEMPDIR}/docs/docker-documentation @@ -372,8 +372,8 @@ pipeline { echo "Docs update not needed, skipping" fi mkdir -p ${TEMPDIR}/unraid - git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates - git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates + git clone --depth=1 https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates + git clone --depth=1 https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-logo.png ]]; then sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-logo.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml elif [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then @@ -705,7 +705,7 @@ pipeline { set -e docker pull ghcr.io/linuxserver/ci:latest if [ "${MULTIARCH}" == "true" ]; then - docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} + docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64 docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} fi docker run --rm \ @@ -796,7 +796,7 @@ pipeline { echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin if [ "${CI}" == "false" ]; then - docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} + docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64 docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} fi for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do From c6e9645aab0f611b10e6343324e2d186e245622e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 15 Jul 2024 09:22:43 +0000 Subject: [PATCH 406/514] Bot Updating Templated Files --- .github/workflows/permissions.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/permissions.yml b/.github/workflows/permissions.yml index 1447bc5..02e1bdb 100755 --- a/.github/workflows/permissions.yml +++ b/.github/workflows/permissions.yml @@ -5,6 +5,8 @@ on: - '**/run' - '**/finish' - '**/check' + - 'root/migrations/*' + jobs: permission_check: uses: linuxserver/github-workflows/.github/workflows/init-svc-executable-permissions.yml@v1 From 259c06aaa957cc15f869fe54a638cd4c621d662c Mon Sep 17 00:00:00 2001 From: thespad <git@spad.co.uk> Date: Thu, 18 Jul 2024 16:56:38 +0100 Subject: [PATCH 407/514] 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)."} From 64197c0cf88011c8231984cf6d702b933e2f1428 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 22 Jul 2024 09:27:15 +0000 Subject: [PATCH 408/514] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index ec97a44..76de999 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -71,8 +71,8 @@ libkmod2 29-1ubuntu1 deb libkrb5-3 1.19.2-2ubuntu0.3 deb libkrb5support0 1.19.2-2ubuntu0.3 deb libksba8 1.6.0-2ubuntu0.2 deb -libldap-2.5-0 2.5.17+dfsg-0ubuntu0.22.04.1 deb -libldap-common 2.5.17+dfsg-0ubuntu0.22.04.1 deb +libldap-2.5-0 2.5.18+dfsg-0ubuntu0.22.04.1 deb +libldap-common 2.5.18+dfsg-0ubuntu0.22.04.1 deb liblz4-1 1.9.3-2build2 deb liblzma5 5.2.5-2ubuntu1 deb libmd0 1.0.4-1build1 deb From a2cb9a9595fe55201f1a791dc91fb88eb7847086 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 5 Aug 2024 09:21:21 +0000 Subject: [PATCH 409/514] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 76de999..1f086f7 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -71,8 +71,8 @@ libkmod2 29-1ubuntu1 deb libkrb5-3 1.19.2-2ubuntu0.3 deb libkrb5support0 1.19.2-2ubuntu0.3 deb libksba8 1.6.0-2ubuntu0.2 deb -libldap-2.5-0 2.5.18+dfsg-0ubuntu0.22.04.1 deb -libldap-common 2.5.18+dfsg-0ubuntu0.22.04.1 deb +libldap-2.5-0 2.5.18+dfsg-0ubuntu0.22.04.2 deb +libldap-common 2.5.18+dfsg-0ubuntu0.22.04.2 deb liblz4-1 1.9.3-2build2 deb liblzma5 5.2.5-2ubuntu1 deb libmd0 1.0.4-1build1 deb From 29400873e39138ef52a1865bcda062d51cb9955f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 11 Aug 2024 12:54:11 +0000 Subject: [PATCH 410/514] Bot Updating Package Versions --- package_versions.txt | 298 +++++++++++++++++++++---------------------- 1 file changed, 147 insertions(+), 151 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 1f086f7..a95fe87 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,151 +1,147 @@ -NAME VERSION TYPE -adduser 3.118ubuntu5 deb -apt 2.4.12 deb -apt-utils 2.4.12 deb -base-files 12ubuntu4.6 deb -base-passwd 3.5.52build1 deb -bash 5.1-6ubuntu1.1 deb -bsdutils 1:2.37.2-4ubuntu3.4 deb -ca-certificates 20230311ubuntu0.22.04.1 deb -catatonit 0.1.7-1 deb -coreutils 8.32-4.1ubuntu1.2 deb -cron 3.0pl1-137ubuntu3 deb -curl 7.81.0-1ubuntu1.16 deb -dash 0.5.11+git20210903+057cd650a4ed-3build1 deb -debconf 1.5.79ubuntu1 deb -debianutils 5.5-1ubuntu2 deb -diffutils 1:3.8-0ubuntu2 deb -dirmngr 2.2.27-3ubuntu2.1 deb -dpkg 1.21.1ubuntu2.3 deb -e2fsprogs 1.46.5-2ubuntu1.1 deb -findutils 4.8.0-1ubuntu3 deb -gcc-12-base 12.3.0-1ubuntu1~22.04 deb -gnupg 2.2.27-3ubuntu2.1 deb -gnupg-l10n 2.2.27-3ubuntu2.1 deb -gnupg-utils 2.2.27-3ubuntu2.1 deb -gpg 2.2.27-3ubuntu2.1 deb -gpg-agent 2.2.27-3ubuntu2.1 deb -gpg-wks-client 2.2.27-3ubuntu2.1 deb -gpg-wks-server 2.2.27-3ubuntu2.1 deb -gpgconf 2.2.27-3ubuntu2.1 deb -gpgsm 2.2.27-3ubuntu2.1 deb -gpgv 2.2.27-3ubuntu2.1 deb -grep 3.7-1build1 deb -gzip 1.10-4ubuntu4.1 deb -hostname 3.23ubuntu2 deb -init-system-helpers 1.62 deb -jq 1.6-2.1ubuntu3 deb -libacl1 2.3.1-1 deb -libapt-pkg6.0 2.4.12 deb -libassuan0 2.5.5-1build1 deb -libattr1 1:2.5.1-1build1 deb -libaudit-common 1:3.0.7-1build1 deb -libaudit1 1:3.0.7-1build1 deb -libblkid1 2.37.2-4ubuntu3.4 deb -libbrotli1 1.0.9-2build6 deb -libbsd0 0.11.5-1 deb -libbz2-1.0 1.0.8-5build1 deb -libc-bin 2.35-0ubuntu3.8 deb -libc6 2.35-0ubuntu3.8 deb -libcap-ng0 0.7.9-2.2build3 deb -libcap2 1:2.44-1ubuntu0.22.04.1 deb -libcom-err2 1.46.5-2ubuntu1.1 deb -libcrypt1 1:4.4.27-1 deb -libcurl4 7.81.0-1ubuntu1.16 deb -libdb5.3 5.3.28+dfsg1-0.8ubuntu3 deb -libdebconfclient0 0.261ubuntu1 deb -libext2fs2 1.46.5-2ubuntu1.1 deb -libffi8 3.4.2-4 deb -libgcc-s1 12.3.0-1ubuntu1~22.04 deb -libgcrypt20 1.9.4-3ubuntu3 deb -libgmp10 2:6.2.1+dfsg-3ubuntu1 deb -libgnutls30 3.7.3-4ubuntu1.5 deb -libgpg-error0 1.43-3 deb -libgssapi-krb5-2 1.19.2-2ubuntu0.3 deb -libhogweed6 3.7.3-1build2 deb -libidn2-0 2.3.2-2build1 deb -libjq1 1.6-2.1ubuntu3 deb -libk5crypto3 1.19.2-2ubuntu0.3 deb -libkeyutils1 1.6.1-2ubuntu3 deb -libkmod2 29-1ubuntu1 deb -libkrb5-3 1.19.2-2ubuntu0.3 deb -libkrb5support0 1.19.2-2ubuntu0.3 deb -libksba8 1.6.0-2ubuntu0.2 deb -libldap-2.5-0 2.5.18+dfsg-0ubuntu0.22.04.2 deb -libldap-common 2.5.18+dfsg-0ubuntu0.22.04.2 deb -liblz4-1 1.9.3-2build2 deb -liblzma5 5.2.5-2ubuntu1 deb -libmd0 1.0.4-1build1 deb -libmount1 2.37.2-4ubuntu3.4 deb -libncurses6 6.3-2ubuntu0.1 deb -libncursesw6 6.3-2ubuntu0.1 deb -libnettle8 3.7.3-1build2 deb -libnghttp2-14 1.43.0-1ubuntu0.2 deb -libnpth0 1.6-3build2 deb -libnsl2 1.3.0-2build2 deb -libonig5 6.9.7.1-2build1 deb -libp11-kit0 0.24.0-6build1 deb -libpam-modules 1.4.0-11ubuntu2.4 deb -libpam-modules-bin 1.4.0-11ubuntu2.4 deb -libpam-runtime 1.4.0-11ubuntu2.4 deb -libpam0g 1.4.0-11ubuntu2.4 deb -libpcre2-8-0 10.39-3ubuntu0.1 deb -libpcre3 2:8.39-13ubuntu0.22.04.1 deb -libprocps8 2:3.3.17-6ubuntu2.1 deb -libpsl5 0.21.0-1.2build2 deb -libreadline8 8.1.2-1 deb -librtmp1 2.4+20151223.gitfa8646d.1-2build4 deb -libsasl2-2 2.1.27+dfsg2-3ubuntu1.2 deb -libsasl2-modules 2.1.27+dfsg2-3ubuntu1.2 deb -libsasl2-modules-db 2.1.27+dfsg2-3ubuntu1.2 deb -libseccomp2 2.5.3-2ubuntu2 deb -libselinux1 3.3-1build2 deb -libsemanage-common 3.3-1build2 deb -libsemanage2 3.3-1build2 deb -libsepol2 3.3-1build1 deb -libsmartcols1 2.37.2-4ubuntu3.4 deb -libsqlite3-0 3.37.2-2ubuntu0.3 deb -libss2 1.46.5-2ubuntu1.1 deb -libssh-4 0.9.6-2ubuntu0.22.04.3 deb -libssl3 3.0.2-0ubuntu1.16 deb -libstdc++6 12.3.0-1ubuntu1~22.04 deb -libsystemd0 249.11-0ubuntu3.12 deb -libtasn1-6 4.18.0-4build1 deb -libtinfo6 6.3-2ubuntu0.1 deb -libtirpc-common 1.3.2-2ubuntu0.1 deb -libtirpc3 1.3.2-2ubuntu0.1 deb -libudev1 249.11-0ubuntu3.12 deb -libunistring2 1.0-1 deb -libuuid1 2.37.2-4ubuntu3.4 deb -libxxhash0 0.8.1-1 deb -libzstd1 1.4.8+dfsg-3build1 deb -locales 2.35-0ubuntu3.8 deb -login 1:4.8.1-2ubuntu2.2 deb -logsave 1.46.5-2ubuntu1.1 deb -lsb-base 11.1.0ubuntu4 deb -mawk 1.3.4.20200120-3 deb -mount 2.37.2-4ubuntu3.4 deb -ncurses-base 6.3-2ubuntu0.1 deb -ncurses-bin 6.3-2ubuntu0.1 deb -netcat 1.218-4ubuntu1 deb -netcat-openbsd 1.218-4ubuntu1 deb -openssl 3.0.2-0ubuntu1.16 deb -passwd 1:4.8.1-2ubuntu2.2 deb -perl-base 5.34.0-3ubuntu1.3 deb -pinentry-curses 1.1.1-1build2 deb -plexmediaserver 1.40.4.8679-424562606 deb -procps 2:3.3.17-6ubuntu2.1 deb -publicsuffix 20211207.1025-1 deb -readline-common 8.1.2-1 deb -sed 4.8-1ubuntu2 deb -sensible-utils 0.0.17 deb -systemd-hwe-hwdb 249.11.5 deb -sysvinit-utils 3.01-1ubuntu1 deb -tar 1.34+dfsg-1ubuntu0.1.22.04.2 deb -tzdata 2024a-0ubuntu0.22.04.1 deb -ubuntu-keyring 2021.03.26 deb -udev 249.11-0ubuntu3.12 deb -usrmerge 25ubuntu2 deb -util-linux 2.37.2-4ubuntu3.4 deb -wget 1.21.2-2ubuntu1.1 deb -zlib1g 1:1.2.11.dfsg-2ubuntu9.2 deb +NAME VERSION TYPE +adduser 3.137ubuntu1 deb +apt 2.7.14build2 deb +apt-utils 2.7.14build2 deb +base-files 13ubuntu10 deb +base-passwd 3.6.3build1 deb +bash 5.2.21-2ubuntu4 deb +bsdutils 1:2.39.3-9ubuntu6 deb +ca-certificates 20240203 deb +catatonit 0.1.7-1 deb +coreutils 9.4-3ubuntu6 deb +cron 3.0pl1-184ubuntu2 deb +cron-daemon-common 3.0pl1-184ubuntu2 deb +curl 8.5.0-2ubuntu10.2 deb +dash 0.5.12-6ubuntu5 deb +debconf 1.5.86ubuntu1 deb +debianutils 5.17build1 deb +diffutils 1:3.10-1build1 deb +dirmngr 2.4.4-2ubuntu17 deb +dpkg 1.22.6ubuntu6 deb +e2fsprogs 1.47.0-2.4~exp1ubuntu4 deb +findutils 4.9.0-5build1 deb +gcc-14-base 14-20240412-0ubuntu1 deb +gnupg 2.4.4-2ubuntu17 deb +gnupg-l10n 2.4.4-2ubuntu17 deb +gnupg-utils 2.4.4-2ubuntu17 deb +gpg 2.4.4-2ubuntu17 deb +gpg-agent 2.4.4-2ubuntu17 deb +gpg-wks-client 2.4.4-2ubuntu17 deb +gpgconf 2.4.4-2ubuntu17 deb +gpgsm 2.4.4-2ubuntu17 deb +gpgv 2.4.4-2ubuntu17 deb +grep 3.11-4build1 deb +gzip 1.12-1ubuntu3 deb +hostname 3.23+nmu2ubuntu2 deb +init-system-helpers 1.66ubuntu1 deb +jq 1.7.1-3build1 deb +keyboxd 2.4.4-2ubuntu17 deb +krb5-locales 1.20.1-6ubuntu2 deb +libacl1 2.3.2-1build1 deb +libapt-pkg6.0t64 2.7.14build2 deb +libassuan0 2.5.6-1build1 deb +libattr1 1:2.5.2-1build1 deb +libaudit-common 1:3.1.2-2.1build1 deb +libaudit1 1:3.1.2-2.1build1 deb +libblkid1 2.39.3-9ubuntu6 deb +libbrotli1 1.1.0-2build2 deb +libbsd0 0.12.1-1build1 deb +libbz2-1.0 1.0.8-5.1 deb +libc-bin 2.39-0ubuntu8.2 deb +libc6 2.39-0ubuntu8.2 deb +libcap-ng0 0.8.4-2build2 deb +libcap2 1:2.66-5ubuntu2 deb +libcom-err2 1.47.0-2.4~exp1ubuntu4 deb +libcrypt1 1:4.4.36-4build1 deb +libcurl4t64 8.5.0-2ubuntu10.2 deb +libdb5.3t64 5.3.28+dfsg2-7 deb +libdebconfclient0 0.271ubuntu3 deb +libext2fs2t64 1.47.0-2.4~exp1ubuntu4 deb +libffi8 3.4.6-1build1 deb +libgcc-s1 14-20240412-0ubuntu1 deb +libgcrypt20 1.10.3-2build1 deb +libgmp10 2:6.3.0+dfsg-2ubuntu6 deb +libgnutls30t64 3.8.3-1.1ubuntu3.1 deb +libgpg-error0 1.47-3build2 deb +libgssapi-krb5-2 1.20.1-6ubuntu2 deb +libhogweed6t64 3.9.1-2.2build1 deb +libidn2-0 2.3.7-2build1 deb +libjq1 1.7.1-3build1 deb +libk5crypto3 1.20.1-6ubuntu2 deb +libkeyutils1 1.6.3-3build1 deb +libkmod2 31+20240202-2ubuntu7 deb +libkrb5-3 1.20.1-6ubuntu2 deb +libkrb5support0 1.20.1-6ubuntu2 deb +libksba8 1.6.6-1build1 deb +libldap-common 2.6.7+dfsg-1~exp1ubuntu8 deb +libldap2 2.6.7+dfsg-1~exp1ubuntu8 deb +liblz4-1 1.9.4-1build1 deb +liblzma5 5.6.1+really5.4.5-1 deb +libmd0 1.1.0-2build1 deb +libmount1 2.39.3-9ubuntu6 deb +libncursesw6 6.4+20240113-1ubuntu2 deb +libnettle8t64 3.9.1-2.2build1 deb +libnghttp2-14 1.59.0-1ubuntu0.1 deb +libnpth0t64 1.6-3.1build1 deb +libonig5 6.9.9-1build1 deb +libp11-kit0 0.25.3-4ubuntu2 deb +libpam-modules 1.5.3-5ubuntu5.1 deb +libpam-modules-bin 1.5.3-5ubuntu5.1 deb +libpam-runtime 1.5.3-5ubuntu5.1 deb +libpam0g 1.5.3-5ubuntu5.1 deb +libpcre2-8-0 10.42-4ubuntu2 deb +libproc2-0 2:4.0.4-4ubuntu3 deb +libpsl5t64 0.21.2-1.1build1 deb +libreadline8t64 8.2-4build1 deb +librtmp1 2.4+20151223.gitfa8646d.1-2build7 deb +libsasl2-2 2.1.28+dfsg1-5ubuntu3 deb +libsasl2-modules 2.1.28+dfsg1-5ubuntu3 deb +libsasl2-modules-db 2.1.28+dfsg1-5ubuntu3 deb +libseccomp2 2.5.5-1ubuntu3 deb +libselinux1 3.5-2ubuntu2 deb +libsemanage-common 3.5-1build5 deb +libsemanage2 3.5-1build5 deb +libsepol2 3.5-2build1 deb +libsmartcols1 2.39.3-9ubuntu6 deb +libsqlite3-0 3.45.1-1ubuntu2 deb +libss2 1.47.0-2.4~exp1ubuntu4 deb +libssh-4 0.10.6-2build2 deb +libssl3t64 3.0.13-0ubuntu3.2 deb +libstdc++6 14-20240412-0ubuntu1 deb +libsystemd0 255.4-1ubuntu8.2 deb +libtasn1-6 4.19.0-3build1 deb +libtinfo6 6.4+20240113-1ubuntu2 deb +libudev1 255.4-1ubuntu8.2 deb +libunistring5 1.1-2build1 deb +libuuid1 2.39.3-9ubuntu6 deb +libxxhash0 0.8.2-2build1 deb +libzstd1 1.5.5+dfsg2-2build1 deb +locales 2.39-0ubuntu8.2 deb +login 1:4.13+dfsg1-4ubuntu3 deb +logsave 1.47.0-2.4~exp1ubuntu4 deb +mawk 1.3.4.20240123-1build1 deb +mount 2.39.3-9ubuntu6 deb +ncurses-base 6.4+20240113-1ubuntu2 deb +ncurses-bin 6.4+20240113-1ubuntu2 deb +netcat-openbsd 1.226-1ubuntu2 deb +openssl 3.0.13-0ubuntu3.2 deb +passwd 1:4.13+dfsg1-4ubuntu3 deb +perl-base 5.38.2-3.2build2 deb +pinentry-curses 1.2.1-3ubuntu5 deb +plexmediaserver 1.40.4.8679-424562606 deb +procps 2:4.0.4-4ubuntu3 deb +publicsuffix 20231001.0357-0.1 deb +readline-common 8.2-4build1 deb +sed 4.9-2build1 deb +sensible-utils 0.0.22 deb +systemd-dev 255.4-1ubuntu8.2 deb +systemd-hwe-hwdb 255.1.3 deb +systemd-standalone-sysusers 255.4-1ubuntu8.2 deb +sysvinit-utils 3.08-6ubuntu3 deb +tar 1.35+dfsg-3build1 deb +tzdata 2024a-3ubuntu1.1 deb +ubuntu-keyring 2023.11.28.1 deb +udev 255.4-1ubuntu8.2 deb +util-linux 2.39.3-9ubuntu6 deb +wget 1.21.4-1ubuntu4.1 deb +zlib1g 1:1.3.dfsg-3.1ubuntu2 deb From c7717810aea36c556de2d928825cf776e84f9609 Mon Sep 17 00:00:00 2001 From: thespad <spad@linuxserver.io> Date: Tue, 13 Aug 2024 17:25:28 +0100 Subject: [PATCH 411/514] Fix logo URL --- readme-vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme-vars.yml b/readme-vars.yml index 705594a..43f14de 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -3,7 +3,7 @@ # project information project_name: plex project_url: "https://plex.tv" -project_logo: "http://the-gadgeteer.com/wp-content/uploads/2015/10/plex-logo-e1446990678679.png" +project_logo: "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/plex-logo.png" project_blurb: "[{{ project_name|capitalize }}]({{ project_url }}) organizes video, music and photos from personal media libraries and streams them to smart TVs, streaming boxes and mobile devices. This container is packaged as a standalone Plex Media Server. Straightforward design and bulk actions mean getting things done faster." project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}" # supported architectures From 409420813e49d3bae3b67d7e6eed94991793ec15 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 13 Aug 2024 18:31:15 +0000 Subject: [PATCH 412/514] Bot Updating Templated Files --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5c2006d..f73eae5 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ Find us at: [Plex](https://plex.tv) organizes video, music and photos from personal media libraries and streams them to smart TVs, streaming boxes and mobile devices. This container is packaged as a standalone Plex Media Server. Straightforward design and bulk actions mean getting things done faster. -[![plex](http://the-gadgeteer.com/wp-content/uploads/2015/10/plex-logo-e1446990678679.png)](https://plex.tv) +[![plex](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/plex-logo.png)](https://plex.tv) ## Supported Architectures From b646ebaabe2f773c7f306733d24af8c0a68ff4b1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Wed, 14 Aug 2024 17:31:21 +0000 Subject: [PATCH 413/514] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index a95fe87..21053c8 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -36,7 +36,7 @@ hostname 3.23+nmu2ubuntu2 deb init-system-helpers 1.66ubuntu1 deb jq 1.7.1-3build1 deb keyboxd 2.4.4-2ubuntu17 deb -krb5-locales 1.20.1-6ubuntu2 deb +krb5-locales 1.20.1-6ubuntu2.1 deb libacl1 2.3.2-1build1 deb libapt-pkg6.0t64 2.7.14build2 deb libassuan0 2.5.6-1build1 deb @@ -63,15 +63,15 @@ libgcrypt20 1.10.3-2build1 deb libgmp10 2:6.3.0+dfsg-2ubuntu6 deb libgnutls30t64 3.8.3-1.1ubuntu3.1 deb libgpg-error0 1.47-3build2 deb -libgssapi-krb5-2 1.20.1-6ubuntu2 deb +libgssapi-krb5-2 1.20.1-6ubuntu2.1 deb libhogweed6t64 3.9.1-2.2build1 deb libidn2-0 2.3.7-2build1 deb libjq1 1.7.1-3build1 deb -libk5crypto3 1.20.1-6ubuntu2 deb +libk5crypto3 1.20.1-6ubuntu2.1 deb libkeyutils1 1.6.3-3build1 deb libkmod2 31+20240202-2ubuntu7 deb -libkrb5-3 1.20.1-6ubuntu2 deb -libkrb5support0 1.20.1-6ubuntu2 deb +libkrb5-3 1.20.1-6ubuntu2.1 deb +libkrb5support0 1.20.1-6ubuntu2.1 deb libksba8 1.6.6-1build1 deb libldap-common 2.6.7+dfsg-1~exp1ubuntu8 deb libldap2 2.6.7+dfsg-1~exp1ubuntu8 deb @@ -128,7 +128,7 @@ openssl 3.0.13-0ubuntu3.2 deb passwd 1:4.13+dfsg1-4ubuntu3 deb perl-base 5.38.2-3.2build2 deb pinentry-curses 1.2.1-3ubuntu5 deb -plexmediaserver 1.40.4.8679-424562606 deb +plexmediaserver 1.40.5.8854-f36c552fd deb procps 2:4.0.4-4ubuntu3 deb publicsuffix 20231001.0357-0.1 deb readline-common 8.2-4build1 deb From c4de83bb82c51a95f10f649c35abee8829fc1c9b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 19 Aug 2024 09:21:35 +0000 Subject: [PATCH 414/514] Bot Updating Templated Files --- Jenkinsfile | 62 ++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 52 insertions(+), 10 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b2bd1ea..2bcd4ae 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,6 +17,8 @@ pipeline { GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0') GITLAB_NAMESPACE=credentials('gitlab-namespace-id') DOCKERHUB_TOKEN=credentials('docker-hub-ci-pat') + QUAYIO_API_TOKEN=credentials('quayio-repo-api-token') + GIT_SIGNING_KEY=credentials('484fbca6-9a4f-455e-b9e3-97ac98785f5f') JSON_URL = 'https://plex.tv/api/downloads/5.json' JSON_PATH = '.computer.Linux.version' BUILD_VERSION_ARG = 'PLEX_RELEASE' @@ -38,9 +40,23 @@ pipeline { CI_WEBPATH='/web/index.html' } stages { + stage("Set git config"){ + steps{ + sh '''#!/bin/bash + cat ${GIT_SIGNING_KEY} > /config/.ssh/id_sign + chmod 600 /config/.ssh/id_sign + ssh-keygen -y -f /config/.ssh/id_sign > /config/.ssh/id_sign.pub + echo "Using $(ssh-keygen -lf /config/.ssh/id_sign) to sign commits" + git config --global gpg.format ssh + git config --global user.signingkey /config/.ssh/id_sign + git config --global commit.gpgsign true + ''' + } + } // Setup all the basic environment variables needed for the build stage("Set ENV Variables base"){ steps{ + echo "Running on node: ${NODE_NAME}" sh '''#! /bin/bash containers=$(docker ps -aq) if [[ -n "${containers}" ]]; then @@ -383,9 +399,9 @@ pipeline { echo "Updating Unraid template" cd ${TEMPDIR}/unraid/templates/ GH_TEMPLATES_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||') - if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list && [[ -f ${TEMPDIR}/unraid/templates/unraid/deprecated/${CONTAINER_NAME}.xml ]]; then + if grep -wq "^${CONTAINER_NAME}$" ${TEMPDIR}/unraid/templates/unraid/ignore.list && [[ -f ${TEMPDIR}/unraid/templates/unraid/deprecated/${CONTAINER_NAME}.xml ]]; then echo "Image is on the ignore list, and already in the deprecation folder." - elif grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then + elif grep -wq "^${CONTAINER_NAME}$" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then echo "Image is on the ignore list, marking Unraid template as deprecated" cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ git add -u unraid/${CONTAINER_NAME}.xml @@ -478,10 +494,10 @@ pipeline { } } /* ####################### - GitLab Mirroring + GitLab Mirroring and Quay.io Repo Visibility ####################### */ - // Ping into Gitlab to mirror this repo and have a registry endpoint - stage("GitLab Mirror"){ + // Ping into Gitlab to mirror this repo and have a registry endpoint & mark this repo on Quay.io as public + stage("GitLab Mirror and Quay.io Visibility"){ when { environment name: 'EXIT_STATUS', value: '' } @@ -497,6 +513,8 @@ pipeline { "visibility":"public"}' ''' sh '''curl -H "Private-Token: ${GITLAB_TOKEN}" -X PUT "https://gitlab.com/api/v4/projects/Linuxserver.io%2F${LS_REPO}" \ -d "mirror=true&import_url=https://github.com/linuxserver/${LS_REPO}.git" ''' + sh '''curl -H "Content-Type: application/json" -H "Authorization: Bearer ${QUAYIO_API_TOKEN}" -X POST "https://quay.io/api/v1/repository${QUAYIMAGE/quay.io/}/changevisibility" \ + -d '{"visibility":"public"}' ||: ''' } } /* ############### @@ -591,7 +609,7 @@ pipeline { --provenance=false --sbom=false \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" - retry(5) { + retry_backoff(5,5) { sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" } sh '''#! /bin/bash @@ -747,7 +765,7 @@ pipeline { passwordVariable: 'QUAYPASS' ] ]) { - retry(5) { + retry_backoff(5,5) { sh '''#! /bin/bash set -e echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin @@ -765,7 +783,7 @@ pipeline { docker push ${PUSHIMAGE}:${META_TAG} docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG} if [ -n "${SEMVER}" ]; then - docker push ${PUSHIMAGE}:${SEMVER} + docker push ${PUSHIMAGE}:${SEMVER} fi done ''' @@ -788,7 +806,7 @@ pipeline { passwordVariable: 'QUAYPASS' ] ]) { - retry(5) { + retry_backoff(5,5) { sh '''#! /bin/bash set -e echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin @@ -851,7 +869,7 @@ pipeline { "object": "'${COMMIT_SHA}'",\ "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to master",\ "type": "commit",\ - "tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' ''' + "tagger": {"name": "LinuxServer-CI","email": "ci@linuxserver.io","date": "'${GITHUB_DATE}'"}}' ''' echo "Pushing New release for Tag" sh '''#! /bin/bash echo "Data change at JSON endpoint ${JSON_URL}" > releasebody.json @@ -983,6 +1001,13 @@ EOF ###################### */ post { always { + sh '''#!/bin/bash + rm -rf /config/.ssh/id_sign + rm -rf /config/.ssh/id_sign.pub + git config --global --unset gpg.format + git config --global --unset user.signingkey + git config --global --unset commit.gpgsign + ''' script{ if (env.EXIT_STATUS == "ABORTED"){ sh 'echo "build aborted"' @@ -1012,3 +1037,20 @@ EOF } } } + +def retry_backoff(int max_attempts, int power_base, Closure c) { + int n = 0 + while (n < max_attempts) { + try { + c() + return + } catch (err) { + if ((n + 1) >= max_attempts) { + throw err + } + sleep(power_base ** n) + n++ + } + } + return +} From cc4cae358a60df11e3ff0983277f656486184c66 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 19 Aug 2024 09:23:06 +0000 Subject: [PATCH 415/514] Bot Updating Templated Files --- .github/workflows/external_trigger.yml | 45 +++++++++---------- .../workflows/external_trigger_scheduler.yml | 24 +++++----- .github/workflows/package_trigger.yml | 22 ++++----- .../workflows/package_trigger_scheduler.yml | 18 ++++---- 4 files changed, 54 insertions(+), 55 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 2c00913..1318d39 100644 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -12,17 +12,20 @@ jobs: - name: External Trigger if: github.ref == 'refs/heads/master' run: | + printf "# External trigger for docker-plex\n\n" >> $GITHUB_STEP_SUMMARY if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_PLEX_MASTER }}" ]; then - echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_PLEX_MASTER is set; skipping trigger. ****" - echo "Github secret \`PAUSE_EXTERNAL_TRIGGER_PLEX_MASTER\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> Github secret \`PAUSE_EXTERNAL_TRIGGER_PLEX_MASTER\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY exit 0 fi - echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_PLEX_MASTER\". ****" - echo "External trigger running off of master branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_PLEX_MASTER\`" >> $GITHUB_STEP_SUMMARY - echo "**** Retrieving external version ****" + echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY + echo "> External trigger running off of master branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_PLEX_MASTER\`" >> $GITHUB_STEP_SUMMARY + printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY EXT_RELEASE=$(curl -s "https://plex.tv/api/downloads/5.json" | jq -r '. | .computer.Linux.version') + echo "Type is \`custom_json\`" >> $GITHUB_STEP_SUMMARY if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then - echo "**** Can't retrieve external version, exiting ****" + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> Can't retrieve external version, exiting" >> $GITHUB_STEP_SUMMARY FAILURE_REASON="Can't retrieve external version for plex branch master" GHA_TRIGGER_URL="https://github.com/linuxserver/docker-plex/actions/runs/${{ github.run_id }}" curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680, @@ -31,9 +34,8 @@ jobs: exit 1 fi EXT_RELEASE=$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g') - echo "**** External version: ${EXT_RELEASE} ****" - echo "External version: ${EXT_RELEASE}" >> $GITHUB_STEP_SUMMARY - echo "**** Retrieving last pushed version ****" + echo "External version: \`${EXT_RELEASE}\`" >> $GITHUB_STEP_SUMMARY + echo "Retrieving last pushed version" >> $GITHUB_STEP_SUMMARY image="linuxserver/plex" tag="latest" token=$(curl -sX GET \ @@ -60,37 +62,34 @@ jobs: IMAGE_RELEASE=$(echo ${image_info} | jq -r '.Labels.build_version' | awk '{print $3}') IMAGE_VERSION=$(echo ${IMAGE_RELEASE} | awk -F'-ls' '{print $1}') if [ -z "${IMAGE_VERSION}" ]; then - echo "**** Can't retrieve last pushed version, exiting ****" + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "Can't retrieve last pushed version, exiting" >> $GITHUB_STEP_SUMMARY FAILURE_REASON="Can't retrieve last pushed version for plex tag latest" curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680, "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}], "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} exit 1 fi - echo "**** Last pushed version: ${IMAGE_VERSION} ****" - echo "Last pushed version: ${IMAGE_VERSION}" >> $GITHUB_STEP_SUMMARY + echo "Last pushed version: \`${IMAGE_VERSION}\`" >> $GITHUB_STEP_SUMMARY if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then - echo "**** Version ${EXT_RELEASE} already pushed, exiting ****" - echo "Version ${EXT_RELEASE} already pushed, exiting" >> $GITHUB_STEP_SUMMARY + echo "Version \`${EXT_RELEASE}\` already pushed, exiting" >> $GITHUB_STEP_SUMMARY exit 0 elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-plex/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then - echo "**** New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting ****" - echo "New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY + echo "New version \`${EXT_RELEASE}\` found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY exit 0 else - echo "**** New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build ****" - echo "New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build" >> $GITHUB_STEP_SUMMARY + printf "\n## Trigger new build\n\n" >> $GITHUB_STEP_SUMMARY + echo "New version \`${EXT_RELEASE}\` found; old version was \`${IMAGE_VERSION}\`. Triggering new build" >> $GITHUB_STEP_SUMMARY response=$(curl -iX POST \ https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-plex/job/master/buildWithParameters?PACKAGE_CHECK=false \ --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") - echo "**** Jenkins job queue url: ${response%$'\r'} ****" - echo "**** Sleeping 10 seconds until job starts ****" + echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY + echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY sleep 10 buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url') buildurl="${buildurl%$'\r'}" - echo "**** Jenkins job build url: ${buildurl} ****" - echo "Jenkins job build url: ${buildurl}" >> $GITHUB_STEP_SUMMARY - echo "**** Attempting to change the Jenkins job description ****" + echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY + echo "Attempting to change the Jenkins job description" >> $GITHUB_STEP_SUMMARY curl -iX POST \ "${buildurl}submitDescription" \ --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \ diff --git a/.github/workflows/external_trigger_scheduler.yml b/.github/workflows/external_trigger_scheduler.yml index c48d8ed..d1c45f1 100644 --- a/.github/workflows/external_trigger_scheduler.yml +++ b/.github/workflows/external_trigger_scheduler.yml @@ -15,31 +15,31 @@ jobs: - name: External Trigger Scheduler run: | - echo "**** Branches found: ****" - git for-each-ref --format='%(refname:short)' refs/remotes - for br in $(git for-each-ref --format='%(refname:short)' refs/remotes) + printf "# External trigger scheduler for docker-plex\n\n" >> $GITHUB_STEP_SUMMARY + printf "Found the branches:\n\n%s\n" "$(git for-each-ref --format='- %(refname:lstrip=3)' refs/remotes)" >> $GITHUB_STEP_SUMMARY + for br in $(git for-each-ref --format='%(refname:lstrip=3)' refs/remotes) do - br=$(echo "$br" | sed 's|origin/||g') - echo "**** Evaluating branch ${br} ****" + if [[ "${br}" == "HEAD" ]]; then + printf "\nSkipping %s.\n" ${br} >> $GITHUB_STEP_SUMMARY + continue + fi + printf "\n## Evaluating \`%s\`\n\n" ${br} >> $GITHUB_STEP_SUMMARY ls_jenkins_vars=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-plex/${br}/jenkins-vars.yml) ls_branch=$(echo "${ls_jenkins_vars}" | yq -r '.ls_branch') ls_trigger=$(echo "${ls_jenkins_vars}" | yq -r '.external_type') if [[ "${br}" == "${ls_branch}" ]] && [[ "${ls_trigger}" != "os" ]]; then - echo "**** Branch ${br} appears to be live and trigger is not os; checking workflow. ****" + echo "Branch appears to be live and trigger is not os; checking workflow." >> $GITHUB_STEP_SUMMARY if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-plex/${br}/.github/workflows/external_trigger.yml > /dev/null 2>&1; then - echo "**** Workflow exists. Triggering external trigger workflow for branch ${br} ****." - echo "Triggering external trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY + echo "Triggering external trigger workflow for branch." >> $GITHUB_STEP_SUMMARY curl -iX POST \ -H "Authorization: token ${{ secrets.CR_PAT }}" \ -H "Accept: application/vnd.github.v3+json" \ -d "{\"ref\":\"refs/heads/${br}\"}" \ https://api.github.com/repos/linuxserver/docker-plex/actions/workflows/external_trigger.yml/dispatches else - echo "**** Workflow doesn't exist; skipping trigger. ****" - echo "Skipping branch ${br} due to no external trigger workflow present." >> $GITHUB_STEP_SUMMARY + echo "Skipping branch due to no external trigger workflow present." >> $GITHUB_STEP_SUMMARY fi else - echo "**** ${br} is either a dev branch, or has no external version; skipping trigger. ****" - echo "Skipping branch ${br} due to being detected as dev branch or having no external version." >> $GITHUB_STEP_SUMMARY + echo "Skipping branch due to being detected as dev branch or having no external version." >> $GITHUB_STEP_SUMMARY fi done diff --git a/.github/workflows/package_trigger.yml b/.github/workflows/package_trigger.yml index 42a5652..77b3e2f 100644 --- a/.github/workflows/package_trigger.yml +++ b/.github/workflows/package_trigger.yml @@ -12,29 +12,29 @@ jobs: - name: Package Trigger if: github.ref == 'refs/heads/master' run: | + printf "# Package trigger for docker-plex\n\n" >> $GITHUB_STEP_SUMMARY if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_PLEX_MASTER }}" ]; then - echo "**** Github secret PAUSE_PACKAGE_TRIGGER_PLEX_MASTER is set; skipping trigger. ****" - echo "Github secret \`PAUSE_PACKAGE_TRIGGER_PLEX_MASTER\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> Github secret \`PAUSE_PACKAGE_TRIGGER_PLEX_MASTER\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY exit 0 fi if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-plex/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then - echo "**** There already seems to be an active build on Jenkins; skipping package trigger ****" - echo "There already seems to be an active build on Jenkins; skipping package trigger" >> $GITHUB_STEP_SUMMARY + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> There already seems to be an active build on Jenkins; skipping package trigger" >> $GITHUB_STEP_SUMMARY exit 0 fi - echo "**** Package trigger running off of master branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_PLEX_MASTER\". ****" - echo "Package trigger running off of master branch. To disable, set a Github secret named \`PAUSE_PACKAGE_TRIGGER_PLEX_MASTER\`" >> $GITHUB_STEP_SUMMARY + echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY + echo "> Package trigger running off of master branch. To disable, set a Github secret named \`PAUSE_PACKAGE_TRIGGER_PLEX_MASTER\`" >> $GITHUB_STEP_SUMMARY response=$(curl -iX POST \ https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-plex/job/master/buildWithParameters?PACKAGE_CHECK=true \ --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") - echo "**** Jenkins job queue url: ${response%$'\r'} ****" - echo "**** Sleeping 10 seconds until job starts ****" + echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY + echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY sleep 10 buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url') buildurl="${buildurl%$'\r'}" - echo "**** Jenkins job build url: ${buildurl} ****" - echo "Jenkins job build url: ${buildurl}" >> $GITHUB_STEP_SUMMARY - echo "**** Attempting to change the Jenkins job description ****" + echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY + echo "Attempting to change the Jenkins job description" >> $GITHUB_STEP_SUMMARY curl -iX POST \ "${buildurl}submitDescription" \ --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \ diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml index fb3926a..131561d 100644 --- a/.github/workflows/package_trigger_scheduler.yml +++ b/.github/workflows/package_trigger_scheduler.yml @@ -15,17 +15,19 @@ jobs: - name: Package Trigger Scheduler run: | - echo "**** Branches found: ****" - git for-each-ref --format='%(refname:short)' refs/remotes - for br in $(git for-each-ref --format='%(refname:short)' refs/remotes) + printf "# Package trigger scheduler for docker-plex\n\n" >> $GITHUB_STEP_SUMMARY + printf "Found the branches:\n\n%s\n" "$(git for-each-ref --format='- %(refname:lstrip=3)' refs/remotes)" >> $GITHUB_STEP_SUMMARY + for br in $(git for-each-ref --format='%(refname:lstrip=3)' refs/remotes) do - br=$(echo "$br" | sed 's|origin/||g') - echo "**** Evaluating branch ${br} ****" + if [[ "${br}" == "HEAD" ]]; then + printf "\nSkipping %s.\n" ${br} >> $GITHUB_STEP_SUMMARY + continue + fi + printf "\n## Evaluating \`%s\`\n\n" ${br} >> $GITHUB_STEP_SUMMARY ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-plex/${br}/jenkins-vars.yml | yq -r '.ls_branch') if [ "${br}" == "${ls_branch}" ]; then - echo "**** Branch ${br} appears to be live; checking workflow. ****" + echo "Branch appears to be live; checking workflow." >> $GITHUB_STEP_SUMMARY if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-plex/${br}/.github/workflows/package_trigger.yml > /dev/null 2>&1; then - echo "**** Workflow exists. Triggering package trigger workflow for branch ${br}. ****" echo "Triggering package trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY triggered_branches="${triggered_branches}${br} " curl -iX POST \ @@ -35,11 +37,9 @@ jobs: https://api.github.com/repos/linuxserver/docker-plex/actions/workflows/package_trigger.yml/dispatches sleep 30 else - echo "**** Workflow doesn't exist; skipping trigger. ****" echo "Skipping branch ${br} due to no package trigger workflow present." >> $GITHUB_STEP_SUMMARY fi else - echo "**** ${br} appears to be a dev branch; skipping trigger. ****" echo "Skipping branch ${br} due to being detected as dev branch." >> $GITHUB_STEP_SUMMARY fi done From a42349565e21dc7f11c25ef814ecdd279d4ffb30 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Wed, 21 Aug 2024 14:33:03 +0000 Subject: [PATCH 416/514] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 21053c8..5b0ac37 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -17,7 +17,7 @@ debconf 1.5.86ubuntu1 deb debianutils 5.17build1 deb diffutils 1:3.10-1build1 deb dirmngr 2.4.4-2ubuntu17 deb -dpkg 1.22.6ubuntu6 deb +dpkg 1.22.6ubuntu6.1 deb e2fsprogs 1.47.0-2.4~exp1ubuntu4 deb findutils 4.9.0-5build1 deb gcc-14-base 14-20240412-0ubuntu1 deb @@ -128,7 +128,7 @@ openssl 3.0.13-0ubuntu3.2 deb passwd 1:4.13+dfsg1-4ubuntu3 deb perl-base 5.38.2-3.2build2 deb pinentry-curses 1.2.1-3ubuntu5 deb -plexmediaserver 1.40.5.8854-f36c552fd deb +plexmediaserver 1.40.5.8897-e5987a19d deb procps 2:4.0.4-4ubuntu3 deb publicsuffix 20231001.0357-0.1 deb readline-common 8.2-4build1 deb From d5716af54ba33fd39829ce3d139982f05d0fcc6f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 26 Aug 2024 09:23:00 +0000 Subject: [PATCH 417/514] Bot Updating Package Versions --- package_versions.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 5b0ac37..a8a3141 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -108,10 +108,10 @@ libss2 1.47.0-2.4~exp1ubuntu4 deb libssh-4 0.10.6-2build2 deb libssl3t64 3.0.13-0ubuntu3.2 deb libstdc++6 14-20240412-0ubuntu1 deb -libsystemd0 255.4-1ubuntu8.2 deb +libsystemd0 255.4-1ubuntu8.4 deb libtasn1-6 4.19.0-3build1 deb libtinfo6 6.4+20240113-1ubuntu2 deb -libudev1 255.4-1ubuntu8.2 deb +libudev1 255.4-1ubuntu8.4 deb libunistring5 1.1-2build1 deb libuuid1 2.39.3-9ubuntu6 deb libxxhash0 0.8.2-2build1 deb @@ -134,14 +134,14 @@ publicsuffix 20231001.0357-0.1 deb readline-common 8.2-4build1 deb sed 4.9-2build1 deb sensible-utils 0.0.22 deb -systemd-dev 255.4-1ubuntu8.2 deb +systemd-dev 255.4-1ubuntu8.4 deb systemd-hwe-hwdb 255.1.3 deb -systemd-standalone-sysusers 255.4-1ubuntu8.2 deb +systemd-standalone-sysusers 255.4-1ubuntu8.4 deb sysvinit-utils 3.08-6ubuntu3 deb tar 1.35+dfsg-3build1 deb tzdata 2024a-3ubuntu1.1 deb ubuntu-keyring 2023.11.28.1 deb -udev 255.4-1ubuntu8.2 deb +udev 255.4-1ubuntu8.4 deb util-linux 2.39.3-9ubuntu6 deb wget 1.21.4-1ubuntu4.1 deb zlib1g 1:1.3.dfsg-3.1ubuntu2 deb From 4e96653f2631beae6dd7dda7a8528268e9af19bc Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Wed, 28 Aug 2024 12:51:03 +0000 Subject: [PATCH 418/514] Bot Updating Package Versions --- package_versions.txt | 68 ++++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index a8a3141..ae5788c 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -2,23 +2,23 @@ NAME VERSION TYPE adduser 3.137ubuntu1 deb apt 2.7.14build2 deb apt-utils 2.7.14build2 deb -base-files 13ubuntu10 deb +base-files 13ubuntu10.1 deb base-passwd 3.6.3build1 deb bash 5.2.21-2ubuntu4 deb -bsdutils 1:2.39.3-9ubuntu6 deb +bsdutils 1:2.39.3-9ubuntu6.1 deb ca-certificates 20240203 deb catatonit 0.1.7-1 deb coreutils 9.4-3ubuntu6 deb cron 3.0pl1-184ubuntu2 deb cron-daemon-common 3.0pl1-184ubuntu2 deb -curl 8.5.0-2ubuntu10.2 deb +curl 8.5.0-2ubuntu10.3 deb dash 0.5.12-6ubuntu5 deb debconf 1.5.86ubuntu1 deb debianutils 5.17build1 deb diffutils 1:3.10-1build1 deb dirmngr 2.4.4-2ubuntu17 deb dpkg 1.22.6ubuntu6.1 deb -e2fsprogs 1.47.0-2.4~exp1ubuntu4 deb +e2fsprogs 1.47.0-2.4~exp1ubuntu4.1 deb findutils 4.9.0-5build1 deb gcc-14-base 14-20240412-0ubuntu1 deb gnupg 2.4.4-2ubuntu17 deb @@ -43,28 +43,28 @@ libassuan0 2.5.6-1build1 deb libattr1 1:2.5.2-1build1 deb libaudit-common 1:3.1.2-2.1build1 deb libaudit1 1:3.1.2-2.1build1 deb -libblkid1 2.39.3-9ubuntu6 deb +libblkid1 2.39.3-9ubuntu6.1 deb libbrotli1 1.1.0-2build2 deb libbsd0 0.12.1-1build1 deb -libbz2-1.0 1.0.8-5.1 deb -libc-bin 2.39-0ubuntu8.2 deb -libc6 2.39-0ubuntu8.2 deb +libbz2-1.0 1.0.8-5.1build0.1 deb +libc-bin 2.39-0ubuntu8.3 deb +libc6 2.39-0ubuntu8.3 deb libcap-ng0 0.8.4-2build2 deb libcap2 1:2.66-5ubuntu2 deb -libcom-err2 1.47.0-2.4~exp1ubuntu4 deb +libcom-err2 1.47.0-2.4~exp1ubuntu4.1 deb libcrypt1 1:4.4.36-4build1 deb -libcurl4t64 8.5.0-2ubuntu10.2 deb +libcurl4t64 8.5.0-2ubuntu10.3 deb libdb5.3t64 5.3.28+dfsg2-7 deb libdebconfclient0 0.271ubuntu3 deb -libext2fs2t64 1.47.0-2.4~exp1ubuntu4 deb +libext2fs2t64 1.47.0-2.4~exp1ubuntu4.1 deb libffi8 3.4.6-1build1 deb libgcc-s1 14-20240412-0ubuntu1 deb libgcrypt20 1.10.3-2build1 deb libgmp10 2:6.3.0+dfsg-2ubuntu6 deb -libgnutls30t64 3.8.3-1.1ubuntu3.1 deb +libgnutls30t64 3.8.3-1.1ubuntu3.2 deb libgpg-error0 1.47-3build2 deb libgssapi-krb5-2 1.20.1-6ubuntu2.1 deb -libhogweed6t64 3.9.1-2.2build1 deb +libhogweed6t64 3.9.1-2.2build1.1 deb libidn2-0 2.3.7-2build1 deb libjq1 1.7.1-3build1 deb libk5crypto3 1.20.1-6ubuntu2.1 deb @@ -75,16 +75,16 @@ libkrb5support0 1.20.1-6ubuntu2.1 deb libksba8 1.6.6-1build1 deb libldap-common 2.6.7+dfsg-1~exp1ubuntu8 deb libldap2 2.6.7+dfsg-1~exp1ubuntu8 deb -liblz4-1 1.9.4-1build1 deb -liblzma5 5.6.1+really5.4.5-1 deb +liblz4-1 1.9.4-1build1.1 deb +liblzma5 5.6.1+really5.4.5-1build0.1 deb libmd0 1.1.0-2build1 deb -libmount1 2.39.3-9ubuntu6 deb +libmount1 2.39.3-9ubuntu6.1 deb libncursesw6 6.4+20240113-1ubuntu2 deb -libnettle8t64 3.9.1-2.2build1 deb +libnettle8t64 3.9.1-2.2build1.1 deb libnghttp2-14 1.59.0-1ubuntu0.1 deb libnpth0t64 1.6-3.1build1 deb libonig5 6.9.9-1build1 deb -libp11-kit0 0.25.3-4ubuntu2 deb +libp11-kit0 0.25.3-4ubuntu2.1 deb libpam-modules 1.5.3-5ubuntu5.1 deb libpam-modules-bin 1.5.3-5ubuntu5.1 deb libpam-runtime 1.5.3-5ubuntu5.1 deb @@ -94,41 +94,41 @@ libproc2-0 2:4.0.4-4ubuntu3 deb libpsl5t64 0.21.2-1.1build1 deb libreadline8t64 8.2-4build1 deb librtmp1 2.4+20151223.gitfa8646d.1-2build7 deb -libsasl2-2 2.1.28+dfsg1-5ubuntu3 deb -libsasl2-modules 2.1.28+dfsg1-5ubuntu3 deb -libsasl2-modules-db 2.1.28+dfsg1-5ubuntu3 deb -libseccomp2 2.5.5-1ubuntu3 deb +libsasl2-2 2.1.28+dfsg1-5ubuntu3.1 deb +libsasl2-modules 2.1.28+dfsg1-5ubuntu3.1 deb +libsasl2-modules-db 2.1.28+dfsg1-5ubuntu3.1 deb +libseccomp2 2.5.5-1ubuntu3.1 deb libselinux1 3.5-2ubuntu2 deb libsemanage-common 3.5-1build5 deb libsemanage2 3.5-1build5 deb libsepol2 3.5-2build1 deb -libsmartcols1 2.39.3-9ubuntu6 deb +libsmartcols1 2.39.3-9ubuntu6.1 deb libsqlite3-0 3.45.1-1ubuntu2 deb -libss2 1.47.0-2.4~exp1ubuntu4 deb +libss2 1.47.0-2.4~exp1ubuntu4.1 deb libssh-4 0.10.6-2build2 deb -libssl3t64 3.0.13-0ubuntu3.2 deb +libssl3t64 3.0.13-0ubuntu3.3 deb libstdc++6 14-20240412-0ubuntu1 deb libsystemd0 255.4-1ubuntu8.4 deb libtasn1-6 4.19.0-3build1 deb libtinfo6 6.4+20240113-1ubuntu2 deb libudev1 255.4-1ubuntu8.4 deb libunistring5 1.1-2build1 deb -libuuid1 2.39.3-9ubuntu6 deb +libuuid1 2.39.3-9ubuntu6.1 deb libxxhash0 0.8.2-2build1 deb -libzstd1 1.5.5+dfsg2-2build1 deb -locales 2.39-0ubuntu8.2 deb +libzstd1 1.5.5+dfsg2-2build1.1 deb +locales 2.39-0ubuntu8.3 deb login 1:4.13+dfsg1-4ubuntu3 deb -logsave 1.47.0-2.4~exp1ubuntu4 deb +logsave 1.47.0-2.4~exp1ubuntu4.1 deb mawk 1.3.4.20240123-1build1 deb -mount 2.39.3-9ubuntu6 deb +mount 2.39.3-9ubuntu6.1 deb ncurses-base 6.4+20240113-1ubuntu2 deb ncurses-bin 6.4+20240113-1ubuntu2 deb netcat-openbsd 1.226-1ubuntu2 deb -openssl 3.0.13-0ubuntu3.2 deb +openssl 3.0.13-0ubuntu3.3 deb passwd 1:4.13+dfsg1-4ubuntu3 deb perl-base 5.38.2-3.2build2 deb pinentry-curses 1.2.1-3ubuntu5 deb -plexmediaserver 1.40.5.8897-e5987a19d deb +plexmediaserver 1.40.5.8921-836b34c27 deb procps 2:4.0.4-4ubuntu3 deb publicsuffix 20231001.0357-0.1 deb readline-common 8.2-4build1 deb @@ -142,6 +142,6 @@ tar 1.35+dfsg-3build1 deb tzdata 2024a-3ubuntu1.1 deb ubuntu-keyring 2023.11.28.1 deb udev 255.4-1ubuntu8.4 deb -util-linux 2.39.3-9ubuntu6 deb +util-linux 2.39.3-9ubuntu6.1 deb wget 1.21.4-1ubuntu4.1 deb -zlib1g 1:1.3.dfsg-3.1ubuntu2 deb +zlib1g 1:1.3.dfsg-3.1ubuntu2.1 deb From 603e86d095c89e4d50fd5a0a4be2ca92a72ea948 Mon Sep 17 00:00:00 2001 From: Anagh Kumar Baranwal <6824881+darthShadow@users.noreply.github.com> Date: Tue, 3 Sep 2024 12:43:30 +0530 Subject: [PATCH 419/514] Fix ordering of options for lsiown --- root/etc/s6-overlay/s6-rc.d/init-plex-chown/run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-chown/run b/root/etc/s6-overlay/s6-rc.d/init-plex-chown/run index e7863da..2e97959 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-plex-chown/run +++ b/root/etc/s6-overlay/s6-rc.d/init-plex-chown/run @@ -12,7 +12,7 @@ PUID=${PUID:-911} if [[ ! "$(stat -c %u /config/Library)" == "${PUID}" ]]; then echo "Change in ownership detected, please be patient while we chown existing files" echo "This could take some time" - lsiown abc:abc -R \ + lsiown -R abc:abc \ /config/Library fi From 8d628cc4ffd916b82b2f9865953a3c949683285e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 9 Sep 2024 09:23:21 +0000 Subject: [PATCH 420/514] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index ae5788c..75685f5 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -106,7 +106,7 @@ libsmartcols1 2.39.3-9ubuntu6.1 deb libsqlite3-0 3.45.1-1ubuntu2 deb libss2 1.47.0-2.4~exp1ubuntu4.1 deb libssh-4 0.10.6-2build2 deb -libssl3t64 3.0.13-0ubuntu3.3 deb +libssl3t64 3.0.13-0ubuntu3.4 deb libstdc++6 14-20240412-0ubuntu1 deb libsystemd0 255.4-1ubuntu8.4 deb libtasn1-6 4.19.0-3build1 deb @@ -124,7 +124,7 @@ mount 2.39.3-9ubuntu6.1 deb ncurses-base 6.4+20240113-1ubuntu2 deb ncurses-bin 6.4+20240113-1ubuntu2 deb netcat-openbsd 1.226-1ubuntu2 deb -openssl 3.0.13-0ubuntu3.3 deb +openssl 3.0.13-0ubuntu3.4 deb passwd 1:4.13+dfsg1-4ubuntu3 deb perl-base 5.38.2-3.2build2 deb pinentry-curses 1.2.1-3ubuntu5 deb From 15a4ebbcfbff94c388f1660c65a6dd9a13fc7902 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 12 Sep 2024 11:27:07 +0000 Subject: [PATCH 421/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 75685f5..df7451f 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -128,7 +128,7 @@ openssl 3.0.13-0ubuntu3.4 deb passwd 1:4.13+dfsg1-4ubuntu3 deb perl-base 5.38.2-3.2build2 deb pinentry-curses 1.2.1-3ubuntu5 deb -plexmediaserver 1.40.5.8921-836b34c27 deb +plexmediaserver 1.41.0.8992-8463ad060 deb procps 2:4.0.4-4ubuntu3 deb publicsuffix 20231001.0357-0.1 deb readline-common 8.2-4build1 deb From 42af1591d52370fff0ef0d7f8ee9b1ef48a2b87f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 23 Sep 2024 09:26:04 +0000 Subject: [PATCH 422/514] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index df7451f..fcbff8e 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -11,7 +11,7 @@ catatonit 0.1.7-1 deb coreutils 9.4-3ubuntu6 deb cron 3.0pl1-184ubuntu2 deb cron-daemon-common 3.0pl1-184ubuntu2 deb -curl 8.5.0-2ubuntu10.3 deb +curl 8.5.0-2ubuntu10.4 deb dash 0.5.12-6ubuntu5 deb debconf 1.5.86ubuntu1 deb debianutils 5.17build1 deb @@ -53,7 +53,7 @@ libcap-ng0 0.8.4-2build2 deb libcap2 1:2.66-5ubuntu2 deb libcom-err2 1.47.0-2.4~exp1ubuntu4.1 deb libcrypt1 1:4.4.36-4build1 deb -libcurl4t64 8.5.0-2ubuntu10.3 deb +libcurl4t64 8.5.0-2ubuntu10.4 deb libdb5.3t64 5.3.28+dfsg2-7 deb libdebconfclient0 0.271ubuntu3 deb libext2fs2t64 1.47.0-2.4~exp1ubuntu4.1 deb @@ -135,7 +135,7 @@ readline-common 8.2-4build1 deb sed 4.9-2build1 deb sensible-utils 0.0.22 deb systemd-dev 255.4-1ubuntu8.4 deb -systemd-hwe-hwdb 255.1.3 deb +systemd-hwe-hwdb 255.1.4 deb systemd-standalone-sysusers 255.4-1ubuntu8.4 deb sysvinit-utils 3.08-6ubuntu3 deb tar 1.35+dfsg-3build1 deb From a420bdda82750455c26ae08d67286c755fe7f419 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 26 Sep 2024 08:36:31 +0000 Subject: [PATCH 423/514] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index fcbff8e..b47c3ad 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -90,7 +90,7 @@ libpam-modules-bin 1.5.3-5ubuntu5.1 deb libpam-runtime 1.5.3-5ubuntu5.1 deb libpam0g 1.5.3-5ubuntu5.1 deb libpcre2-8-0 10.42-4ubuntu2 deb -libproc2-0 2:4.0.4-4ubuntu3 deb +libproc2-0 2:4.0.4-4ubuntu3.1 deb libpsl5t64 0.21.2-1.1build1 deb libreadline8t64 8.2-4build1 deb librtmp1 2.4+20151223.gitfa8646d.1-2build7 deb @@ -128,8 +128,8 @@ openssl 3.0.13-0ubuntu3.4 deb passwd 1:4.13+dfsg1-4ubuntu3 deb perl-base 5.38.2-3.2build2 deb pinentry-curses 1.2.1-3ubuntu5 deb -plexmediaserver 1.41.0.8992-8463ad060 deb -procps 2:4.0.4-4ubuntu3 deb +plexmediaserver 1.41.0.8994-f2c27da23 deb +procps 2:4.0.4-4ubuntu3.1 deb publicsuffix 20231001.0357-0.1 deb readline-common 8.2-4build1 deb sed 4.9-2build1 deb From 7e207423f328db3637d18103a90f204971d6a955 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 30 Sep 2024 09:25:11 +0000 Subject: [PATCH 424/514] Bot Updating Templated Files --- Jenkinsfile | 60 +++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 49 insertions(+), 11 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2bcd4ae..daea175 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -83,7 +83,7 @@ pipeline { env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/' env.PULL_REQUEST = env.CHANGE_ID - env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/call_issue_pr_tracker.yml ./.github/workflows/call_issues_cron.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml' + env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/call_issue_pr_tracker.yml ./.github/workflows/call_issues_cron.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml' } sh '''#! /bin/bash echo "The default github branch detected as ${GH_DEFAULT_BRANCH}" ''' @@ -313,7 +313,7 @@ pipeline { echo "Jenkinsfile is up to date." fi echo "Starting Stage 2 - Delete old templates" - OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml" + OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml .github/workflows/package_trigger.yml" for i in ${OLD_TEMPLATES}; do if [[ -f "${i}" ]]; then TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}" @@ -721,6 +721,14 @@ pipeline { } sh '''#! /bin/bash set -e + if grep -q 'docker-baseimage' <<< "${LS_REPO}"; then + echo "Detected baseimage, setting LSIO_FIRST_PARTY=true" + if [ -n "${CI_DOCKERENV}" ]; then + CI_DOCKERENV="LSIO_FIRST_PARTY=true|${CI_DOCKERENV}" + else + CI_DOCKERENV="LSIO_FIRST_PARTY=true" + fi + fi docker pull ghcr.io/linuxserver/ci:latest if [ "${MULTIARCH}" == "true" ]; then docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64 @@ -733,6 +741,7 @@ pipeline { -e DOCKER_LOGS_TIMEOUT=\"${CI_DELAY}\" \ -e TAGS=\"${CI_TAGS}\" \ -e META_TAG=\"${META_TAG}\" \ + -e RELEASE_TAG=\"latest\" \ -e PORT=\"${CI_PORT}\" \ -e SSL=\"${CI_SSL}\" \ -e BASE=\"${DIST_IMAGE}\" \ @@ -742,6 +751,7 @@ pipeline { -e WEB_SCREENSHOT=\"${CI_WEB}\" \ -e WEB_AUTH=\"${CI_AUTH}\" \ -e WEB_PATH=\"${CI_WEBPATH}\" \ + -e NODE_NAME=\"${NODE_NAME}\" \ -t ghcr.io/linuxserver/ci:latest \ python3 test_build.py''' } @@ -1009,17 +1019,45 @@ EOF git config --global --unset commit.gpgsign ''' script{ + env.JOB_DATE = sh( + script: '''date '+%Y-%m-%dT%H:%M:%S%:z' ''', + returnStdout: true).trim() if (env.EXIT_STATUS == "ABORTED"){ sh 'echo "build aborted"' - } - else if (currentBuild.currentResult == "SUCCESS"){ - sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"color": 1681177,\ - "description": "**Build:** '${BUILD_NUMBER}'\\n**CI Results:** '${CI_URL}'\\n**ShellCheck Results:** '${SHELLCHECK_URL}'\\n**Status:** Success\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\ - "username": "Jenkins"}' ${BUILDS_DISCORD} ''' - } - else { - sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"color": 16711680,\ - "description": "**Build:** '${BUILD_NUMBER}'\\n**CI Results:** '${CI_URL}'\\n**ShellCheck Results:** '${SHELLCHECK_URL}'\\n**Status:** failure\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\ + }else{ + if (currentBuild.currentResult == "SUCCESS"){ + if (env.GITHUBIMAGE =~ /lspipepr/){ + env.JOB_WEBHOOK_STATUS='Success' + env.JOB_WEBHOOK_COLOUR=3957028 + env.JOB_WEBHOOK_FOOTER='PR Build' + }else if (env.GITHUBIMAGE =~ /lsiodev/){ + env.JOB_WEBHOOK_STATUS='Success' + env.JOB_WEBHOOK_COLOUR=3957028 + env.JOB_WEBHOOK_FOOTER='Dev Build' + }else{ + env.JOB_WEBHOOK_STATUS='Success' + env.JOB_WEBHOOK_COLOUR=1681177 + env.JOB_WEBHOOK_FOOTER='Live Build' + } + }else{ + if (env.GITHUBIMAGE =~ /lspipepr/){ + env.JOB_WEBHOOK_STATUS='Failure' + env.JOB_WEBHOOK_COLOUR=12669523 + env.JOB_WEBHOOK_FOOTER='PR Build' + }else if (env.GITHUBIMAGE =~ /lsiodev/){ + env.JOB_WEBHOOK_STATUS='Failure' + env.JOB_WEBHOOK_COLOUR=12669523 + env.JOB_WEBHOOK_FOOTER='Dev Build' + }else{ + env.JOB_WEBHOOK_STATUS='Failure' + env.JOB_WEBHOOK_COLOUR=16711680 + env.JOB_WEBHOOK_FOOTER='Live Build' + } + } + sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"'color'": '${JOB_WEBHOOK_COLOUR}',\ + "footer": {"text" : "'"${JOB_WEBHOOK_FOOTER}"'"},\ + "timestamp": "'${JOB_DATE}'",\ + "description": "**Build:** '${BUILD_NUMBER}'\\n**CI Results:** '${CI_URL}'\\n**ShellCheck Results:** '${SHELLCHECK_URL}'\\n**Status:** '${JOB_WEBHOOK_STATUS}'\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\ "username": "Jenkins"}' ${BUILDS_DISCORD} ''' } } From b3fae00aee8ee8bbb4cb4bc5b6c508229ae07435 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 30 Sep 2024 09:27:13 +0000 Subject: [PATCH 425/514] Bot Updating Templated Files --- .github/workflows/package_trigger.yml | 42 --------------------------- 1 file changed, 42 deletions(-) delete mode 100644 .github/workflows/package_trigger.yml diff --git a/.github/workflows/package_trigger.yml b/.github/workflows/package_trigger.yml deleted file mode 100644 index 77b3e2f..0000000 --- a/.github/workflows/package_trigger.yml +++ /dev/null @@ -1,42 +0,0 @@ -name: Package Trigger Main - -on: - workflow_dispatch: - -jobs: - package-trigger-master: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4.1.1 - - - name: Package Trigger - if: github.ref == 'refs/heads/master' - run: | - printf "# Package trigger for docker-plex\n\n" >> $GITHUB_STEP_SUMMARY - if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_PLEX_MASTER }}" ]; then - echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY - echo "> Github secret \`PAUSE_PACKAGE_TRIGGER_PLEX_MASTER\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY - exit 0 - fi - if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-plex/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then - echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY - echo "> There already seems to be an active build on Jenkins; skipping package trigger" >> $GITHUB_STEP_SUMMARY - exit 0 - fi - echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY - echo "> Package trigger running off of master branch. To disable, set a Github secret named \`PAUSE_PACKAGE_TRIGGER_PLEX_MASTER\`" >> $GITHUB_STEP_SUMMARY - response=$(curl -iX POST \ - https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-plex/job/master/buildWithParameters?PACKAGE_CHECK=true \ - --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") - echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY - echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY - sleep 10 - buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url') - buildurl="${buildurl%$'\r'}" - echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY - echo "Attempting to change the Jenkins job description" >> $GITHUB_STEP_SUMMARY - curl -iX POST \ - "${buildurl}submitDescription" \ - --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \ - --data-urlencode "description=GHA package trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \ - --data-urlencode "Submit=Submit" From 4d1b0e164e4853757a432cd4869418f42f02b52c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 30 Sep 2024 09:28:28 +0000 Subject: [PATCH 426/514] Bot Updating Templated Files --- .github/workflows/external_trigger.yml | 64 +++++++++++------- .../workflows/package_trigger_scheduler.yml | 66 ++++++++++++++----- README.md | 12 ++-- 3 files changed, 96 insertions(+), 46 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 1318d39..eaf9172 100644 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -11,15 +11,17 @@ jobs: - name: External Trigger if: github.ref == 'refs/heads/master' + env: + SKIP_EXTERNAL_TRIGGER: ${{ vars.SKIP_EXTERNAL_TRIGGER }} run: | printf "# External trigger for docker-plex\n\n" >> $GITHUB_STEP_SUMMARY - if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_PLEX_MASTER }}" ]; then + if grep -q "^plex_master" <<< "${SKIP_EXTERNAL_TRIGGER}"; then echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY - echo "> Github secret \`PAUSE_EXTERNAL_TRIGGER_PLEX_MASTER\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY + echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`plex_master\`; skipping trigger." >> $GITHUB_STEP_SUMMARY exit 0 fi echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY - echo "> External trigger running off of master branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_PLEX_MASTER\`" >> $GITHUB_STEP_SUMMARY + echo "> External trigger running off of master branch. To disable this trigger, add \`plex_master\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY EXT_RELEASE=$(curl -s "https://plex.tv/api/downloads/5.json" | jq -r '. | .computer.Linux.version') echo "Type is \`custom_json\`" >> $GITHUB_STEP_SUMMARY @@ -78,26 +80,38 @@ jobs: echo "New version \`${EXT_RELEASE}\` found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY exit 0 else - printf "\n## Trigger new build\n\n" >> $GITHUB_STEP_SUMMARY - echo "New version \`${EXT_RELEASE}\` found; old version was \`${IMAGE_VERSION}\`. Triggering new build" >> $GITHUB_STEP_SUMMARY - response=$(curl -iX POST \ - https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-plex/job/master/buildWithParameters?PACKAGE_CHECK=false \ - --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") - echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY - echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY - sleep 10 - buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url') - buildurl="${buildurl%$'\r'}" - echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY - echo "Attempting to change the Jenkins job description" >> $GITHUB_STEP_SUMMARY - curl -iX POST \ - "${buildurl}submitDescription" \ - --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \ - --data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \ - --data-urlencode "Submit=Submit" - echo "**** Notifying Discord ****" - TRIGGER_REASON="A version change was detected for plex tag latest. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}" - curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903, - "description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}], - "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} + if [[ "${artifacts_found}" == "false" ]]; then + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> New version detected, but not all artifacts are published yet; skipping trigger" >> $GITHUB_STEP_SUMMARY + FAILURE_REASON="New version ${EXT_RELEASE} for plex tag latest is detected, however not all artifacts are uploaded to upstream release yet. Will try again later." + curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903, + "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}], + "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} + else + printf "\n## Trigger new build\n\n" >> $GITHUB_STEP_SUMMARY + echo "New version \`${EXT_RELEASE}\` found; old version was \`${IMAGE_VERSION}\`. Triggering new build" >> $GITHUB_STEP_SUMMARY + if "${artifacts_found}" == "true" ]]; then + echo "All artifacts seem to be uploaded." >> $GITHUB_STEP_SUMMARY + fi + response=$(curl -iX POST \ + https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-plex/job/master/buildWithParameters?PACKAGE_CHECK=false \ + --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") + echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY + echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY + sleep 10 + buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url') + buildurl="${buildurl%$'\r'}" + echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY + echo "Attempting to change the Jenkins job description" >> $GITHUB_STEP_SUMMARY + curl -iX POST \ + "${buildurl}submitDescription" \ + --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \ + --data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \ + --data-urlencode "Submit=Submit" + echo "**** Notifying Discord ****" + TRIGGER_REASON="A version change was detected for plex tag latest. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}" + curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903, + "description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}], + "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} + fi fi diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml index 131561d..7892736 100644 --- a/.github/workflows/package_trigger_scheduler.yml +++ b/.github/workflows/package_trigger_scheduler.yml @@ -14,6 +14,8 @@ jobs: fetch-depth: '0' - name: Package Trigger Scheduler + env: + SKIP_PACKAGE_TRIGGER: ${{ vars.SKIP_PACKAGE_TRIGGER }} run: | printf "# Package trigger scheduler for docker-plex\n\n" >> $GITHUB_STEP_SUMMARY printf "Found the branches:\n\n%s\n" "$(git for-each-ref --format='- %(refname:lstrip=3)' refs/remotes)" >> $GITHUB_STEP_SUMMARY @@ -24,27 +26,57 @@ jobs: continue fi printf "\n## Evaluating \`%s\`\n\n" ${br} >> $GITHUB_STEP_SUMMARY - ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-plex/${br}/jenkins-vars.yml | yq -r '.ls_branch') - if [ "${br}" == "${ls_branch}" ]; then + JENKINS_VARS=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-plex/${br}/jenkins-vars.yml) + if [[ "${br}" == $(yq -r '.ls_branch' <<< "${JENKINS_VARS}") ]]; then echo "Branch appears to be live; checking workflow." >> $GITHUB_STEP_SUMMARY - if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-plex/${br}/.github/workflows/package_trigger.yml > /dev/null 2>&1; then - echo "Triggering package trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY - triggered_branches="${triggered_branches}${br} " - curl -iX POST \ - -H "Authorization: token ${{ secrets.CR_PAT }}" \ - -H "Accept: application/vnd.github.v3+json" \ - -d "{\"ref\":\"refs/heads/${br}\"}" \ - https://api.github.com/repos/linuxserver/docker-plex/actions/workflows/package_trigger.yml/dispatches - sleep 30 + if [[ $(yq -r '.skip_package_check' <<< "${JENKINS_VARS}") == "true" ]]; then + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> Skipping branch ${br} due to \`skip_package_check\` being set in \`jenkins-vars.yml\`." >> $GITHUB_STEP_SUMMARY + skipped_branches="${skipped_branches}${br} " + elif grep -q "^plex_${br}" <<< "${SKIP_PACKAGE_TRIGGER}"; then + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> Github organizational variable \`SKIP_PACKAGE_TRIGGER\` contains \`plex_${br}\`; skipping trigger." >> $GITHUB_STEP_SUMMARY + skipped_branches="${skipped_branches}${br} " + elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-plex/job/${br}/lastBuild/api/json | jq -r '.building') == "true" ]; then + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> There already seems to be an active build on Jenkins; skipping package trigger for ${br}" >> $GITHUB_STEP_SUMMARY + skipped_branches="${skipped_branches}${br} " else - echo "Skipping branch ${br} due to no package trigger workflow present." >> $GITHUB_STEP_SUMMARY + echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY + echo "> Triggering package trigger for branch ${br}" >> $GITHUB_STEP_SUMMARY + printf "> To disable, add \`plex_%s\` into the Github organizational variable \`SKIP_PACKAGE_TRIGGER\`.\n\n" "${br}" >> $GITHUB_STEP_SUMMARY + triggered_branches="${triggered_branches}${br} " + response=$(curl -iX POST \ + https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-plex/job/${br}/buildWithParameters?PACKAGE_CHECK=true \ + --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") + echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY + echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY + sleep 10 + buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url') + buildurl="${buildurl%$'\r'}" + echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY + echo "Attempting to change the Jenkins job description" >> $GITHUB_STEP_SUMMARY + curl -iX POST \ + "${buildurl}submitDescription" \ + --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \ + --data-urlencode "description=GHA package trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \ + --data-urlencode "Submit=Submit" + sleep 20 fi else echo "Skipping branch ${br} due to being detected as dev branch." >> $GITHUB_STEP_SUMMARY fi done - echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****" - echo "**** Notifying Discord ****" - curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903, - "description": "**Package Check Build(s) Triggered for plex** \n**Branch(es):** '"${triggered_branches}"' \n**Build URL:** '"https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-plex/activity/"' \n"}], - "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} + if [[ -n "${triggered_branches}" ]] || [[ -n "${skipped_branches}" ]]; then + if [[ -n "${triggered_branches}" ]]; then + NOTIFY_BRANCHES="**Triggered:** ${triggered_branches} \n" + fi + if [[ -n "${skipped_branches}" ]]; then + NOTIFY_BRANCHES="${NOTIFY_BRANCHES}**Skipped:** ${skipped_branches} \n" + fi + echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****" + echo "**** Notifying Discord ****" + curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903, + "description": "**Package Check Build(s) Triggered for plex** \n'"${NOTIFY_BRANCHES}"'**Build URL:** '"https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-plex/activity/"' \n"}], + "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} + fi diff --git a/README.md b/README.md index f73eae5..f16b362 100644 --- a/README.md +++ b/README.md @@ -61,13 +61,16 @@ The architectures supported by this image are: Webui can be found at `<your-ip>:32400/web` -**note**: If there is no value set for the VERSION variable, then no updates will take place. +>[!NOTE] +>If there is no value set for the VERSION variable, then no updates will take place. -**note**: For new users, no updates will take place on the first run of the container as there is no preferences file to read your token from, to update restart the Docker container after logging in through the webui. +>[!NOTE] +>For new users, no updates will take place on the first run of the container as there is no preferences file to read your token from, to update restart the Docker container after logging in through the webui. Valid settings for VERSION are:- -**info**: YOU CANNOT UPDATE TO A PLEXPASS ONLY (BETA) VERSION IF YOU ARE NOT LOGGED IN WITH A PLEXPASS ACCOUNT. +>[!NOTE] +>YOU CANNOT UPDATE TO A PLEXPASS ONLY (BETA) VERSION IF YOU ARE NOT LOGGED IN WITH A PLEXPASS ACCOUNT. + **`docker`**: Let Docker handle the Plex Version, we keep our Dockerhub Endpoint up to date with the latest public builds. This is the same as leaving this setting out of your create command. + **`latest`**: will update plex to the latest version available that you are entitled to. @@ -322,7 +325,8 @@ Below are the instructions for updating containers: ### Image Update Notifications - Diun (Docker Image Update Notifier) -**tip**: We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported. +>[!TIP] +>We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported. ## Building locally From 9e313afccfd1131bcbfedb625f289ae04f919f55 Mon Sep 17 00:00:00 2001 From: thespad <spad@linuxserver.io> Date: Sun, 13 Oct 2024 16:59:17 +0100 Subject: [PATCH 427/514] Add RO support --- Dockerfile | 3 ++- Dockerfile.aarch64 | 3 ++- README.md | 10 ++++++++++ readme-vars.yml | 6 ++++++ root/etc/s6-overlay/s6-rc.d/init-plex-chown/run | 3 +++ root/etc/s6-overlay/s6-rc.d/init-plex-update/run | 5 +++++ 6 files changed, 28 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 43c7e49..f2da3bb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,8 @@ ENV DEBIAN_FRONTEND="noninteractive" \ PLEX_MEDIA_SERVER_MAX_PLUGIN_PROCS="6" \ PLEX_MEDIA_SERVER_USER="abc" \ PLEX_MEDIA_SERVER_INFO_VENDOR="Docker" \ - PLEX_MEDIA_SERVER_INFO_DEVICE="Docker Container (LinuxServer.io)" + PLEX_MEDIA_SERVER_INFO_DEVICE="Docker Container (LinuxServer.io)" \ + TMPDIR=/run/plex-temp RUN \ echo "**** install runtime packages ****" && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 257ca96..b1c14c6 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -20,7 +20,8 @@ ENV DEBIAN_FRONTEND="noninteractive" \ PLEX_MEDIA_SERVER_MAX_PLUGIN_PROCS="6" \ PLEX_MEDIA_SERVER_USER="abc" \ PLEX_MEDIA_SERVER_INFO_VENDOR="Docker" \ - PLEX_MEDIA_SERVER_INFO_DEVICE="Docker Container (LinuxServer.io)" + PLEX_MEDIA_SERVER_INFO_DEVICE="Docker Container (LinuxServer.io)" \ + TMPDIR=/run/plex-temp RUN \ echo "**** install runtime packages ****" && \ diff --git a/README.md b/README.md index f16b362..669254e 100644 --- a/README.md +++ b/README.md @@ -77,6 +77,15 @@ Valid settings for VERSION are:- + **`public`**: will update plexpass users to the latest public version, useful for plexpass users that don't want to be on the bleeding edge but still want the latest public updates. + **`<specific-version>`**: will select a specific version (eg 0.9.12.4.1192-9a47d21) of plex to install, note you cannot use this to access plexpass versions if you do not have plexpass. +## Read-Only Operation + +This image can be run with a read-only container filesystem. For details please [read the docs](https://docs.linuxserver.io/misc/read-only/). + +### Caveats + +* Runtime update of Plex (and thus Plexpass builds) is not supported. +* Transcode directory must be mounted to a host path or tmpfs. + ### Hardware Acceleration Many desktop applications need access to a GPU to function properly and even some Desktop Environments have compositor effects that will not function without a GPU. However this is not a hard requirement and all base images will function without a video device mounted into the container. @@ -161,6 +170,7 @@ Containers are configured using parameters passed at runtime (such as those abov | `-v /config` | Plex library location. *This can grow very large, 50gb+ is likely for a large collection.* | | `-v /tv` | Media goes here. Add as many as needed e.g. `/movies`, `/tv`, etc. | | `-v /movies` | Media goes here. Add as many as needed e.g. `/movies`, `/tv`, etc. | +| `--read-only=true` | Run container with a read-only filesystem. Please [read the docs](https://docs.linuxserver.io/misc/read-only/). | ## Environment variables from files (Docker secrets) diff --git a/readme-vars.yml b/readme-vars.yml index 43f14de..94007db 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -72,6 +72,12 @@ app_setup_block: | + **`<specific-version>`**: will select a specific version (eg 0.9.12.4.1192-9a47d21) of plex to install, note you cannot use this to access plexpass versions if you do not have plexpass. readme_hwaccel: true + +readonly_supported: true +readonly_message: | + * Runtime update of Plex (and thus Plexpass builds) is not supported. + * Transcode directory must be mounted to a host path or tmpfs. + # changelog changelogs: - {date: "18.07.24:", desc: "Rebase to Ubuntu Noble."} diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-chown/run b/root/etc/s6-overlay/s6-rc.d/init-plex-chown/run index 2e97959..6c2d74c 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-plex-chown/run +++ b/root/etc/s6-overlay/s6-rc.d/init-plex-chown/run @@ -1,6 +1,8 @@ #!/usr/bin/with-contenv bash # shellcheck shell=bash +mkdir -p /run/plex-temp + # create folders if [[ ! -d "${PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR}" ]]; then mkdir -p "${PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR}" @@ -35,5 +37,6 @@ fi # permissions (non-recursive) on config root and folders lsiown abc:abc \ + /run/plex-temp \ /config \ /config/* diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-update/run b/root/etc/s6-overlay/s6-rc.d/init-plex-update/run index 33b9968..75ac825 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-plex-update/run +++ b/root/etc/s6-overlay/s6-rc.d/init-plex-update/run @@ -1,6 +1,11 @@ #!/usr/bin/with-contenv bash # shellcheck shell=bash +if [[ -z ${LSIO_READ_ONLY_FS} ]] || [[ -z ${LSIO_NON_ROOT_USER} ]]; then + echo "Runtime update not supported with read-only or non-root operation, skipping." + exit 0 +fi + # If docker manages versioning exit if [[ -n "${VERSION}" ]] && [[ "${VERSION}" == "docker" ]]; then echo "Docker is used for versioning skip update check" From 877a9bd1a3d79b9b90dd10532440a29b3a981394 Mon Sep 17 00:00:00 2001 From: Adam <git@spad.co.uk> Date: Mon, 14 Oct 2024 17:47:55 +0100 Subject: [PATCH 428/514] Fix RO update check --- root/etc/s6-overlay/s6-rc.d/init-plex-update/run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-update/run b/root/etc/s6-overlay/s6-rc.d/init-plex-update/run index 75ac825..44bab80 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-plex-update/run +++ b/root/etc/s6-overlay/s6-rc.d/init-plex-update/run @@ -1,7 +1,7 @@ #!/usr/bin/with-contenv bash # shellcheck shell=bash -if [[ -z ${LSIO_READ_ONLY_FS} ]] || [[ -z ${LSIO_NON_ROOT_USER} ]]; then +if [[ -n ${LSIO_READ_ONLY_FS} ]] || [[ -n ${LSIO_NON_ROOT_USER} ]]; then echo "Runtime update not supported with read-only or non-root operation, skipping." exit 0 fi From bb423a4d3b51daa4bebc37c80358be8fbecd97ec Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 24 Oct 2024 17:31:27 +0000 Subject: [PATCH 429/514] Bot Updating Package Versions --- package_versions.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index b47c3ad..a55cfa3 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -20,7 +20,7 @@ dirmngr 2.4.4-2ubuntu17 deb dpkg 1.22.6ubuntu6.1 deb e2fsprogs 1.47.0-2.4~exp1ubuntu4.1 deb findutils 4.9.0-5build1 deb -gcc-14-base 14-20240412-0ubuntu1 deb +gcc-14-base 14.2.0-4ubuntu2~24.04 deb gnupg 2.4.4-2ubuntu17 deb gnupg-l10n 2.4.4-2ubuntu17 deb gnupg-utils 2.4.4-2ubuntu17 deb @@ -58,7 +58,7 @@ libdb5.3t64 5.3.28+dfsg2-7 deb libdebconfclient0 0.271ubuntu3 deb libext2fs2t64 1.47.0-2.4~exp1ubuntu4.1 deb libffi8 3.4.6-1build1 deb -libgcc-s1 14-20240412-0ubuntu1 deb +libgcc-s1 14.2.0-4ubuntu2~24.04 deb libgcrypt20 1.10.3-2build1 deb libgmp10 2:6.3.0+dfsg-2ubuntu6 deb libgnutls30t64 3.8.3-1.1ubuntu3.2 deb @@ -90,7 +90,7 @@ libpam-modules-bin 1.5.3-5ubuntu5.1 deb libpam-runtime 1.5.3-5ubuntu5.1 deb libpam0g 1.5.3-5ubuntu5.1 deb libpcre2-8-0 10.42-4ubuntu2 deb -libproc2-0 2:4.0.4-4ubuntu3.1 deb +libproc2-0 2:4.0.4-4ubuntu3.2 deb libpsl5t64 0.21.2-1.1build1 deb libreadline8t64 8.2-4build1 deb librtmp1 2.4+20151223.gitfa8646d.1-2build7 deb @@ -107,7 +107,7 @@ libsqlite3-0 3.45.1-1ubuntu2 deb libss2 1.47.0-2.4~exp1ubuntu4.1 deb libssh-4 0.10.6-2build2 deb libssl3t64 3.0.13-0ubuntu3.4 deb -libstdc++6 14-20240412-0ubuntu1 deb +libstdc++6 14.2.0-4ubuntu2~24.04 deb libsystemd0 255.4-1ubuntu8.4 deb libtasn1-6 4.19.0-3build1 deb libtinfo6 6.4+20240113-1ubuntu2 deb @@ -117,7 +117,7 @@ libuuid1 2.39.3-9ubuntu6.1 deb libxxhash0 0.8.2-2build1 deb libzstd1 1.5.5+dfsg2-2build1.1 deb locales 2.39-0ubuntu8.3 deb -login 1:4.13+dfsg1-4ubuntu3 deb +login 1:4.13+dfsg1-4ubuntu3.2 deb logsave 1.47.0-2.4~exp1ubuntu4.1 deb mawk 1.3.4.20240123-1build1 deb mount 2.39.3-9ubuntu6.1 deb @@ -125,11 +125,11 @@ ncurses-base 6.4+20240113-1ubuntu2 deb ncurses-bin 6.4+20240113-1ubuntu2 deb netcat-openbsd 1.226-1ubuntu2 deb openssl 3.0.13-0ubuntu3.4 deb -passwd 1:4.13+dfsg1-4ubuntu3 deb +passwd 1:4.13+dfsg1-4ubuntu3.2 deb perl-base 5.38.2-3.2build2 deb pinentry-curses 1.2.1-3ubuntu5 deb -plexmediaserver 1.41.0.8994-f2c27da23 deb -procps 2:4.0.4-4ubuntu3.1 deb +plexmediaserver 1.41.1.9057-af5eaea7a deb +procps 2:4.0.4-4ubuntu3.2 deb publicsuffix 20231001.0357-0.1 deb readline-common 8.2-4build1 deb sed 4.9-2build1 deb From 4dd0b7f2d290c87c6679312f51c959ed46dfc1dd Mon Sep 17 00:00:00 2001 From: Roxedus <me@roxedus.dev> Date: Mon, 4 Nov 2024 16:27:13 +0100 Subject: [PATCH 430/514] Add graphics to capabilties --- Dockerfile | 2 +- README.md | 1 + readme-vars.yml | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f2da3bb..bf19423 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="thelamer" #Add needed nvidia environment variables for https://github.com/NVIDIA/nvidia-docker -ENV NVIDIA_DRIVER_CAPABILITIES="compute,video,utility" +ENV NVIDIA_DRIVER_CAPABILITIES="compute,video,utility,graphics" # global environment settings ENV DEBIAN_FRONTEND="noninteractive" \ diff --git a/README.md b/README.md index 669254e..d074990 100644 --- a/README.md +++ b/README.md @@ -361,6 +361,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **04.11.24:** - Add Nvidia capability needed for h265 * **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. diff --git a/readme-vars.yml b/readme-vars.yml index 94007db..4b8ad23 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -80,6 +80,7 @@ readonly_message: | # changelog changelogs: + - {date: "04.11.24:", desc: "Add Nvidia capability needed for h265"} - {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."} From 86c5c83041c90b55245f63e30e72441d575686d8 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 11 Nov 2024 09:22:40 +0000 Subject: [PATCH 431/514] Bot Updating Templated Files --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index daea175..cbe141a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -886,7 +886,7 @@ pipeline { echo '{"tag_name":"'${META_TAG}'",\ "target_commitish": "master",\ "name": "'${META_TAG}'",\ - "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Remote Changes:**\\n\\n' > start + "body": "**CI Report:**\\n\\n'${CI_URL:-N/A}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Remote Changes:**\\n\\n' > start printf '","draft": false,"prerelease": false}' >> releasebody.json paste -d'\\0' start releasebody.json > releasebody.json.done curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done''' From 0102ec4fa6d0c23f105c021c75498fbb1cafe505 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 11 Nov 2024 09:25:06 +0000 Subject: [PATCH 432/514] Bot Updating Templated Files --- .github/CONTRIBUTING.md | 4 ++-- .github/workflows/package_trigger_scheduler.yml | 5 +++-- README.md | 5 +++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 4245cd8..755352d 100755 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -105,10 +105,10 @@ docker build \ -t linuxserver/plex:latest . ``` -The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static` +The ARM variants can be built on x86_64 hardware and vice versa using `lscr.io/linuxserver/qemu-static` ```bash -docker run --rm --privileged multiarch/qemu-user-static:register --reset +docker run --rm --privileged lscr.io/linuxserver/qemu-static --reset ``` Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`. diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml index 7892736..325ff34 100644 --- a/.github/workflows/package_trigger_scheduler.yml +++ b/.github/workflows/package_trigger_scheduler.yml @@ -70,13 +70,14 @@ jobs: if [[ -n "${triggered_branches}" ]] || [[ -n "${skipped_branches}" ]]; then if [[ -n "${triggered_branches}" ]]; then NOTIFY_BRANCHES="**Triggered:** ${triggered_branches} \n" + NOTIFY_BUILD_URL="**Build URL:** https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-plex/activity/ \n" + echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****" fi if [[ -n "${skipped_branches}" ]]; then NOTIFY_BRANCHES="${NOTIFY_BRANCHES}**Skipped:** ${skipped_branches} \n" fi - echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****" echo "**** Notifying Discord ****" curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903, - "description": "**Package Check Build(s) Triggered for plex** \n'"${NOTIFY_BRANCHES}"'**Build URL:** '"https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-plex/activity/"' \n"}], + "description": "**Package Check Build(s) for plex** \n'"${NOTIFY_BRANCHES}"''"${NOTIFY_BUILD_URL}"'"}], "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} fi diff --git a/README.md b/README.md index d074990..5b236a3 100644 --- a/README.md +++ b/README.md @@ -77,6 +77,7 @@ Valid settings for VERSION are:- + **`public`**: will update plexpass users to the latest public version, useful for plexpass users that don't want to be on the bleeding edge but still want the latest public updates. + **`<specific-version>`**: will select a specific version (eg 0.9.12.4.1192-9a47d21) of plex to install, note you cannot use this to access plexpass versions if you do not have plexpass. + ## Read-Only Operation This image can be run with a read-only container filesystem. For details please [read the docs](https://docs.linuxserver.io/misc/read-only/). @@ -351,10 +352,10 @@ docker build \ -t lscr.io/linuxserver/plex:latest . ``` -The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static` +The ARM variants can be built on x86_64 hardware and vice versa using `lscr.io/linuxserver/qemu-static` ```bash -docker run --rm --privileged multiarch/qemu-user-static:register --reset +docker run --rm --privileged lscr.io/linuxserver/qemu-static --reset ``` Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`. From 081ace2aeebc688a43a25a155935ae36cc83f2bb Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 14 Nov 2024 22:36:23 +0000 Subject: [PATCH 433/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index a55cfa3..04c4a47 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -128,7 +128,7 @@ openssl 3.0.13-0ubuntu3.4 deb passwd 1:4.13+dfsg1-4ubuntu3.2 deb perl-base 5.38.2-3.2build2 deb pinentry-curses 1.2.1-3ubuntu5 deb -plexmediaserver 1.41.1.9057-af5eaea7a deb +plexmediaserver 1.41.2.9200-c6bbc1b53 deb procps 2:4.0.4-4ubuntu3.2 deb publicsuffix 20231001.0357-0.1 deb readline-common 8.2-4build1 deb From 49fe7202e9857ee093c6fde41ff81805a08aec83 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 2 Dec 2024 09:26:22 +0000 Subject: [PATCH 434/514] Bot Updating Templated Files --- Jenkinsfile | 268 ++++++++++++++++++++++++++++++++++------------------ 1 file changed, 176 insertions(+), 92 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index cbe141a..f2e609f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,7 @@ pipeline { } // Input to determine if this is a package check parameters { - string(defaultValue: 'false', description: 'package check run', name: 'PACKAGE_CHECK') + string(defaultValue: 'false', description: 'package check run', name: 'PACKAGE_CHECK') } // Configuration for the variables used for this specific repo environment { @@ -193,6 +193,7 @@ pipeline { env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER env.META_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN + env.BUILDCACHE = 'docker.io/lsiodev/buildcache,registry.gitlab.com/linuxserver.io/docker-jenkins-builder/lsiodev-buildcache,ghcr.io/linuxserver/lsiodev-buildcache,quay.io/linuxserver.io/lsiodev-buildcache' } } } @@ -217,6 +218,7 @@ pipeline { env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/' + env.BUILDCACHE = 'docker.io/lsiodev/buildcache,registry.gitlab.com/linuxserver.io/docker-jenkins-builder/lsiodev-buildcache,ghcr.io/linuxserver/lsiodev-buildcache,quay.io/linuxserver.io/lsiodev-buildcache' } } } @@ -241,6 +243,7 @@ pipeline { env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/' + env.BUILDCACHE = 'docker.io/lsiodev/buildcache,registry.gitlab.com/linuxserver.io/docker-jenkins-builder/lsiodev-buildcache,ghcr.io/linuxserver/lsiodev-buildcache,quay.io/linuxserver.io/lsiodev-buildcache' } } } @@ -337,6 +340,35 @@ pipeline { else echo "No templates to delete" fi + echo "Starting Stage 2.5 - Update init diagram" + if ! grep -q 'init_diagram:' readme-vars.yml; then + echo "Adding the key 'init_diagram' to readme-vars.yml" + sed -i '\\|^#.*changelog.*$|d' readme-vars.yml + sed -i 's|^changelogs:|# init diagram\\ninit_diagram:\\n\\n# changelog\\nchangelogs:|' readme-vars.yml + fi + mkdir -p ${TEMPDIR}/d2 + docker run --rm -v ${TEMPDIR}/d2:/output -e PUID=$(id -u) -e PGID=$(id -g) -e RAW="true" ghcr.io/linuxserver/d2-builder:latest ${CONTAINER_NAME}:latest + ls -al ${TEMPDIR}/d2 + yq -ei ".init_diagram |= load_str(\\"${TEMPDIR}/d2/${CONTAINER_NAME}-latest.d2\\")" readme-vars.yml + if [[ $(md5sum readme-vars.yml | cut -c1-8) != $(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/readme-vars.yml | cut -c1-8) ]]; then + echo "'init_diagram' has been updated. Updating repo and exiting build, new one will trigger based on commit." + mkdir -p ${TEMPDIR}/repo + git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} + cd ${TEMPDIR}/repo/${LS_REPO} + git checkout -f master + cp ${WORKSPACE}/readme-vars.yml ${TEMPDIR}/repo/${LS_REPO}/readme-vars.yml + git add readme-vars.yml + git commit -m 'Bot Updating Templated Files' + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master + echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + echo "Updating templates and exiting build, new one will trigger based on commit" + rm -Rf ${TEMPDIR} + exit 0 + else + echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + echo "Init diagram is unchanged" + fi echo "Starting Stage 3 - Update templates" CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) cd ${TEMPDIR}/docker-${CONTAINER_NAME} @@ -545,8 +577,40 @@ pipeline { --label \"org.opencontainers.image.title=Plex\" \ --label \"org.opencontainers.image.description=[Plex](https://plex.tv) organizes video, music and photos from personal media libraries and streams them to smart TVs, streaming boxes and mobile devices. This container is packaged as a standalone Plex Media Server. Straightforward design and bulk actions mean getting things done faster.\" \ --no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \ - --provenance=false --sbom=false \ + --provenance=false --sbom=false --builder=container --load \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + sh '''#! /bin/bash + set -e + IFS=',' read -ra CACHE <<< "$BUILDCACHE" + for i in "${CACHE[@]}"; do + docker tag ${IMAGE}:${META_TAG} ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} + done + ''' + withCredentials([ + [ + $class: 'UsernamePasswordMultiBinding', + credentialsId: 'Quay.io-Robot', + usernameVariable: 'QUAYUSER', + passwordVariable: 'QUAYPASS' + ] + ]) { + retry_backoff(5,5) { + sh '''#! /bin/bash + set -e + echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin + echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin + echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin + echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin + if [[ "${PACKAGE_CHECK}" != "true" ]]; then + IFS=',' read -ra CACHE <<< "$BUILDCACHE" + for i in "${CACHE[@]}"; do + docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} & + done + wait + fi + ''' + } + } } } // Build MultiArch Docker containers for push to LS Repo @@ -577,8 +641,40 @@ pipeline { --label \"org.opencontainers.image.title=Plex\" \ --label \"org.opencontainers.image.description=[Plex](https://plex.tv) organizes video, music and photos from personal media libraries and streams them to smart TVs, streaming boxes and mobile devices. This container is packaged as a standalone Plex Media Server. Straightforward design and bulk actions mean getting things done faster.\" \ --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \ - --provenance=false --sbom=false \ + --provenance=false --sbom=false --builder=container --load \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + sh '''#! /bin/bash + set -e + IFS=',' read -ra CACHE <<< "$BUILDCACHE" + for i in "${CACHE[@]}"; do + docker tag ${IMAGE}:amd64-${META_TAG} ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} + done + ''' + withCredentials([ + [ + $class: 'UsernamePasswordMultiBinding', + credentialsId: 'Quay.io-Robot', + usernameVariable: 'QUAYUSER', + passwordVariable: 'QUAYPASS' + ] + ]) { + retry_backoff(5,5) { + sh '''#! /bin/bash + set -e + echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin + echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin + echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin + echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin + if [[ "${PACKAGE_CHECK}" != "true" ]]; then + IFS=',' read -ra CACHE <<< "$BUILDCACHE" + for i in "${CACHE[@]}"; do + docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} & + done + wait + fi + ''' + } + } } } stage('Build ARM64') { @@ -587,10 +683,6 @@ pipeline { } steps { echo "Running on node: ${NODE_NAME}" - echo 'Logging into Github' - sh '''#! /bin/bash - echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin - ''' sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile.aarch64" sh "docker buildx build \ --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \ @@ -606,18 +698,47 @@ pipeline { --label \"org.opencontainers.image.title=Plex\" \ --label \"org.opencontainers.image.description=[Plex](https://plex.tv) organizes video, music and photos from personal media libraries and streams them to smart TVs, streaming boxes and mobile devices. This container is packaged as a standalone Plex Media Server. Straightforward design and bulk actions mean getting things done faster.\" \ --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \ - --provenance=false --sbom=false \ + --provenance=false --sbom=false --builder=container --load \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." - sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" - retry_backoff(5,5) { - sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" + sh '''#! /bin/bash + set -e + IFS=',' read -ra CACHE <<< "$BUILDCACHE" + for i in "${CACHE[@]}"; do + docker tag ${IMAGE}:arm64v8-${META_TAG} ${i}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} + done + ''' + withCredentials([ + [ + $class: 'UsernamePasswordMultiBinding', + credentialsId: 'Quay.io-Robot', + usernameVariable: 'QUAYUSER', + passwordVariable: 'QUAYPASS' + ] + ]) { + retry_backoff(5,5) { + sh '''#! /bin/bash + set -e + echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin + echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin + echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin + echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin + if [[ "${PACKAGE_CHECK}" != "true" ]]; then + IFS=',' read -ra CACHE <<< "$BUILDCACHE" + for i in "${CACHE[@]}"; do + docker push ${i}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} & + done + wait + fi + ''' + } } sh '''#! /bin/bash containers=$(docker ps -aq) if [[ -n "${containers}" ]]; then docker stop ${containers} fi - docker system prune -af --volumes || : ''' + docker system prune -af --volumes || : + ''' } } } @@ -767,37 +888,23 @@ pipeline { environment name: 'EXIT_STATUS', value: '' } steps { - withCredentials([ - [ - $class: 'UsernamePasswordMultiBinding', - credentialsId: 'Quay.io-Robot', - usernameVariable: 'QUAYUSER', - passwordVariable: 'QUAYPASS' - ] - ]) { - retry_backoff(5,5) { - sh '''#! /bin/bash - set -e - echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin - echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin - echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin - echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin - for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do - docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG} - docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest - docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG} - if [ -n "${SEMVER}" ]; then - docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER} - fi - docker push ${PUSHIMAGE}:latest - docker push ${PUSHIMAGE}:${META_TAG} - docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG} - if [ -n "${SEMVER}" ]; then - docker push ${PUSHIMAGE}:${SEMVER} - fi + retry_backoff(5,5) { + sh '''#! /bin/bash + set -e + for PUSHIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do + [[ ${PUSHIMAGE%%/*} =~ \\. ]] && PUSHIMAGEPLUS="${PUSHIMAGE}" || PUSHIMAGEPLUS="docker.io/${PUSHIMAGE}" + IFS=',' read -ra CACHE <<< "$BUILDCACHE" + for i in "${CACHE[@]}"; do + if [[ "${PUSHIMAGEPLUS}" == "$(cut -d "/" -f1 <<< ${i})"* ]]; then + CACHEIMAGE=${i} + fi done - ''' - } + docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${META_TAG} -t ${PUSHIMAGE}:latest -t ${PUSHIMAGE}:${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} + if [ -n "${SEMVER}" ]; then + docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} + fi + done + ''' } } } @@ -808,57 +915,34 @@ pipeline { environment name: 'EXIT_STATUS', value: '' } steps { - withCredentials([ - [ - $class: 'UsernamePasswordMultiBinding', - credentialsId: 'Quay.io-Robot', - usernameVariable: 'QUAYUSER', - passwordVariable: 'QUAYPASS' - ] - ]) { - retry_backoff(5,5) { - sh '''#! /bin/bash - set -e - echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin - echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin - echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin - echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin - if [ "${CI}" == "false" ]; then - docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64 - docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} + retry_backoff(5,5) { + sh '''#! /bin/bash + set -e + for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do + [[ ${MANIFESTIMAGE%%/*} =~ \\. ]] && MANIFESTIMAGEPLUS="${MANIFESTIMAGE}" || MANIFESTIMAGEPLUS="docker.io/${MANIFESTIMAGE}" + IFS=',' read -ra CACHE <<< "$BUILDCACHE" + for i in "${CACHE[@]}"; do + if [[ "${MANIFESTIMAGEPLUS}" == "$(cut -d "/" -f1 <<< ${i})"* ]]; then + CACHEIMAGE=${i} + fi + done + docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${META_TAG} -t ${MANIFESTIMAGE}:amd64-latest -t ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} + docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${META_TAG} -t ${MANIFESTIMAGE}:arm64v8-latest -t ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} + if [ -n "${SEMVER}" ]; then + docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} + docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${SEMVER} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} fi - for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do - docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} - docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-latest - docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} - docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} - docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest - docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} - if [ -n "${SEMVER}" ]; then - docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER} - docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER} - fi - docker push ${MANIFESTIMAGE}:amd64-${META_TAG} - docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} - docker push ${MANIFESTIMAGE}:amd64-latest - docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} - docker push ${MANIFESTIMAGE}:arm64v8-latest - docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} - if [ -n "${SEMVER}" ]; then - docker push ${MANIFESTIMAGE}:amd64-${SEMVER} - docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER} - fi - done - for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do - docker buildx imagetools create -t ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest - docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} - docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} - if [ -n "${SEMVER}" ]; then - docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} - fi - done - ''' - } + done + for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do + docker buildx imagetools create -t ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest + docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} + + docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} + if [ -n "${SEMVER}" ]; then + docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} + fi + done + ''' } } } From 74f663120afdc41ea2ddadb69e3664896e77487d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 2 Dec 2024 09:28:07 +0000 Subject: [PATCH 435/514] Bot Updating Templated Files --- readme-vars.yml | 49 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 46 insertions(+), 3 deletions(-) diff --git a/readme-vars.yml b/readme-vars.yml index 4b8ad23..c422680 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -70,14 +70,57 @@ app_setup_block: | + **`latest`**: will update plex to the latest version available that you are entitled to. + **`public`**: will update plexpass users to the latest public version, useful for plexpass users that don't want to be on the bleeding edge but still want the latest public updates. + **`<specific-version>`**: will select a specific version (eg 0.9.12.4.1192-9a47d21) of plex to install, note you cannot use this to access plexpass versions if you do not have plexpass. - readme_hwaccel: true - readonly_supported: true readonly_message: | * Runtime update of Plex (and thus Plexpass builds) is not supported. * Transcode directory must be mounted to a host path or tmpfs. - +# init diagram +init_diagram: | + "plex:latest": { + docker-mods + base { + fix-attr +\nlegacy cont-init + } + docker-mods -> base + legacy-services + custom services + init-services -> legacy-services + init-services -> custom services + custom services -> legacy-services + legacy-services -> ci-service-check + init-migrations -> init-adduser + init-os-end -> init-config + init-config -> init-config-end + init-plex-update -> init-config-end + init-os-end -> init-crontab-config + init-mods-end -> init-custom-files + base -> init-envfile + base -> init-migrations + base -> init-mods + init-config-end -> init-mods + init-mods -> init-mods-end + init-mods-package-install -> init-mods-end + init-mods -> init-mods-package-install + base -> init-os-end + init-adduser -> init-os-end + init-envfile -> init-os-end + init-migrations -> init-os-end + init-config -> init-plex-chown + init-plex-chown -> init-plex-claim + init-plex-claim -> init-plex-gid-video + init-plex-gid-video -> init-plex-update + init-custom-files -> init-services + init-mods-end -> init-services + init-services -> svc-cron + svc-cron -> legacy-services + init-services -> svc-plex + svc-plex -> legacy-services + } + Base Images: { + "baseimage-ubuntu:noble" + } + "plex:latest" <- Base Images # changelog changelogs: - {date: "04.11.24:", desc: "Add Nvidia capability needed for h265"} From 3297c9b0825d7bed6f89266e0e9c021c7ab55f3a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 2 Dec 2024 09:29:49 +0000 Subject: [PATCH 436/514] Bot Updating Templated Files --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5b236a3..ae16775 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,6 @@ Valid settings for VERSION are:- + **`public`**: will update plexpass users to the latest public version, useful for plexpass users that don't want to be on the bleeding edge but still want the latest public updates. + **`<specific-version>`**: will select a specific version (eg 0.9.12.4.1192-9a47d21) of plex to install, note you cannot use this to access plexpass versions if you do not have plexpass. - ## Read-Only Operation This image can be run with a read-only container filesystem. For details please [read the docs](https://docs.linuxserver.io/misc/read-only/). @@ -116,6 +115,9 @@ Best effort is made to install tools to allow mounting in /dev/dri on Arm device To help you get started creating a container from this image you can either use docker-compose or the docker cli. +>[!NOTE] +>Unless a parameter is flaged as 'optional', it is *mandatory* and a value must be provided. + ### docker-compose (recommended, [click here for more info](https://docs.linuxserver.io/general/docker-compose)) ```yaml From 1705b4cee7484860e8eadc7f080a7118fbf1d558 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 9 Dec 2024 09:26:56 +0000 Subject: [PATCH 437/514] Bot Updating Templated Files --- readme-vars.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/readme-vars.yml b/readme-vars.yml index c422680..86979f6 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -92,26 +92,22 @@ init_diagram: | init-migrations -> init-adduser init-os-end -> init-config init-config -> init-config-end + init-crontab-config -> init-config-end init-plex-update -> init-config-end - init-os-end -> init-crontab-config + init-config -> init-crontab-config init-mods-end -> init-custom-files base -> init-envfile base -> init-migrations - base -> init-mods init-config-end -> init-mods - init-mods -> init-mods-end init-mods-package-install -> init-mods-end init-mods -> init-mods-package-install - base -> init-os-end init-adduser -> init-os-end init-envfile -> init-os-end - init-migrations -> init-os-end init-config -> init-plex-chown init-plex-chown -> init-plex-claim init-plex-claim -> init-plex-gid-video init-plex-gid-video -> init-plex-update init-custom-files -> init-services - init-mods-end -> init-services init-services -> svc-cron svc-cron -> legacy-services init-services -> svc-plex From 57555832cd693656740e98e32480b31b30b00b3d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 9 Dec 2024 09:28:44 +0000 Subject: [PATCH 438/514] Bot Updating Templated Files --- .github/workflows/external_trigger.yml | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index eaf9172..8a6079f 100644 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -43,16 +43,18 @@ jobs: token=$(curl -sX GET \ "https://ghcr.io/token?scope=repository%3Alinuxserver%2Fplex%3Apull" \ | jq -r '.token') - multidigest=$(curl -s \ - --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \ - --header "Authorization: Bearer ${token}" \ - "https://ghcr.io/v2/${image}/manifests/${tag}" \ - | jq -r 'first(.manifests[].digest)') - digest=$(curl -s \ - --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \ - --header "Authorization: Bearer ${token}" \ - "https://ghcr.io/v2/${image}/manifests/${multidigest}" \ - | jq -r '.config.digest') + multidigest=$(curl -s \ + --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \ + --header "Accept: application/vnd.oci.image.index.v1+json" \ + --header "Authorization: Bearer ${token}" \ + "https://ghcr.io/v2/${image}/manifests/${tag}") + multidigest=$(jq -r ".manifests[] | select(.platform.architecture == \"amd64\").digest?" <<< "${multidigest}") + digest=$(curl -s \ + --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \ + --header "Accept: application/vnd.oci.image.manifest.v1+json" \ + --header "Authorization: Bearer ${token}" \ + "https://ghcr.io/v2/${image}/manifests/${multidigest}" \ + | jq -r '.config.digest') image_info=$(curl -sL \ --header "Authorization: Bearer ${token}" \ "https://ghcr.io/v2/${image}/blobs/${digest}") From ed26e879a2c042e513ab26e5f91d9bacfcced48b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 9 Dec 2024 09:31:54 +0000 Subject: [PATCH 439/514] Bot Updating Package Versions --- package_versions.txt | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 04c4a47..30e29ac 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -11,7 +11,7 @@ catatonit 0.1.7-1 deb coreutils 9.4-3ubuntu6 deb cron 3.0pl1-184ubuntu2 deb cron-daemon-common 3.0pl1-184ubuntu2 deb -curl 8.5.0-2ubuntu10.4 deb +curl 8.5.0-2ubuntu10.5 deb dash 0.5.12-6ubuntu5 deb debconf 1.5.86ubuntu1 deb debianutils 5.17build1 deb @@ -36,13 +36,13 @@ hostname 3.23+nmu2ubuntu2 deb init-system-helpers 1.66ubuntu1 deb jq 1.7.1-3build1 deb keyboxd 2.4.4-2ubuntu17 deb -krb5-locales 1.20.1-6ubuntu2.1 deb -libacl1 2.3.2-1build1 deb +krb5-locales 1.20.1-6ubuntu2.2 deb +libacl1 2.3.2-1build1.1 deb libapt-pkg6.0t64 2.7.14build2 deb libassuan0 2.5.6-1build1 deb libattr1 1:2.5.2-1build1 deb -libaudit-common 1:3.1.2-2.1build1 deb -libaudit1 1:3.1.2-2.1build1 deb +libaudit-common 1:3.1.2-2.1build1.1 deb +libaudit1 1:3.1.2-2.1build1.1 deb libblkid1 2.39.3-9ubuntu6.1 deb libbrotli1 1.1.0-2build2 deb libbsd0 0.12.1-1build1 deb @@ -53,7 +53,7 @@ libcap-ng0 0.8.4-2build2 deb libcap2 1:2.66-5ubuntu2 deb libcom-err2 1.47.0-2.4~exp1ubuntu4.1 deb libcrypt1 1:4.4.36-4build1 deb -libcurl4t64 8.5.0-2ubuntu10.4 deb +libcurl4t64 8.5.0-2ubuntu10.5 deb libdb5.3t64 5.3.28+dfsg2-7 deb libdebconfclient0 0.271ubuntu3 deb libext2fs2t64 1.47.0-2.4~exp1ubuntu4.1 deb @@ -63,18 +63,18 @@ libgcrypt20 1.10.3-2build1 deb libgmp10 2:6.3.0+dfsg-2ubuntu6 deb libgnutls30t64 3.8.3-1.1ubuntu3.2 deb libgpg-error0 1.47-3build2 deb -libgssapi-krb5-2 1.20.1-6ubuntu2.1 deb +libgssapi-krb5-2 1.20.1-6ubuntu2.2 deb libhogweed6t64 3.9.1-2.2build1.1 deb libidn2-0 2.3.7-2build1 deb libjq1 1.7.1-3build1 deb -libk5crypto3 1.20.1-6ubuntu2.1 deb +libk5crypto3 1.20.1-6ubuntu2.2 deb libkeyutils1 1.6.3-3build1 deb libkmod2 31+20240202-2ubuntu7 deb -libkrb5-3 1.20.1-6ubuntu2.1 deb -libkrb5support0 1.20.1-6ubuntu2.1 deb +libkrb5-3 1.20.1-6ubuntu2.2 deb +libkrb5support0 1.20.1-6ubuntu2.2 deb libksba8 1.6.6-1build1 deb -libldap-common 2.6.7+dfsg-1~exp1ubuntu8 deb -libldap2 2.6.7+dfsg-1~exp1ubuntu8 deb +libldap-common 2.6.7+dfsg-1~exp1ubuntu8.1 deb +libldap2 2.6.7+dfsg-1~exp1ubuntu8.1 deb liblz4-1 1.9.4-1build1.1 deb liblzma5 5.6.1+really5.4.5-1build0.1 deb libmd0 1.1.0-2build1 deb From 25ff8491521608df3552b93d5e4bafb508ae132e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Wed, 11 Dec 2024 16:42:33 +0000 Subject: [PATCH 440/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 30e29ac..5125a11 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -128,7 +128,7 @@ openssl 3.0.13-0ubuntu3.4 deb passwd 1:4.13+dfsg1-4ubuntu3.2 deb perl-base 5.38.2-3.2build2 deb pinentry-curses 1.2.1-3ubuntu5 deb -plexmediaserver 1.41.2.9200-c6bbc1b53 deb +plexmediaserver 1.41.3.9292-bc7397402 deb procps 2:4.0.4-4ubuntu3.2 deb publicsuffix 20231001.0357-0.1 deb readline-common 8.2-4build1 deb From 025e5da7cbc0ae70d31353fe52eb0af16a1bbc33 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 16 Dec 2024 09:25:16 +0000 Subject: [PATCH 441/514] Bot Updating Templated Files --- Jenkinsfile | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f2e609f..229a3e0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -577,7 +577,7 @@ pipeline { --label \"org.opencontainers.image.title=Plex\" \ --label \"org.opencontainers.image.description=[Plex](https://plex.tv) organizes video, music and photos from personal media libraries and streams them to smart TVs, streaming boxes and mobile devices. This container is packaged as a standalone Plex Media Server. Straightforward design and bulk actions mean getting things done faster.\" \ --no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \ - --provenance=false --sbom=false --builder=container --load \ + --provenance=true --sbom=true --builder=container --load \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh '''#! /bin/bash set -e @@ -606,7 +606,9 @@ pipeline { for i in "${CACHE[@]}"; do docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} & done - wait + for p in $(jobs -p); do + wait "$p" || { echo "job $p failed" >&2; exit 1; } + done fi ''' } @@ -641,7 +643,7 @@ pipeline { --label \"org.opencontainers.image.title=Plex\" \ --label \"org.opencontainers.image.description=[Plex](https://plex.tv) organizes video, music and photos from personal media libraries and streams them to smart TVs, streaming boxes and mobile devices. This container is packaged as a standalone Plex Media Server. Straightforward design and bulk actions mean getting things done faster.\" \ --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \ - --provenance=false --sbom=false --builder=container --load \ + --provenance=true --sbom=true --builder=container --load \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh '''#! /bin/bash set -e @@ -670,7 +672,9 @@ pipeline { for i in "${CACHE[@]}"; do docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} & done - wait + for p in $(jobs -p); do + wait "$p" || { echo "job $p failed" >&2; exit 1; } + done fi ''' } @@ -698,7 +702,7 @@ pipeline { --label \"org.opencontainers.image.title=Plex\" \ --label \"org.opencontainers.image.description=[Plex](https://plex.tv) organizes video, music and photos from personal media libraries and streams them to smart TVs, streaming boxes and mobile devices. This container is packaged as a standalone Plex Media Server. Straightforward design and bulk actions mean getting things done faster.\" \ --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \ - --provenance=false --sbom=false --builder=container --load \ + --provenance=true --sbom=true --builder=container --load \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh '''#! /bin/bash set -e @@ -727,7 +731,9 @@ pipeline { for i in "${CACHE[@]}"; do docker push ${i}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} & done - wait + for p in $(jobs -p); do + wait "$p" || { echo "job $p failed" >&2; exit 1; } + done fi ''' } From af6901e34138ef4db5680e3f2b3385f9a66ef6a3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 16 Dec 2024 09:28:03 +0000 Subject: [PATCH 442/514] Bot Updating Templated Files --- .github/workflows/external_trigger.yml | 33 ++++++++++++++----- .../workflows/package_trigger_scheduler.yml | 27 ++++++++++++--- 2 files changed, 47 insertions(+), 13 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 8a6079f..79e620b 100644 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -48,13 +48,30 @@ jobs: --header "Accept: application/vnd.oci.image.index.v1+json" \ --header "Authorization: Bearer ${token}" \ "https://ghcr.io/v2/${image}/manifests/${tag}") - multidigest=$(jq -r ".manifests[] | select(.platform.architecture == \"amd64\").digest?" <<< "${multidigest}") - digest=$(curl -s \ - --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \ - --header "Accept: application/vnd.oci.image.manifest.v1+json" \ - --header "Authorization: Bearer ${token}" \ - "https://ghcr.io/v2/${image}/manifests/${multidigest}" \ - | jq -r '.config.digest') + if jq -e '.layers // empty' <<< "${multidigest}" >/dev/null 2>&1; then + # If there's a layer element it's a single-arch manifest so just get that digest + digest=$(jq -r '.config.digest' <<< "${multidigest}") + else + # Otherwise it's multi-arch or has manifest annotations + if jq -e '.manifests[]?.annotations // empty' <<< "${multidigest}" >/dev/null 2>&1; then + # Check for manifest annotations and delete if found + multidigest=$(jq 'del(.manifests[] | select(.annotations))' <<< "${multidigest}") + fi + if [[ $(jq '.manifests | length' <<< "${multidigest}") -gt 1 ]]; then + # If there's still more than one digest, it's multi-arch + multidigest=$(jq -r ".manifests[] | select(.platform.architecture == \"amd64\").digest?" <<< "${multidigest}") + else + # Otherwise it's single arch + multidigest=$(jq -r ".manifests[].digest?" <<< "${multidigest}") + fi + if digest=$(curl -s \ + --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \ + --header "Accept: application/vnd.oci.image.manifest.v1+json" \ + --header "Authorization: Bearer ${token}" \ + "https://ghcr.io/v2/${image}/manifests/${multidigest}"); then + digest=$(jq -r '.config.digest' <<< "${digest}"); + fi + fi image_info=$(curl -sL \ --header "Authorization: Bearer ${token}" \ "https://ghcr.io/v2/${image}/blobs/${digest}") @@ -92,7 +109,7 @@ jobs: else printf "\n## Trigger new build\n\n" >> $GITHUB_STEP_SUMMARY echo "New version \`${EXT_RELEASE}\` found; old version was \`${IMAGE_VERSION}\`. Triggering new build" >> $GITHUB_STEP_SUMMARY - if "${artifacts_found}" == "true" ]]; then + if [[ "${artifacts_found}" == "true" ]]; then echo "All artifacts seem to be uploaded." >> $GITHUB_STEP_SUMMARY fi response=$(curl -iX POST \ diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml index 325ff34..abaf63d 100644 --- a/.github/workflows/package_trigger_scheduler.yml +++ b/.github/workflows/package_trigger_scheduler.yml @@ -27,9 +27,18 @@ jobs: fi printf "\n## Evaluating \`%s\`\n\n" ${br} >> $GITHUB_STEP_SUMMARY JENKINS_VARS=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-plex/${br}/jenkins-vars.yml) - if [[ "${br}" == $(yq -r '.ls_branch' <<< "${JENKINS_VARS}") ]]; then + if ! curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-plex/${br}/Jenkinsfile >/dev/null 2>&1; then + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> No Jenkinsfile found. Branch is either deprecated or is an early dev branch." >> $GITHUB_STEP_SUMMARY + skipped_branches="${skipped_branches}${br} " + elif [[ "${br}" == $(yq -r '.ls_branch' <<< "${JENKINS_VARS}") ]]; then echo "Branch appears to be live; checking workflow." >> $GITHUB_STEP_SUMMARY - if [[ $(yq -r '.skip_package_check' <<< "${JENKINS_VARS}") == "true" ]]; then + README_VARS=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-plex/${br}/readme-vars.yml) + if [[ $(yq -r '.project_deprecation_status' <<< "${README_VARS}") == "true" ]]; then + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> Branch appears to be deprecated; skipping trigger." >> $GITHUB_STEP_SUMMARY + skipped_branches="${skipped_branches}${br} " + elif [[ $(yq -r '.skip_package_check' <<< "${JENKINS_VARS}") == "true" ]]; then echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY echo "> Skipping branch ${br} due to \`skip_package_check\` being set in \`jenkins-vars.yml\`." >> $GITHUB_STEP_SUMMARY skipped_branches="${skipped_branches}${br} " @@ -37,7 +46,7 @@ jobs: echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY echo "> Github organizational variable \`SKIP_PACKAGE_TRIGGER\` contains \`plex_${br}\`; skipping trigger." >> $GITHUB_STEP_SUMMARY skipped_branches="${skipped_branches}${br} " - elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-plex/job/${br}/lastBuild/api/json | jq -r '.building') == "true" ]; then + elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-plex/job/${br}/lastBuild/api/json | jq -r '.building' 2>/dev/null) == "true" ]; then echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY echo "> There already seems to be an active build on Jenkins; skipping package trigger for ${br}" >> $GITHUB_STEP_SUMMARY skipped_branches="${skipped_branches}${br} " @@ -49,6 +58,11 @@ jobs: response=$(curl -iX POST \ https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-plex/job/${br}/buildWithParameters?PACKAGE_CHECK=true \ --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") + if [[ -z "${response}" ]]; then + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> Jenkins build could not be triggered. Skipping branch." + continue + fi echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY sleep 10 @@ -56,11 +70,14 @@ jobs: buildurl="${buildurl%$'\r'}" echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY echo "Attempting to change the Jenkins job description" >> $GITHUB_STEP_SUMMARY - curl -iX POST \ + if ! curl -ifX POST \ "${buildurl}submitDescription" \ --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \ --data-urlencode "description=GHA package trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \ - --data-urlencode "Submit=Submit" + --data-urlencode "Submit=Submit"; then + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> Unable to change the Jenkins job description." + fi sleep 20 fi else From 5521df85df95375d69708d4b3f2b622a5e6bfef7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 17 Dec 2024 22:35:06 +0000 Subject: [PATCH 443/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 5125a11..6c837af 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -128,7 +128,7 @@ openssl 3.0.13-0ubuntu3.4 deb passwd 1:4.13+dfsg1-4ubuntu3.2 deb perl-base 5.38.2-3.2build2 deb pinentry-curses 1.2.1-3ubuntu5 deb -plexmediaserver 1.41.3.9292-bc7397402 deb +plexmediaserver 1.41.3.9314-a0bfb8370 deb procps 2:4.0.4-4ubuntu3.2 deb publicsuffix 20231001.0357-0.1 deb readline-common 8.2-4build1 deb From b29a1b8320c80d709f56f47c05bd48be9889fda6 Mon Sep 17 00:00:00 2001 From: thespad <spad@linuxserver.io> Date: Fri, 20 Dec 2024 20:31:10 +0000 Subject: [PATCH 444/514] Support nonroot operation --- README.md | 10 ++++ readme-vars.yml | 4 ++ .../s6-overlay/s6-rc.d/init-plex-chown/run | 56 +++++++++--------- .../s6-rc.d/init-plex-gid-video/run | 58 ++++++++++--------- root/etc/s6-overlay/s6-rc.d/svc-plex/run | 13 ++++- 5 files changed, 84 insertions(+), 57 deletions(-) diff --git a/README.md b/README.md index ae16775..d3a72b4 100644 --- a/README.md +++ b/README.md @@ -86,6 +86,15 @@ This image can be run with a read-only container filesystem. For details please * Runtime update of Plex (and thus Plexpass builds) is not supported. * Transcode directory must be mounted to a host path or tmpfs. +## Non-Root Operation + +This image can be run with a non-root user. For details please [read the docs](https://docs.linuxserver.io/misc/non-root/). + +### Caveats + +* Runtime update of Plex (and thus Plexpass builds) is not supported. +* Transcode directory must be mounted to a host path or tmpfs. + ### Hardware Acceleration Many desktop applications need access to a GPU to function properly and even some Desktop Environments have compositor effects that will not function without a GPU. However this is not a hard requirement and all base images will function without a video device mounted into the container. @@ -174,6 +183,7 @@ Containers are configured using parameters passed at runtime (such as those abov | `-v /tv` | Media goes here. Add as many as needed e.g. `/movies`, `/tv`, etc. | | `-v /movies` | Media goes here. Add as many as needed e.g. `/movies`, `/tv`, etc. | | `--read-only=true` | Run container with a read-only filesystem. Please [read the docs](https://docs.linuxserver.io/misc/read-only/). | +| `--user=1000:1000` | Run container with a non-root user. Please [read the docs](https://docs.linuxserver.io/misc/non-root/). | ## Environment variables from files (Docker secrets) diff --git a/readme-vars.yml b/readme-vars.yml index 86979f6..4e109a1 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -75,6 +75,10 @@ readonly_supported: true readonly_message: | * Runtime update of Plex (and thus Plexpass builds) is not supported. * Transcode directory must be mounted to a host path or tmpfs. +nonroot_supported: true +nonroot_message: | + * Runtime update of Plex (and thus Plexpass builds) is not supported. + * Transcode directory must be mounted to a host path or tmpfs. # init diagram init_diagram: | "plex:latest": { diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-chown/run b/root/etc/s6-overlay/s6-rc.d/init-plex-chown/run index 6c2d74c..f98e669 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-plex-chown/run +++ b/root/etc/s6-overlay/s6-rc.d/init-plex-chown/run @@ -6,16 +6,9 @@ mkdir -p /run/plex-temp # create folders if [[ ! -d "${PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR}" ]]; then mkdir -p "${PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR}" - lsiown -R abc:abc /config -fi - -# check Library permissions -PUID=${PUID:-911} -if [[ ! "$(stat -c %u /config/Library)" == "${PUID}" ]]; then - echo "Change in ownership detected, please be patient while we chown existing files" - echo "This could take some time" - lsiown -R abc:abc \ - /config/Library + if [[ -z ${LSIO_NON_ROOT_USER} ]]; then + lsiown -R abc:abc /config + fi fi # remove plex pid after unclean stop @@ -23,20 +16,31 @@ if [[ -f "/config/Library/Application Support/Plex Media Server/plexmediaserver. rm -f "/config/Library/Application Support/Plex Media Server/plexmediaserver.pid" fi -# set permissions on Plex Transcoder Temp Directory -PLEX_MEDIA_SERVER_PREFERENCES="${PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR}/Plex Media Server/Preferences.xml" -if [[ -f "${PLEX_MEDIA_SERVER_PREFERENCES}" ]]; then - TranscoderTempDirectory='\bTranscoderTempDirectory="([^"]+)"' - while IFS= read -r line; do - if [[ ${line} =~ ${TranscoderTempDirectory} ]] && [[ -d "${BASH_REMATCH[1]}" ]]; then - echo "Setting permissions on ${BASH_REMATCH[1]}" - lsiown -R abc:abc "${BASH_REMATCH[1]}" - fi - done <"${PLEX_MEDIA_SERVER_PREFERENCES}" -fi +if [[ -z ${LSIO_NON_ROOT_USER} ]]; then + # check Library permissions + PUID=${PUID:-911} + if [[ ! "$(stat -c %u /config/Library)" == "${PUID}" ]]; then + echo "Change in ownership detected, please be patient while we chown existing files" + echo "This could take some time" + lsiown -R abc:abc \ + /config/Library + fi -# permissions (non-recursive) on config root and folders -lsiown abc:abc \ - /run/plex-temp \ - /config \ - /config/* + # set permissions on Plex Transcoder Temp Directory + PLEX_MEDIA_SERVER_PREFERENCES="${PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR}/Plex Media Server/Preferences.xml" + if [[ -f "${PLEX_MEDIA_SERVER_PREFERENCES}" ]]; then + TranscoderTempDirectory='\bTranscoderTempDirectory="([^"]+)"' + while IFS= read -r line; do + if [[ ${line} =~ ${TranscoderTempDirectory} ]] && [[ -d "${BASH_REMATCH[1]}" ]]; then + echo "Setting permissions on ${BASH_REMATCH[1]}" + lsiown -R abc:abc "${BASH_REMATCH[1]}" + fi + done <"${PLEX_MEDIA_SERVER_PREFERENCES}" + fi + + # permissions (non-recursive) on config root and folders + lsiown abc:abc \ + /run/plex-temp \ + /config \ + /config/* +fi diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/run b/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/run index cd01d81..083570f 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/run +++ b/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/run @@ -1,35 +1,37 @@ #!/usr/bin/with-contenv bash # shellcheck shell=bash -FILES=$(find /dev/dri /dev/dvb -type c -print 2>/dev/null) +if [[ -z ${LSIO_NON_ROOT_USER} ]]; then + FILES=$(find /dev/dri /dev/dvb -type c -print 2>/dev/null) -for i in ${FILES}; do - VIDEO_GID=$(stat -c '%g' "${i}") - VIDEO_UID=$(stat -c '%u' "${i}") - # check if user matches device - if id -u abc | grep -qw "${VIDEO_UID}"; then - echo "**** permissions for ${i} are good ****" - else - # check if group matches and that device has group rw - if id -G abc | grep -qw "${VIDEO_GID}" && [[ $(stat -c '%A' "${i}" | cut -b 5,6) == "rw" ]]; then + for i in ${FILES}; do + VIDEO_GID=$(stat -c '%g' "${i}") + VIDEO_UID=$(stat -c '%u' "${i}") + # check if user matches device + if id -u abc | grep -qw "${VIDEO_UID}"; then echo "**** permissions for ${i} are good ****" - # check if device needs to be added to video group - elif ! id -G abc | grep -qw "${VIDEO_GID}"; then - # check if video group needs to be created - VIDEO_NAME=$(getent group "${VIDEO_GID}" | awk -F: '{print $1}') - if [[ -z "${VIDEO_NAME}" ]]; then - VIDEO_NAME="video$(head /dev/urandom | tr -dc 'a-z0-9' | head -c4)" - groupadd "${VIDEO_NAME}" - groupmod -g "${VIDEO_GID}" "${VIDEO_NAME}" - echo "**** creating video group ${VIDEO_NAME} with id ${VIDEO_GID} ****" + else + # check if group matches and that device has group rw + if id -G abc | grep -qw "${VIDEO_GID}" && [[ $(stat -c '%A' "${i}" | cut -b 5,6) == "rw" ]]; then + echo "**** permissions for ${i} are good ****" + # check if device needs to be added to video group + elif ! id -G abc | grep -qw "${VIDEO_GID}"; then + # check if video group needs to be created + VIDEO_NAME=$(getent group "${VIDEO_GID}" | awk -F: '{print $1}') + if [[ -z "${VIDEO_NAME}" ]]; then + VIDEO_NAME="video$(head /dev/urandom | tr -dc 'a-z0-9' | head -c4)" + groupadd "${VIDEO_NAME}" + groupmod -g "${VIDEO_GID}" "${VIDEO_NAME}" + echo "**** creating video group ${VIDEO_NAME} with id ${VIDEO_GID} ****" + fi + echo "**** adding ${i} to video group ${VIDEO_NAME} with id ${VIDEO_GID} ****" + usermod -a -G "${VIDEO_NAME}" abc + fi + # check if device has group rw + if [[ $(stat -c '%A' "${i}" | cut -b 5,6) != "rw" ]]; then + echo -e "**** The device ${i} does not have group read/write permissions, attempting to fix inside the container. ****" + chmod g+rw "${i}" fi - echo "**** adding ${i} to video group ${VIDEO_NAME} with id ${VIDEO_GID} ****" - usermod -a -G "${VIDEO_NAME}" abc fi - # check if device has group rw - if [[ $(stat -c '%A' "${i}" | cut -b 5,6) != "rw" ]]; then - echo -e "**** The device ${i} does not have group read/write permissions, attempting to fix inside the container. ****" - chmod g+rw "${i}" - fi - fi -done + done +fi diff --git a/root/etc/s6-overlay/s6-rc.d/svc-plex/run b/root/etc/s6-overlay/s6-rc.d/svc-plex/run index 09fe8df..bb60746 100755 --- a/root/etc/s6-overlay/s6-rc.d/svc-plex/run +++ b/root/etc/s6-overlay/s6-rc.d/svc-plex/run @@ -6,6 +6,13 @@ PLEX_MEDIA_SERVER_INFO_MODEL=$(uname -m) export PLEX_MEDIA_SERVER_INFO_MODEL PLEX_MEDIA_SERVER_INFO_PLATFORM_VERSION=$(uname -r) export PLEX_MEDIA_SERVER_INFO_PLATFORM_VERSION -exec \ - s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 32400" \ - s6-setuidgid abc "/usr/lib/plexmediaserver/Plex Media Server" + +if [[ -z ${LSIO_NON_ROOT_USER} ]]; then + exec \ + s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 32400" \ + s6-setuidgid abc "/usr/lib/plexmediaserver/Plex Media Server" +else + exec \ + s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 32400" \ + "/usr/lib/plexmediaserver/Plex Media Server" +fi From 875eb3dc41a5280142fdcaaf4cd74609fa73a1e8 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 23 Dec 2024 09:23:14 +0000 Subject: [PATCH 445/514] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 6c837af..93618ff 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -11,7 +11,7 @@ catatonit 0.1.7-1 deb coreutils 9.4-3ubuntu6 deb cron 3.0pl1-184ubuntu2 deb cron-daemon-common 3.0pl1-184ubuntu2 deb -curl 8.5.0-2ubuntu10.5 deb +curl 8.5.0-2ubuntu10.6 deb dash 0.5.12-6ubuntu5 deb debconf 1.5.86ubuntu1 deb debianutils 5.17build1 deb @@ -53,7 +53,7 @@ libcap-ng0 0.8.4-2build2 deb libcap2 1:2.66-5ubuntu2 deb libcom-err2 1.47.0-2.4~exp1ubuntu4.1 deb libcrypt1 1:4.4.36-4build1 deb -libcurl4t64 8.5.0-2ubuntu10.5 deb +libcurl4t64 8.5.0-2ubuntu10.6 deb libdb5.3t64 5.3.28+dfsg2-7 deb libdebconfclient0 0.271ubuntu3 deb libext2fs2t64 1.47.0-2.4~exp1ubuntu4.1 deb From 56d67a38c471d7e75c838b91d57a9be67ec139cc Mon Sep 17 00:00:00 2001 From: BuildTools <unconfigured@null.spigotmc.org> Date: Fri, 27 Dec 2024 13:00:23 +0000 Subject: [PATCH 446/514] made wg a dependency for plex service --- root/etc/s6-overlay/s6-rc.d/init-wireguard/run | 12 ++++++++---- .../s6-rc.d/svc-plex/dependencies.d/init-wireguard | 0 2 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-plex/dependencies.d/init-wireguard diff --git a/root/etc/s6-overlay/s6-rc.d/init-wireguard/run b/root/etc/s6-overlay/s6-rc.d/init-wireguard/run index e5989a5..85ad6c3 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-wireguard/run +++ b/root/etc/s6-overlay/s6-rc.d/init-wireguard/run @@ -1,10 +1,14 @@ #!/usr/bin/with-contenv bash + # Bring up WireGuard if not already up if ! ip link show dev wg0 > /dev/null 2>&1; then wg-quick up wg0 -else -sleep 60 fi -# Exit after running -exit 0 +# Monitor wireguard status +while true; do + if ! ip link show dev wg0 | grep -q "UP"; then + wg-quick up wg0 + fi + sleep 60 +done diff --git a/root/etc/s6-overlay/s6-rc.d/svc-plex/dependencies.d/init-wireguard b/root/etc/s6-overlay/s6-rc.d/svc-plex/dependencies.d/init-wireguard new file mode 100644 index 0000000..e69de29 From 8217b62d9a86087652ffe751ca2bcb9192b43dd0 Mon Sep 17 00:00:00 2001 From: quietsy <github@qtsy.cc> Date: Wed, 22 Jan 2025 17:13:12 +0200 Subject: [PATCH 447/514] Add categories to readme-vars.yml --- readme-vars.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/readme-vars.yml b/readme-vars.yml index 4e109a1..fb96495 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -6,6 +6,7 @@ project_url: "https://plex.tv" project_logo: "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/plex-logo.png" project_blurb: "[{{ project_name|capitalize }}]({{ project_url }}) organizes video, music and photos from personal media libraries and streams them to smart TVs, streaming boxes and mobile devices. This container is packaged as a standalone Plex Media Server. Straightforward design and bulk actions mean getting things done faster." project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}" +project_categories: "Media Servers,Music,Audiobooks" # supported architectures available_architectures: - {arch: "{{ arch_x86_64 }}", tag: "amd64-latest"} From 23a7477bd681a321bf51c2fb2732051fc8cb2c9c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 3 Feb 2025 09:23:16 +0000 Subject: [PATCH 448/514] Bot Updating Templated Files --- Jenkinsfile | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 229a3e0..eab9703 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -58,11 +58,21 @@ pipeline { steps{ echo "Running on node: ${NODE_NAME}" sh '''#! /bin/bash - containers=$(docker ps -aq) + echo "Pruning builder" + docker builder prune -f --builder container || : + containers=$(docker ps -q) if [[ -n "${containers}" ]]; then - docker stop ${containers} + BUILDX_CONTAINER_ID=$(docker ps -qf 'name=buildx_buildkit') + for container in ${containers}; do + if [[ "${container}" == "${BUILDX_CONTAINER_ID}" ]]; then + echo "skipping buildx container in docker stop" + else + echo "Stopping container ${container}" + docker stop ${container} + fi + done fi - docker system prune -af --volumes || : ''' + docker system prune -f --volumes || : ''' script{ env.EXIT_STATUS = '' env.LS_RELEASE = sh( @@ -1154,12 +1164,21 @@ EOF } cleanup { sh '''#! /bin/bash - echo "Performing docker system prune!!" - containers=$(docker ps -aq) + echo "Pruning builder!!" + docker builder prune -f --builder container || : + containers=$(docker ps -q) if [[ -n "${containers}" ]]; then - docker stop ${containers} + BUILDX_CONTAINER_ID=$(docker ps -qf 'name=buildx_buildkit') + for container in ${containers}; do + if [[ "${container}" == "${BUILDX_CONTAINER_ID}" ]]; then + echo "skipping buildx container in docker stop" + else + echo "Stopping container ${container}" + docker stop ${container} + fi + done fi - docker system prune -af --volumes || : + docker system prune -f --volumes || : ''' cleanWs() } From 1faeb23abbaaee192e10aa1f060a8bb040efc262 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 3 Feb 2025 09:24:30 +0000 Subject: [PATCH 449/514] Bot Updating Templated Files --- .github/CONTRIBUTING.md | 2 +- .github/ISSUE_TEMPLATE/config.yml | 2 +- .github/workflows/external_trigger.yml | 10 +++++++++- README.md | 4 ++-- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 755352d..7892606 100755 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -6,7 +6,7 @@ * Read, and fill the Pull Request template * If this is a fix for a typo (in code, documentation, or the README) please file an issue and let us sort it out. We do not need a PR * If the PR is addressing an existing issue include, closes #\<issue number>, in the body of the PR commit message -* If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://discord.gg/YWrKVTn) +* If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://linuxserver.io/discord) ## Common files diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 404ea59..d0e43ea 100755 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,7 +1,7 @@ blank_issues_enabled: false contact_links: - name: Discord chat support - url: https://discord.gg/YWrKVTn + url: https://linuxserver.io/discord about: Realtime support / chat with the community and the team. - name: Discourse discussion forum diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 79e620b..f502b3a 100644 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -15,7 +15,10 @@ jobs: SKIP_EXTERNAL_TRIGGER: ${{ vars.SKIP_EXTERNAL_TRIGGER }} run: | printf "# External trigger for docker-plex\n\n" >> $GITHUB_STEP_SUMMARY - if grep -q "^plex_master" <<< "${SKIP_EXTERNAL_TRIGGER}"; then + if grep -q "^plex_master_" <<< "${SKIP_EXTERNAL_TRIGGER}"; then + echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY + echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`plex_master_\`; will skip trigger if version matches." >> $GITHUB_STEP_SUMMARY + elif grep -q "^plex_master" <<< "${SKIP_EXTERNAL_TRIGGER}"; then echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`plex_master\`; skipping trigger." >> $GITHUB_STEP_SUMMARY exit 0 @@ -25,6 +28,11 @@ jobs: printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY EXT_RELEASE=$(curl -s "https://plex.tv/api/downloads/5.json" | jq -r '. | .computer.Linux.version') echo "Type is \`custom_json\`" >> $GITHUB_STEP_SUMMARY + if grep -q "^plex_master_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` matches current external release; skipping trigger." >> $GITHUB_STEP_SUMMARY + exit 0 + fi if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY echo "> Can't retrieve external version, exiting" >> $GITHUB_STEP_SUMMARY diff --git a/README.md b/README.md index d3a72b4..6d8a0e9 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io) [![Blog](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!") -[![Discord](https://img.shields.io/discord/354974912613449730.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=Discord&logo=discord)](https://discord.gg/YWrKVTn "realtime support / chat with the community and the team.") +[![Discord](https://img.shields.io/discord/354974912613449730.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=Discord&logo=discord)](https://linuxserver.io/discord "realtime support / chat with the community and the team.") [![Discourse](https://img.shields.io/discourse/https/discourse.linuxserver.io/topics.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=discourse)](https://discourse.linuxserver.io "post on our community forum.") [![Fleet](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Fleet)](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.") [![GitHub](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub&logo=github)](https://github.com/linuxserver "view the source for all of our repositories.") @@ -20,7 +20,7 @@ The [LinuxServer.io](https://linuxserver.io) team brings you another container r Find us at: * [Blog](https://blog.linuxserver.io) - all the things you can do with our containers including How-To guides, opinions and much more! -* [Discord](https://discord.gg/YWrKVTn) - realtime support / chat with the community and the team. +* [Discord](https://linuxserver.io/discord) - realtime support / chat with the community and the team. * [Discourse](https://discourse.linuxserver.io) - post on our community forum. * [Fleet](https://fleet.linuxserver.io) - an online web interface which displays all of our maintained images. * [GitHub](https://github.com/linuxserver) - view the source for all of our repositories. From fa3f35a0f0a3957ef9b0cab3fc649cd5d2ab072c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 3 Feb 2025 09:29:25 +0000 Subject: [PATCH 450/514] Bot Updating Package Versions --- package_versions.txt | 53 ++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 93618ff..b248cc3 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -5,7 +5,7 @@ apt-utils 2.7.14build2 deb base-files 13ubuntu10.1 deb base-passwd 3.6.3build1 deb bash 5.2.21-2ubuntu4 deb -bsdutils 1:2.39.3-9ubuntu6.1 deb +bsdutils 1:2.39.3-9ubuntu6.2 deb ca-certificates 20240203 deb catatonit 0.1.7-1 deb coreutils 9.4-3ubuntu6 deb @@ -40,17 +40,17 @@ krb5-locales 1.20.1-6ubuntu2.2 deb libacl1 2.3.2-1build1.1 deb libapt-pkg6.0t64 2.7.14build2 deb libassuan0 2.5.6-1build1 deb -libattr1 1:2.5.2-1build1 deb +libattr1 1:2.5.2-1build1.1 deb libaudit-common 1:3.1.2-2.1build1.1 deb libaudit1 1:3.1.2-2.1build1.1 deb -libblkid1 2.39.3-9ubuntu6.1 deb +libblkid1 2.39.3-9ubuntu6.2 deb libbrotli1 1.1.0-2build2 deb -libbsd0 0.12.1-1build1 deb +libbsd0 0.12.1-1build1.1 deb libbz2-1.0 1.0.8-5.1build0.1 deb libc-bin 2.39-0ubuntu8.3 deb libc6 2.39-0ubuntu8.3 deb libcap-ng0 0.8.4-2build2 deb -libcap2 1:2.66-5ubuntu2 deb +libcap2 1:2.66-5ubuntu2.1 deb libcom-err2 1.47.0-2.4~exp1ubuntu4.1 deb libcrypt1 1:4.4.36-4build1 deb libcurl4t64 8.5.0-2ubuntu10.6 deb @@ -60,16 +60,16 @@ libext2fs2t64 1.47.0-2.4~exp1ubuntu4.1 deb libffi8 3.4.6-1build1 deb libgcc-s1 14.2.0-4ubuntu2~24.04 deb libgcrypt20 1.10.3-2build1 deb -libgmp10 2:6.3.0+dfsg-2ubuntu6 deb +libgmp10 2:6.3.0+dfsg-2ubuntu6.1 deb libgnutls30t64 3.8.3-1.1ubuntu3.2 deb -libgpg-error0 1.47-3build2 deb +libgpg-error0 1.47-3build2.1 deb libgssapi-krb5-2 1.20.1-6ubuntu2.2 deb libhogweed6t64 3.9.1-2.2build1.1 deb -libidn2-0 2.3.7-2build1 deb +libidn2-0 2.3.7-2build1.1 deb libjq1 1.7.1-3build1 deb libk5crypto3 1.20.1-6ubuntu2.2 deb libkeyutils1 1.6.3-3build1 deb -libkmod2 31+20240202-2ubuntu7 deb +libkmod2 31+20240202-2ubuntu7.1 deb libkrb5-3 1.20.1-6ubuntu2.2 deb libkrb5support0 1.20.1-6ubuntu2.2 deb libksba8 1.6.6-1build1 deb @@ -77,11 +77,11 @@ libldap-common 2.6.7+dfsg-1~exp1ubuntu8.1 deb libldap2 2.6.7+dfsg-1~exp1ubuntu8.1 deb liblz4-1 1.9.4-1build1.1 deb liblzma5 5.6.1+really5.4.5-1build0.1 deb -libmd0 1.1.0-2build1 deb -libmount1 2.39.3-9ubuntu6.1 deb +libmd0 1.1.0-2build1.1 deb +libmount1 2.39.3-9ubuntu6.2 deb libncursesw6 6.4+20240113-1ubuntu2 deb libnettle8t64 3.9.1-2.2build1.1 deb -libnghttp2-14 1.59.0-1ubuntu0.1 deb +libnghttp2-14 1.59.0-1ubuntu0.2 deb libnpth0t64 1.6-3.1build1 deb libonig5 6.9.9-1build1 deb libp11-kit0 0.25.3-4ubuntu2.1 deb @@ -89,7 +89,7 @@ libpam-modules 1.5.3-5ubuntu5.1 deb libpam-modules-bin 1.5.3-5ubuntu5.1 deb libpam-runtime 1.5.3-5ubuntu5.1 deb libpam0g 1.5.3-5ubuntu5.1 deb -libpcre2-8-0 10.42-4ubuntu2 deb +libpcre2-8-0 10.42-4ubuntu2.1 deb libproc2-0 2:4.0.4-4ubuntu3.2 deb libpsl5t64 0.21.2-1.1build1 deb libreadline8t64 8.2-4build1 deb @@ -98,35 +98,35 @@ libsasl2-2 2.1.28+dfsg1-5ubuntu3.1 deb libsasl2-modules 2.1.28+dfsg1-5ubuntu3.1 deb libsasl2-modules-db 2.1.28+dfsg1-5ubuntu3.1 deb libseccomp2 2.5.5-1ubuntu3.1 deb -libselinux1 3.5-2ubuntu2 deb +libselinux1 3.5-2ubuntu2.1 deb libsemanage-common 3.5-1build5 deb libsemanage2 3.5-1build5 deb libsepol2 3.5-2build1 deb -libsmartcols1 2.39.3-9ubuntu6.1 deb -libsqlite3-0 3.45.1-1ubuntu2 deb +libsmartcols1 2.39.3-9ubuntu6.2 deb +libsqlite3-0 3.45.1-1ubuntu2.1 deb libss2 1.47.0-2.4~exp1ubuntu4.1 deb libssh-4 0.10.6-2build2 deb libssl3t64 3.0.13-0ubuntu3.4 deb libstdc++6 14.2.0-4ubuntu2~24.04 deb -libsystemd0 255.4-1ubuntu8.4 deb +libsystemd0 255.4-1ubuntu8.5 deb libtasn1-6 4.19.0-3build1 deb libtinfo6 6.4+20240113-1ubuntu2 deb -libudev1 255.4-1ubuntu8.4 deb -libunistring5 1.1-2build1 deb -libuuid1 2.39.3-9ubuntu6.1 deb +libudev1 255.4-1ubuntu8.5 deb +libunistring5 1.1-2build1.1 deb +libuuid1 2.39.3-9ubuntu6.2 deb libxxhash0 0.8.2-2build1 deb libzstd1 1.5.5+dfsg2-2build1.1 deb locales 2.39-0ubuntu8.3 deb login 1:4.13+dfsg1-4ubuntu3.2 deb logsave 1.47.0-2.4~exp1ubuntu4.1 deb mawk 1.3.4.20240123-1build1 deb -mount 2.39.3-9ubuntu6.1 deb +mount 2.39.3-9ubuntu6.2 deb ncurses-base 6.4+20240113-1ubuntu2 deb ncurses-bin 6.4+20240113-1ubuntu2 deb netcat-openbsd 1.226-1ubuntu2 deb openssl 3.0.13-0ubuntu3.4 deb passwd 1:4.13+dfsg1-4ubuntu3.2 deb -perl-base 5.38.2-3.2build2 deb +perl-base 5.38.2-3.2build2.1 deb pinentry-curses 1.2.1-3ubuntu5 deb plexmediaserver 1.41.3.9314-a0bfb8370 deb procps 2:4.0.4-4ubuntu3.2 deb @@ -134,14 +134,15 @@ publicsuffix 20231001.0357-0.1 deb readline-common 8.2-4build1 deb sed 4.9-2build1 deb sensible-utils 0.0.22 deb -systemd-dev 255.4-1ubuntu8.4 deb +systemd-dev 255.4-1ubuntu8.5 deb systemd-hwe-hwdb 255.1.4 deb -systemd-standalone-sysusers 255.4-1ubuntu8.4 deb +systemd-standalone-sysusers 255.4-1ubuntu8.5 deb sysvinit-utils 3.08-6ubuntu3 deb tar 1.35+dfsg-3build1 deb tzdata 2024a-3ubuntu1.1 deb ubuntu-keyring 2023.11.28.1 deb -udev 255.4-1ubuntu8.4 deb -util-linux 2.39.3-9ubuntu6.1 deb +udev 255.4-1ubuntu8.5 deb +unminimize 0.2.1 deb +util-linux 2.39.3-9ubuntu6.2 deb wget 1.21.4-1ubuntu4.1 deb zlib1g 1:1.3.dfsg-3.1ubuntu2.1 deb From 8a22d79bee75518301dd1e8dbeacf21f34d32cc5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 10 Feb 2025 09:23:43 +0000 Subject: [PATCH 451/514] Bot Updating Templated Files --- Jenkinsfile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index eab9703..62105f4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -72,7 +72,9 @@ pipeline { fi done fi - docker system prune -f --volumes || : ''' + docker system prune -f --volumes || : + docker image prune -af || : + ''' script{ env.EXIT_STATUS = '' env.LS_RELEASE = sh( @@ -753,7 +755,8 @@ pipeline { if [[ -n "${containers}" ]]; then docker stop ${containers} fi - docker system prune -af --volumes || : + docker system prune -f --volumes || : + docker image prune -af || : ''' } } @@ -1179,6 +1182,7 @@ EOF done fi docker system prune -f --volumes || : + docker image prune -af || : ''' cleanWs() } From 2d5bbae0dd7d4bb3406184346450d7f9cee416c0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 10 Feb 2025 09:28:25 +0000 Subject: [PATCH 452/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index b248cc3..6f37c09 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -139,7 +139,7 @@ systemd-hwe-hwdb 255.1.4 deb systemd-standalone-sysusers 255.4-1ubuntu8.5 deb sysvinit-utils 3.08-6ubuntu3 deb tar 1.35+dfsg-3build1 deb -tzdata 2024a-3ubuntu1.1 deb +tzdata 2024b-0ubuntu0.24.04 deb ubuntu-keyring 2023.11.28.1 deb udev 255.4-1ubuntu8.5 deb unminimize 0.2.1 deb From 0a30a9391e3a9a77b74adfcec29d70f273c79931 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Wed, 12 Feb 2025 17:32:49 +0000 Subject: [PATCH 453/514] Bot Updating Package Versions --- package_versions.txt | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 6f37c09..2293fa7 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -2,7 +2,7 @@ NAME VERSION TYPE adduser 3.137ubuntu1 deb apt 2.7.14build2 deb apt-utils 2.7.14build2 deb -base-files 13ubuntu10.1 deb +base-files 13ubuntu10.2 deb base-passwd 3.6.3build1 deb bash 5.2.21-2ubuntu4 deb bsdutils 1:2.39.3-9ubuntu6.2 deb @@ -36,7 +36,7 @@ hostname 3.23+nmu2ubuntu2 deb init-system-helpers 1.66ubuntu1 deb jq 1.7.1-3build1 deb keyboxd 2.4.4-2ubuntu17 deb -krb5-locales 1.20.1-6ubuntu2.2 deb +krb5-locales 1.20.1-6ubuntu2.3 deb libacl1 2.3.2-1build1.1 deb libapt-pkg6.0t64 2.7.14build2 deb libassuan0 2.5.6-1build1 deb @@ -47,8 +47,8 @@ libblkid1 2.39.3-9ubuntu6.2 deb libbrotli1 1.1.0-2build2 deb libbsd0 0.12.1-1build1.1 deb libbz2-1.0 1.0.8-5.1build0.1 deb -libc-bin 2.39-0ubuntu8.3 deb -libc6 2.39-0ubuntu8.3 deb +libc-bin 2.39-0ubuntu8.4 deb +libc6 2.39-0ubuntu8.4 deb libcap-ng0 0.8.4-2build2 deb libcap2 1:2.66-5ubuntu2.1 deb libcom-err2 1.47.0-2.4~exp1ubuntu4.1 deb @@ -63,15 +63,15 @@ libgcrypt20 1.10.3-2build1 deb libgmp10 2:6.3.0+dfsg-2ubuntu6.1 deb libgnutls30t64 3.8.3-1.1ubuntu3.2 deb libgpg-error0 1.47-3build2.1 deb -libgssapi-krb5-2 1.20.1-6ubuntu2.2 deb +libgssapi-krb5-2 1.20.1-6ubuntu2.3 deb libhogweed6t64 3.9.1-2.2build1.1 deb libidn2-0 2.3.7-2build1.1 deb libjq1 1.7.1-3build1 deb -libk5crypto3 1.20.1-6ubuntu2.2 deb +libk5crypto3 1.20.1-6ubuntu2.3 deb libkeyutils1 1.6.3-3build1 deb libkmod2 31+20240202-2ubuntu7.1 deb -libkrb5-3 1.20.1-6ubuntu2.2 deb -libkrb5support0 1.20.1-6ubuntu2.2 deb +libkrb5-3 1.20.1-6ubuntu2.3 deb +libkrb5support0 1.20.1-6ubuntu2.3 deb libksba8 1.6.6-1build1 deb libldap-common 2.6.7+dfsg-1~exp1ubuntu8.1 deb libldap2 2.6.7+dfsg-1~exp1ubuntu8.1 deb @@ -116,7 +116,7 @@ libunistring5 1.1-2build1.1 deb libuuid1 2.39.3-9ubuntu6.2 deb libxxhash0 0.8.2-2build1 deb libzstd1 1.5.5+dfsg2-2build1.1 deb -locales 2.39-0ubuntu8.3 deb +locales 2.39-0ubuntu8.4 deb login 1:4.13+dfsg1-4ubuntu3.2 deb logsave 1.47.0-2.4~exp1ubuntu4.1 deb mawk 1.3.4.20240123-1build1 deb @@ -128,7 +128,7 @@ openssl 3.0.13-0ubuntu3.4 deb passwd 1:4.13+dfsg1-4ubuntu3.2 deb perl-base 5.38.2-3.2build2.1 deb pinentry-curses 1.2.1-3ubuntu5 deb -plexmediaserver 1.41.3.9314-a0bfb8370 deb +plexmediaserver 1.41.4.9463-630c9f557 deb procps 2:4.0.4-4ubuntu3.2 deb publicsuffix 20231001.0357-0.1 deb readline-common 8.2-4build1 deb @@ -139,7 +139,7 @@ systemd-hwe-hwdb 255.1.4 deb systemd-standalone-sysusers 255.4-1ubuntu8.5 deb sysvinit-utils 3.08-6ubuntu3 deb tar 1.35+dfsg-3build1 deb -tzdata 2024b-0ubuntu0.24.04 deb +tzdata 2024b-0ubuntu0.24.04.1 deb ubuntu-keyring 2023.11.28.1 deb udev 255.4-1ubuntu8.5 deb unminimize 0.2.1 deb From 3fbfd24ffabefe68c6f3ae6748c484af6bb3a373 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 24 Feb 2025 09:24:44 +0000 Subject: [PATCH 454/514] Bot Updating Package Versions --- package_versions.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 2293fa7..fe9d4ca 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -36,7 +36,7 @@ hostname 3.23+nmu2ubuntu2 deb init-system-helpers 1.66ubuntu1 deb jq 1.7.1-3build1 deb keyboxd 2.4.4-2ubuntu17 deb -krb5-locales 1.20.1-6ubuntu2.3 deb +krb5-locales 1.20.1-6ubuntu2.4 deb libacl1 2.3.2-1build1.1 deb libapt-pkg6.0t64 2.7.14build2 deb libassuan0 2.5.6-1build1 deb @@ -63,15 +63,15 @@ libgcrypt20 1.10.3-2build1 deb libgmp10 2:6.3.0+dfsg-2ubuntu6.1 deb libgnutls30t64 3.8.3-1.1ubuntu3.2 deb libgpg-error0 1.47-3build2.1 deb -libgssapi-krb5-2 1.20.1-6ubuntu2.3 deb +libgssapi-krb5-2 1.20.1-6ubuntu2.4 deb libhogweed6t64 3.9.1-2.2build1.1 deb libidn2-0 2.3.7-2build1.1 deb libjq1 1.7.1-3build1 deb -libk5crypto3 1.20.1-6ubuntu2.3 deb +libk5crypto3 1.20.1-6ubuntu2.4 deb libkeyutils1 1.6.3-3build1 deb libkmod2 31+20240202-2ubuntu7.1 deb -libkrb5-3 1.20.1-6ubuntu2.3 deb -libkrb5support0 1.20.1-6ubuntu2.3 deb +libkrb5-3 1.20.1-6ubuntu2.4 deb +libkrb5support0 1.20.1-6ubuntu2.4 deb libksba8 1.6.6-1build1 deb libldap-common 2.6.7+dfsg-1~exp1ubuntu8.1 deb libldap2 2.6.7+dfsg-1~exp1ubuntu8.1 deb From 989f8573516427a34b28da727c808d15e94e5356 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 3 Mar 2025 09:26:20 +0000 Subject: [PATCH 455/514] Bot Updating Package Versions --- package_versions.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index fe9d4ca..90fef3d 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -50,7 +50,7 @@ libbz2-1.0 1.0.8-5.1build0.1 deb libc-bin 2.39-0ubuntu8.4 deb libc6 2.39-0ubuntu8.4 deb libcap-ng0 0.8.4-2build2 deb -libcap2 1:2.66-5ubuntu2.1 deb +libcap2 1:2.66-5ubuntu2.2 deb libcom-err2 1.47.0-2.4~exp1ubuntu4.1 deb libcrypt1 1:4.4.36-4build1 deb libcurl4t64 8.5.0-2ubuntu10.6 deb @@ -61,7 +61,7 @@ libffi8 3.4.6-1build1 deb libgcc-s1 14.2.0-4ubuntu2~24.04 deb libgcrypt20 1.10.3-2build1 deb libgmp10 2:6.3.0+dfsg-2ubuntu6.1 deb -libgnutls30t64 3.8.3-1.1ubuntu3.2 deb +libgnutls30t64 3.8.3-1.1ubuntu3.3 deb libgpg-error0 1.47-3build2.1 deb libgssapi-krb5-2 1.20.1-6ubuntu2.4 deb libhogweed6t64 3.9.1-2.2build1.1 deb @@ -73,8 +73,8 @@ libkmod2 31+20240202-2ubuntu7.1 deb libkrb5-3 1.20.1-6ubuntu2.4 deb libkrb5support0 1.20.1-6ubuntu2.4 deb libksba8 1.6.6-1build1 deb -libldap-common 2.6.7+dfsg-1~exp1ubuntu8.1 deb -libldap2 2.6.7+dfsg-1~exp1ubuntu8.1 deb +libldap-common 2.6.7+dfsg-1~exp1ubuntu8.2 deb +libldap2 2.6.7+dfsg-1~exp1ubuntu8.2 deb liblz4-1 1.9.4-1build1.1 deb liblzma5 5.6.1+really5.4.5-1build0.1 deb libmd0 1.1.0-2build1.1 deb @@ -106,10 +106,10 @@ libsmartcols1 2.39.3-9ubuntu6.2 deb libsqlite3-0 3.45.1-1ubuntu2.1 deb libss2 1.47.0-2.4~exp1ubuntu4.1 deb libssh-4 0.10.6-2build2 deb -libssl3t64 3.0.13-0ubuntu3.4 deb +libssl3t64 3.0.13-0ubuntu3.5 deb libstdc++6 14.2.0-4ubuntu2~24.04 deb libsystemd0 255.4-1ubuntu8.5 deb -libtasn1-6 4.19.0-3build1 deb +libtasn1-6 4.19.0-3ubuntu0.24.04.1 deb libtinfo6 6.4+20240113-1ubuntu2 deb libudev1 255.4-1ubuntu8.5 deb libunistring5 1.1-2build1.1 deb @@ -124,7 +124,7 @@ mount 2.39.3-9ubuntu6.2 deb ncurses-base 6.4+20240113-1ubuntu2 deb ncurses-bin 6.4+20240113-1ubuntu2 deb netcat-openbsd 1.226-1ubuntu2 deb -openssl 3.0.13-0ubuntu3.4 deb +openssl 3.0.13-0ubuntu3.5 deb passwd 1:4.13+dfsg1-4ubuntu3.2 deb perl-base 5.38.2-3.2build2.1 deb pinentry-curses 1.2.1-3ubuntu5 deb From a2e1bebb34972afad6792efc83ea42b78dc2b658 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 10 Mar 2025 09:21:30 +0000 Subject: [PATCH 456/514] Bot Updating Package Versions --- package_versions.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 90fef3d..8f17ad9 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -36,7 +36,7 @@ hostname 3.23+nmu2ubuntu2 deb init-system-helpers 1.66ubuntu1 deb jq 1.7.1-3build1 deb keyboxd 2.4.4-2ubuntu17 deb -krb5-locales 1.20.1-6ubuntu2.4 deb +krb5-locales 1.20.1-6ubuntu2.5 deb libacl1 2.3.2-1build1.1 deb libapt-pkg6.0t64 2.7.14build2 deb libassuan0 2.5.6-1build1 deb @@ -63,15 +63,15 @@ libgcrypt20 1.10.3-2build1 deb libgmp10 2:6.3.0+dfsg-2ubuntu6.1 deb libgnutls30t64 3.8.3-1.1ubuntu3.3 deb libgpg-error0 1.47-3build2.1 deb -libgssapi-krb5-2 1.20.1-6ubuntu2.4 deb +libgssapi-krb5-2 1.20.1-6ubuntu2.5 deb libhogweed6t64 3.9.1-2.2build1.1 deb libidn2-0 2.3.7-2build1.1 deb libjq1 1.7.1-3build1 deb -libk5crypto3 1.20.1-6ubuntu2.4 deb +libk5crypto3 1.20.1-6ubuntu2.5 deb libkeyutils1 1.6.3-3build1 deb libkmod2 31+20240202-2ubuntu7.1 deb -libkrb5-3 1.20.1-6ubuntu2.4 deb -libkrb5support0 1.20.1-6ubuntu2.4 deb +libkrb5-3 1.20.1-6ubuntu2.5 deb +libkrb5support0 1.20.1-6ubuntu2.5 deb libksba8 1.6.6-1build1 deb libldap-common 2.6.7+dfsg-1~exp1ubuntu8.2 deb libldap2 2.6.7+dfsg-1~exp1ubuntu8.2 deb From d5127aff6d865a68474945396c91806520c51e66 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 11 Mar 2025 16:41:25 +0000 Subject: [PATCH 457/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 8f17ad9..2f37afa 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -128,7 +128,7 @@ openssl 3.0.13-0ubuntu3.5 deb passwd 1:4.13+dfsg1-4ubuntu3.2 deb perl-base 5.38.2-3.2build2.1 deb pinentry-curses 1.2.1-3ubuntu5 deb -plexmediaserver 1.41.4.9463-630c9f557 deb +plexmediaserver 1.41.5.9522-a96edc606 deb procps 2:4.0.4-4ubuntu3.2 deb publicsuffix 20231001.0357-0.1 deb readline-common 8.2-4build1 deb From 60c1ec04cf1b39353429ff587b0dc7b38b57a536 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 24 Mar 2025 09:28:15 +0000 Subject: [PATCH 458/514] Bot Updating Package Versions --- package_versions.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 2f37afa..0ac896e 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -108,10 +108,10 @@ libss2 1.47.0-2.4~exp1ubuntu4.1 deb libssh-4 0.10.6-2build2 deb libssl3t64 3.0.13-0ubuntu3.5 deb libstdc++6 14.2.0-4ubuntu2~24.04 deb -libsystemd0 255.4-1ubuntu8.5 deb +libsystemd0 255.4-1ubuntu8.6 deb libtasn1-6 4.19.0-3ubuntu0.24.04.1 deb libtinfo6 6.4+20240113-1ubuntu2 deb -libudev1 255.4-1ubuntu8.5 deb +libudev1 255.4-1ubuntu8.6 deb libunistring5 1.1-2build1.1 deb libuuid1 2.39.3-9ubuntu6.2 deb libxxhash0 0.8.2-2build1 deb @@ -134,14 +134,14 @@ publicsuffix 20231001.0357-0.1 deb readline-common 8.2-4build1 deb sed 4.9-2build1 deb sensible-utils 0.0.22 deb -systemd-dev 255.4-1ubuntu8.5 deb +systemd-dev 255.4-1ubuntu8.6 deb systemd-hwe-hwdb 255.1.4 deb -systemd-standalone-sysusers 255.4-1ubuntu8.5 deb +systemd-standalone-sysusers 255.4-1ubuntu8.6 deb sysvinit-utils 3.08-6ubuntu3 deb tar 1.35+dfsg-3build1 deb tzdata 2024b-0ubuntu0.24.04.1 deb ubuntu-keyring 2023.11.28.1 deb -udev 255.4-1ubuntu8.5 deb +udev 255.4-1ubuntu8.6 deb unminimize 0.2.1 deb util-linux 2.39.3-9ubuntu6.2 deb wget 1.21.4-1ubuntu4.1 deb From 803ec8f8b66ed008534d8f410ee513f79f313d84 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 7 Apr 2025 09:26:58 +0000 Subject: [PATCH 459/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 0ac896e..6b1d526 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -139,7 +139,7 @@ systemd-hwe-hwdb 255.1.4 deb systemd-standalone-sysusers 255.4-1ubuntu8.6 deb sysvinit-utils 3.08-6ubuntu3 deb tar 1.35+dfsg-3build1 deb -tzdata 2024b-0ubuntu0.24.04.1 deb +tzdata 2025a-0ubuntu0.24.04 deb ubuntu-keyring 2023.11.28.1 deb udev 255.4-1ubuntu8.6 deb unminimize 0.2.1 deb From 3ee08e388d8366c6c49fe2f4a0879771feda05d7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 10 Apr 2025 16:42:11 +0000 Subject: [PATCH 460/514] Bot Updating Package Versions --- package_versions.txt | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 6b1d526..e90a1d0 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -16,26 +16,26 @@ dash 0.5.12-6ubuntu5 deb debconf 1.5.86ubuntu1 deb debianutils 5.17build1 deb diffutils 1:3.10-1build1 deb -dirmngr 2.4.4-2ubuntu17 deb +dirmngr 2.4.4-2ubuntu17.2 deb dpkg 1.22.6ubuntu6.1 deb e2fsprogs 1.47.0-2.4~exp1ubuntu4.1 deb findutils 4.9.0-5build1 deb gcc-14-base 14.2.0-4ubuntu2~24.04 deb -gnupg 2.4.4-2ubuntu17 deb -gnupg-l10n 2.4.4-2ubuntu17 deb -gnupg-utils 2.4.4-2ubuntu17 deb -gpg 2.4.4-2ubuntu17 deb -gpg-agent 2.4.4-2ubuntu17 deb -gpg-wks-client 2.4.4-2ubuntu17 deb -gpgconf 2.4.4-2ubuntu17 deb -gpgsm 2.4.4-2ubuntu17 deb -gpgv 2.4.4-2ubuntu17 deb +gnupg 2.4.4-2ubuntu17.2 deb +gnupg-l10n 2.4.4-2ubuntu17.2 deb +gnupg-utils 2.4.4-2ubuntu17.2 deb +gpg 2.4.4-2ubuntu17.2 deb +gpg-agent 2.4.4-2ubuntu17.2 deb +gpg-wks-client 2.4.4-2ubuntu17.2 deb +gpgconf 2.4.4-2ubuntu17.2 deb +gpgsm 2.4.4-2ubuntu17.2 deb +gpgv 2.4.4-2ubuntu17.2 deb grep 3.11-4build1 deb gzip 1.12-1ubuntu3 deb hostname 3.23+nmu2ubuntu2 deb init-system-helpers 1.66ubuntu1 deb jq 1.7.1-3build1 deb -keyboxd 2.4.4-2ubuntu17 deb +keyboxd 2.4.4-2ubuntu17.2 deb krb5-locales 1.20.1-6ubuntu2.5 deb libacl1 2.3.2-1build1.1 deb libapt-pkg6.0t64 2.7.14build2 deb @@ -76,7 +76,7 @@ libksba8 1.6.6-1build1 deb libldap-common 2.6.7+dfsg-1~exp1ubuntu8.2 deb libldap2 2.6.7+dfsg-1~exp1ubuntu8.2 deb liblz4-1 1.9.4-1build1.1 deb -liblzma5 5.6.1+really5.4.5-1build0.1 deb +liblzma5 5.6.1+really5.4.5-1ubuntu0.2 deb libmd0 1.1.0-2build1.1 deb libmount1 2.39.3-9ubuntu6.2 deb libncursesw6 6.4+20240113-1ubuntu2 deb @@ -128,7 +128,7 @@ openssl 3.0.13-0ubuntu3.5 deb passwd 1:4.13+dfsg1-4ubuntu3.2 deb perl-base 5.38.2-3.2build2.1 deb pinentry-curses 1.2.1-3ubuntu5 deb -plexmediaserver 1.41.5.9522-a96edc606 deb +plexmediaserver 1.41.6.9685-d301f511a deb procps 2:4.0.4-4ubuntu3.2 deb publicsuffix 20231001.0357-0.1 deb readline-common 8.2-4build1 deb @@ -139,7 +139,7 @@ systemd-hwe-hwdb 255.1.4 deb systemd-standalone-sysusers 255.4-1ubuntu8.6 deb sysvinit-utils 3.08-6ubuntu3 deb tar 1.35+dfsg-3build1 deb -tzdata 2025a-0ubuntu0.24.04 deb +tzdata 2025b-0ubuntu0.24.04 deb ubuntu-keyring 2023.11.28.1 deb udev 255.4-1ubuntu8.6 deb unminimize 0.2.1 deb From 12308d98c6ed4bd0a3cc98fb22345832908fdae0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 21 Apr 2025 09:27:54 +0000 Subject: [PATCH 461/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index e90a1d0..9344d69 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -126,7 +126,7 @@ ncurses-bin 6.4+20240113-1ubuntu2 deb netcat-openbsd 1.226-1ubuntu2 deb openssl 3.0.13-0ubuntu3.5 deb passwd 1:4.13+dfsg1-4ubuntu3.2 deb -perl-base 5.38.2-3.2build2.1 deb +perl-base 5.38.2-3.2ubuntu0.1 deb pinentry-curses 1.2.1-3ubuntu5 deb plexmediaserver 1.41.6.9685-d301f511a deb procps 2:4.0.4-4ubuntu3.2 deb From 5d77e8d8baf59beb29f4ea56ca98f255f2d93df6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 28 Apr 2025 10:52:39 +0000 Subject: [PATCH 462/514] Bot Updating Templated Files --- README.md | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 6d8a0e9..0109ee5 100644 --- a/README.md +++ b/README.md @@ -77,24 +77,6 @@ Valid settings for VERSION are:- + **`public`**: will update plexpass users to the latest public version, useful for plexpass users that don't want to be on the bleeding edge but still want the latest public updates. + **`<specific-version>`**: will select a specific version (eg 0.9.12.4.1192-9a47d21) of plex to install, note you cannot use this to access plexpass versions if you do not have plexpass. -## Read-Only Operation - -This image can be run with a read-only container filesystem. For details please [read the docs](https://docs.linuxserver.io/misc/read-only/). - -### Caveats - -* Runtime update of Plex (and thus Plexpass builds) is not supported. -* Transcode directory must be mounted to a host path or tmpfs. - -## Non-Root Operation - -This image can be run with a non-root user. For details please [read the docs](https://docs.linuxserver.io/misc/non-root/). - -### Caveats - -* Runtime update of Plex (and thus Plexpass builds) is not supported. -* Transcode directory must be mounted to a host path or tmpfs. - ### Hardware Acceleration Many desktop applications need access to a GPU to function properly and even some Desktop Environments have compositor effects that will not function without a GPU. However this is not a hard requirement and all base images will function without a video device mounted into the container. @@ -120,6 +102,24 @@ We automatically add the necessary environment variable that will utilise all th Best effort is made to install tools to allow mounting in /dev/dri on Arm devices. In most cases if /dev/dri exists on the host it should just work. If running a Raspberry Pi 4 be sure to enable `dtoverlay=vc4-fkms-v3d` in your usercfg.txt. +## Read-Only Operation + +This image can be run with a read-only container filesystem. For details please [read the docs](https://docs.linuxserver.io/misc/read-only/). + +### Caveats + +* Runtime update of Plex (and thus Plexpass builds) is not supported. +* Transcode directory must be mounted to a host path or tmpfs. + +## Non-Root Operation + +This image can be run with a non-root user. For details please [read the docs](https://docs.linuxserver.io/misc/non-root/). + +### Caveats + +* Runtime update of Plex (and thus Plexpass builds) is not supported. +* Transcode directory must be mounted to a host path or tmpfs. + ## Usage To help you get started creating a container from this image you can either use docker-compose or the docker cli. From 0c7513ed907cc1b96f0f9687fd46351f37cbb039 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 19 May 2025 09:27:26 +0000 Subject: [PATCH 463/514] Bot Updating Templated Files --- readme-vars.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/readme-vars.yml b/readme-vars.yml index fb96495..7e2ea93 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -101,12 +101,14 @@ init_diagram: | init-plex-update -> init-config-end init-config -> init-crontab-config init-mods-end -> init-custom-files + init-adduser -> init-device-perms base -> init-envfile base -> init-migrations init-config-end -> init-mods init-mods-package-install -> init-mods-end init-mods -> init-mods-package-install init-adduser -> init-os-end + init-device-perms -> init-os-end init-envfile -> init-os-end init-config -> init-plex-chown init-plex-chown -> init-plex-claim From 20c539447bbe6a82ce86f9c1326f55d4156f8ddd Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 20 May 2025 15:41:18 +0000 Subject: [PATCH 464/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 9344d69..c88b7c8 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -128,7 +128,7 @@ openssl 3.0.13-0ubuntu3.5 deb passwd 1:4.13+dfsg1-4ubuntu3.2 deb perl-base 5.38.2-3.2ubuntu0.1 deb pinentry-curses 1.2.1-3ubuntu5 deb -plexmediaserver 1.41.6.9685-d301f511a deb +plexmediaserver 1.41.7.9799-5bce000f7 deb procps 2:4.0.4-4ubuntu3.2 deb publicsuffix 20231001.0357-0.1 deb readline-common 8.2-4build1 deb From bf5b90a8e274a84448618d0eec973901f6feb48d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 27 May 2025 19:31:29 +0000 Subject: [PATCH 465/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index c88b7c8..8e04f82 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -128,7 +128,7 @@ openssl 3.0.13-0ubuntu3.5 deb passwd 1:4.13+dfsg1-4ubuntu3.2 deb perl-base 5.38.2-3.2ubuntu0.1 deb pinentry-curses 1.2.1-3ubuntu5 deb -plexmediaserver 1.41.7.9799-5bce000f7 deb +plexmediaserver 1.41.7.9823-59f304c16 deb procps 2:4.0.4-4ubuntu3.2 deb publicsuffix 20231001.0357-0.1 deb readline-common 8.2-4build1 deb From 3833657a3a18fe783a4633baa9a8cd10a0275cda Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 2 Jun 2025 09:28:17 +0000 Subject: [PATCH 466/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 8e04f82..afc92d6 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -103,7 +103,7 @@ libsemanage-common 3.5-1build5 deb libsemanage2 3.5-1build5 deb libsepol2 3.5-2build1 deb libsmartcols1 2.39.3-9ubuntu6.2 deb -libsqlite3-0 3.45.1-1ubuntu2.1 deb +libsqlite3-0 3.45.1-1ubuntu2.3 deb libss2 1.47.0-2.4~exp1ubuntu4.1 deb libssh-4 0.10.6-2build2 deb libssl3t64 3.0.13-0ubuntu3.5 deb From 3044e621bfce11c55a497ff8b7c7e75f52f52ceb Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 9 Jun 2025 09:28:57 +0000 Subject: [PATCH 467/514] Bot Updating Package Versions --- package_versions.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index afc92d6..6afe213 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,7 +1,7 @@ NAME VERSION TYPE adduser 3.137ubuntu1 deb -apt 2.7.14build2 deb -apt-utils 2.7.14build2 deb +apt 2.8.3 deb +apt-utils 2.8.3 deb base-files 13ubuntu10.2 deb base-passwd 3.6.3build1 deb bash 5.2.21-2ubuntu4 deb @@ -36,9 +36,9 @@ hostname 3.23+nmu2ubuntu2 deb init-system-helpers 1.66ubuntu1 deb jq 1.7.1-3build1 deb keyboxd 2.4.4-2ubuntu17.2 deb -krb5-locales 1.20.1-6ubuntu2.5 deb +krb5-locales 1.20.1-6ubuntu2.6 deb libacl1 2.3.2-1build1.1 deb -libapt-pkg6.0t64 2.7.14build2 deb +libapt-pkg6.0t64 2.8.3 deb libassuan0 2.5.6-1build1 deb libattr1 1:2.5.2-1build1.1 deb libaudit-common 1:3.1.2-2.1build1.1 deb @@ -63,15 +63,15 @@ libgcrypt20 1.10.3-2build1 deb libgmp10 2:6.3.0+dfsg-2ubuntu6.1 deb libgnutls30t64 3.8.3-1.1ubuntu3.3 deb libgpg-error0 1.47-3build2.1 deb -libgssapi-krb5-2 1.20.1-6ubuntu2.5 deb +libgssapi-krb5-2 1.20.1-6ubuntu2.6 deb libhogweed6t64 3.9.1-2.2build1.1 deb libidn2-0 2.3.7-2build1.1 deb libjq1 1.7.1-3build1 deb -libk5crypto3 1.20.1-6ubuntu2.5 deb +libk5crypto3 1.20.1-6ubuntu2.6 deb libkeyutils1 1.6.3-3build1 deb libkmod2 31+20240202-2ubuntu7.1 deb -libkrb5-3 1.20.1-6ubuntu2.5 deb -libkrb5support0 1.20.1-6ubuntu2.5 deb +libkrb5-3 1.20.1-6ubuntu2.6 deb +libkrb5support0 1.20.1-6ubuntu2.6 deb libksba8 1.6.6-1build1 deb libldap-common 2.6.7+dfsg-1~exp1ubuntu8.2 deb libldap2 2.6.7+dfsg-1~exp1ubuntu8.2 deb @@ -139,7 +139,7 @@ systemd-hwe-hwdb 255.1.4 deb systemd-standalone-sysusers 255.4-1ubuntu8.6 deb sysvinit-utils 3.08-6ubuntu3 deb tar 1.35+dfsg-3build1 deb -tzdata 2025b-0ubuntu0.24.04 deb +tzdata 2025b-0ubuntu0.24.04.1 deb ubuntu-keyring 2023.11.28.1 deb udev 255.4-1ubuntu8.6 deb unminimize 0.2.1 deb From 0465b8095ea3c2f5190f5a0f13c10b69860484fb Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 10 Jun 2025 17:34:04 +0000 Subject: [PATCH 468/514] Bot Updating Templated Files --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 62105f4..1f446e8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -782,7 +782,7 @@ pipeline { docker run --rm \ -v /var/run/docker.sock:/var/run/docker.sock:ro \ -v ${TEMPDIR}:/tmp \ - ghcr.io/anchore/syft:latest \ + ghcr.io/anchore/syft:v1.26.1 \ ${LOCAL_CONTAINER} -o table=/tmp/package_versions.txt NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 ) echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github" From c27d92587e0512513ad826a4ebde8a2cd1a5dd15 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 10 Jun 2025 17:38:12 +0000 Subject: [PATCH 469/514] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 6afe213..85fa788 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -108,10 +108,10 @@ libss2 1.47.0-2.4~exp1ubuntu4.1 deb libssh-4 0.10.6-2build2 deb libssl3t64 3.0.13-0ubuntu3.5 deb libstdc++6 14.2.0-4ubuntu2~24.04 deb -libsystemd0 255.4-1ubuntu8.6 deb +libsystemd0 255.4-1ubuntu8.8 deb libtasn1-6 4.19.0-3ubuntu0.24.04.1 deb libtinfo6 6.4+20240113-1ubuntu2 deb -libudev1 255.4-1ubuntu8.6 deb +libudev1 255.4-1ubuntu8.8 deb libunistring5 1.1-2build1.1 deb libuuid1 2.39.3-9ubuntu6.2 deb libxxhash0 0.8.2-2build1 deb @@ -128,20 +128,20 @@ openssl 3.0.13-0ubuntu3.5 deb passwd 1:4.13+dfsg1-4ubuntu3.2 deb perl-base 5.38.2-3.2ubuntu0.1 deb pinentry-curses 1.2.1-3ubuntu5 deb -plexmediaserver 1.41.7.9823-59f304c16 deb +plexmediaserver 1.41.8.9834-071366d65 deb procps 2:4.0.4-4ubuntu3.2 deb publicsuffix 20231001.0357-0.1 deb readline-common 8.2-4build1 deb sed 4.9-2build1 deb sensible-utils 0.0.22 deb -systemd-dev 255.4-1ubuntu8.6 deb +systemd-dev 255.4-1ubuntu8.8 deb systemd-hwe-hwdb 255.1.4 deb -systemd-standalone-sysusers 255.4-1ubuntu8.6 deb +systemd-standalone-sysusers 255.4-1ubuntu8.8 deb sysvinit-utils 3.08-6ubuntu3 deb tar 1.35+dfsg-3build1 deb tzdata 2025b-0ubuntu0.24.04.1 deb ubuntu-keyring 2023.11.28.1 deb -udev 255.4-1ubuntu8.6 deb +udev 255.4-1ubuntu8.8 deb unminimize 0.2.1 deb util-linux 2.39.3-9ubuntu6.2 deb wget 1.21.4-1ubuntu4.1 deb From b65ef27e653b9ab473d02806efae400b5e9309c0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 30 Jun 2025 09:30:34 +0000 Subject: [PATCH 470/514] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 85fa788..0b4106c 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -85,10 +85,10 @@ libnghttp2-14 1.59.0-1ubuntu0.2 deb libnpth0t64 1.6-3.1build1 deb libonig5 6.9.9-1build1 deb libp11-kit0 0.25.3-4ubuntu2.1 deb -libpam-modules 1.5.3-5ubuntu5.1 deb -libpam-modules-bin 1.5.3-5ubuntu5.1 deb -libpam-runtime 1.5.3-5ubuntu5.1 deb -libpam0g 1.5.3-5ubuntu5.1 deb +libpam-modules 1.5.3-5ubuntu5.4 deb +libpam-modules-bin 1.5.3-5ubuntu5.4 deb +libpam-runtime 1.5.3-5ubuntu5.4 deb +libpam0g 1.5.3-5ubuntu5.4 deb libpcre2-8-0 10.42-4ubuntu2.1 deb libproc2-0 2:4.0.4-4ubuntu3.2 deb libpsl5t64 0.21.2-1.1build1 deb From 0900661b6ff299cde4349f93bbd0616fd0312748 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 7 Jul 2025 09:28:59 +0000 Subject: [PATCH 471/514] Bot Updating Templated Files --- Jenkinsfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1f446e8..7c4bb8d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -96,7 +96,11 @@ pipeline { env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/' env.PULL_REQUEST = env.CHANGE_ID env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/call_issue_pr_tracker.yml ./.github/workflows/call_issues_cron.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml' + if ( env.SYFT_IMAGE_TAG == null ) { + env.SYFT_IMAGE_TAG = 'latest' + } } + echo "Using syft image tag ${SYFT_IMAGE_TAG}" sh '''#! /bin/bash echo "The default github branch detected as ${GH_DEFAULT_BRANCH}" ''' script{ @@ -782,7 +786,7 @@ pipeline { docker run --rm \ -v /var/run/docker.sock:/var/run/docker.sock:ro \ -v ${TEMPDIR}:/tmp \ - ghcr.io/anchore/syft:v1.26.1 \ + ghcr.io/anchore/syft:${SYFT_IMAGE_TAG} \ ${LOCAL_CONTAINER} -o table=/tmp/package_versions.txt NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 ) echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github" @@ -892,6 +896,7 @@ pipeline { -e WEB_AUTH=\"${CI_AUTH}\" \ -e WEB_PATH=\"${CI_WEBPATH}\" \ -e NODE_NAME=\"${NODE_NAME}\" \ + -e SYFT_IMAGE_TAG=\"${CI_SYFT_IMAGE_TAG:-${SYFT_IMAGE_TAG}}\" \ -t ghcr.io/linuxserver/ci:latest \ python3 test_build.py''' } From 6987e66f3c4218a717e9c09b4c40bac1e656673f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 7 Jul 2025 09:30:48 +0000 Subject: [PATCH 472/514] Bot Updating Templated Files --- .github/workflows/call_issue_pr_tracker.yml | 3 +++ .github/workflows/call_issues_cron.yml | 3 +++ .github/workflows/external_trigger.yml | 15 +++++++++------ .github/workflows/external_trigger_scheduler.yml | 3 +++ .github/workflows/greetings.yml | 6 ++++++ .github/workflows/package_trigger_scheduler.yml | 3 +++ README.md | 3 --- 7 files changed, 27 insertions(+), 9 deletions(-) diff --git a/.github/workflows/call_issue_pr_tracker.yml b/.github/workflows/call_issue_pr_tracker.yml index 2c30784..d07cf12 100755 --- a/.github/workflows/call_issue_pr_tracker.yml +++ b/.github/workflows/call_issue_pr_tracker.yml @@ -8,6 +8,9 @@ on: pull_request_review: types: [submitted,edited,dismissed] +permissions: + contents: read + jobs: manage-project: permissions: diff --git a/.github/workflows/call_issues_cron.yml b/.github/workflows/call_issues_cron.yml index e38dfc0..7763722 100755 --- a/.github/workflows/call_issues_cron.yml +++ b/.github/workflows/call_issues_cron.yml @@ -4,6 +4,9 @@ on: - cron: '33 12 * * *' workflow_dispatch: +permissions: + contents: read + jobs: stale: permissions: diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index f502b3a..5cadde5 100644 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -3,6 +3,9 @@ name: External Trigger Main on: workflow_dispatch: +permissions: + contents: read + jobs: external-trigger-master: runs-on: ubuntu-latest @@ -43,8 +46,8 @@ jobs: "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} exit 1 fi - EXT_RELEASE=$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g') - echo "External version: \`${EXT_RELEASE}\`" >> $GITHUB_STEP_SUMMARY + EXT_RELEASE_SANITIZED=$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g') + echo "Sanitized external version: \`${EXT_RELEASE_SANITIZED}\`" >> $GITHUB_STEP_SUMMARY echo "Retrieving last pushed version" >> $GITHUB_STEP_SUMMARY image="linuxserver/plex" tag="latest" @@ -100,8 +103,8 @@ jobs: exit 1 fi echo "Last pushed version: \`${IMAGE_VERSION}\`" >> $GITHUB_STEP_SUMMARY - if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then - echo "Version \`${EXT_RELEASE}\` already pushed, exiting" >> $GITHUB_STEP_SUMMARY + if [ "${EXT_RELEASE_SANITIZED}" == "${IMAGE_VERSION}" ]; then + echo "Sanitized version \`${EXT_RELEASE_SANITIZED}\` already pushed, exiting" >> $GITHUB_STEP_SUMMARY exit 0 elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-plex/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then echo "New version \`${EXT_RELEASE}\` found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY @@ -116,7 +119,7 @@ jobs: "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} else printf "\n## Trigger new build\n\n" >> $GITHUB_STEP_SUMMARY - echo "New version \`${EXT_RELEASE}\` found; old version was \`${IMAGE_VERSION}\`. Triggering new build" >> $GITHUB_STEP_SUMMARY + echo "New sanitized version \`${EXT_RELEASE_SANITIZED}\` found; old version was \`${IMAGE_VERSION}\`. Triggering new build" >> $GITHUB_STEP_SUMMARY if [[ "${artifacts_found}" == "true" ]]; then echo "All artifacts seem to be uploaded." >> $GITHUB_STEP_SUMMARY fi @@ -136,7 +139,7 @@ jobs: --data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \ --data-urlencode "Submit=Submit" echo "**** Notifying Discord ****" - TRIGGER_REASON="A version change was detected for plex tag latest. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}" + TRIGGER_REASON="A version change was detected for plex tag latest. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE_SANITIZED}" curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903, "description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}], "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} diff --git a/.github/workflows/external_trigger_scheduler.yml b/.github/workflows/external_trigger_scheduler.yml index d1c45f1..b3649f8 100644 --- a/.github/workflows/external_trigger_scheduler.yml +++ b/.github/workflows/external_trigger_scheduler.yml @@ -5,6 +5,9 @@ on: - cron: '14 * * * *' workflow_dispatch: +permissions: + contents: read + jobs: external-trigger-scheduler: runs-on: ubuntu-latest diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml index 7a82d14..9f32b52 100755 --- a/.github/workflows/greetings.yml +++ b/.github/workflows/greetings.yml @@ -2,8 +2,14 @@ name: Greetings on: [pull_request_target, issues] +permissions: + contents: read + jobs: greeting: + permissions: + issues: write + pull-requests: write runs-on: ubuntu-latest steps: - uses: actions/first-interaction@v1 diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml index abaf63d..be3abba 100644 --- a/.github/workflows/package_trigger_scheduler.yml +++ b/.github/workflows/package_trigger_scheduler.yml @@ -5,6 +5,9 @@ on: - cron: '0 9 * * 1' workflow_dispatch: +permissions: + contents: read + jobs: package-trigger-scheduler: runs-on: ubuntu-latest diff --git a/README.md b/README.md index 0109ee5..5831463 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,6 @@ [![Blog](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!") [![Discord](https://img.shields.io/discord/354974912613449730.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=Discord&logo=discord)](https://linuxserver.io/discord "realtime support / chat with the community and the team.") [![Discourse](https://img.shields.io/discourse/https/discourse.linuxserver.io/topics.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=discourse)](https://discourse.linuxserver.io "post on our community forum.") -[![Fleet](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Fleet)](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.") [![GitHub](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub&logo=github)](https://github.com/linuxserver "view the source for all of our repositories.") [![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=Supporters&logo=open%20collective)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget") @@ -22,7 +21,6 @@ Find us at: * [Blog](https://blog.linuxserver.io) - all the things you can do with our containers including How-To guides, opinions and much more! * [Discord](https://linuxserver.io/discord) - realtime support / chat with the community and the team. * [Discourse](https://discourse.linuxserver.io) - post on our community forum. -* [Fleet](https://fleet.linuxserver.io) - an online web interface which displays all of our maintained images. * [GitHub](https://github.com/linuxserver) - view the source for all of our repositories. * [Open Collective](https://opencollective.com/linuxserver) - please consider helping us by either donating or contributing to our budget @@ -55,7 +53,6 @@ The architectures supported by this image are: | :----: | :----: | ---- | | x86-64 | ✅ | amd64-\<version tag\> | | arm64 | ✅ | arm64v8-\<version tag\> | -| armhf | ❌ | | ## Application Setup From 635f9ddf031191e8146c1af5ec239217c88001cb Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 14 Jul 2025 09:34:45 +0000 Subject: [PATCH 473/514] Bot Updating Package Versions --- package_versions.txt | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 0b4106c..1f54cc7 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -5,7 +5,7 @@ apt-utils 2.8.3 deb base-files 13ubuntu10.2 deb base-passwd 3.6.3build1 deb bash 5.2.21-2ubuntu4 deb -bsdutils 1:2.39.3-9ubuntu6.2 deb +bsdutils 1:2.39.3-9ubuntu6.3 deb ca-certificates 20240203 deb catatonit 0.1.7-1 deb coreutils 9.4-3ubuntu6 deb @@ -16,26 +16,26 @@ dash 0.5.12-6ubuntu5 deb debconf 1.5.86ubuntu1 deb debianutils 5.17build1 deb diffutils 1:3.10-1build1 deb -dirmngr 2.4.4-2ubuntu17.2 deb +dirmngr 2.4.4-2ubuntu17.3 deb dpkg 1.22.6ubuntu6.1 deb e2fsprogs 1.47.0-2.4~exp1ubuntu4.1 deb findutils 4.9.0-5build1 deb gcc-14-base 14.2.0-4ubuntu2~24.04 deb -gnupg 2.4.4-2ubuntu17.2 deb -gnupg-l10n 2.4.4-2ubuntu17.2 deb -gnupg-utils 2.4.4-2ubuntu17.2 deb -gpg 2.4.4-2ubuntu17.2 deb -gpg-agent 2.4.4-2ubuntu17.2 deb -gpg-wks-client 2.4.4-2ubuntu17.2 deb -gpgconf 2.4.4-2ubuntu17.2 deb -gpgsm 2.4.4-2ubuntu17.2 deb -gpgv 2.4.4-2ubuntu17.2 deb +gnupg 2.4.4-2ubuntu17.3 deb +gnupg-l10n 2.4.4-2ubuntu17.3 deb +gnupg-utils 2.4.4-2ubuntu17.3 deb +gpg 2.4.4-2ubuntu17.3 deb +gpg-agent 2.4.4-2ubuntu17.3 deb +gpg-wks-client 2.4.4-2ubuntu17.3 deb +gpgconf 2.4.4-2ubuntu17.3 deb +gpgsm 2.4.4-2ubuntu17.3 deb +gpgv 2.4.4-2ubuntu17.3 deb grep 3.11-4build1 deb -gzip 1.12-1ubuntu3 deb +gzip 1.12-1ubuntu3.1 deb hostname 3.23+nmu2ubuntu2 deb init-system-helpers 1.66ubuntu1 deb jq 1.7.1-3build1 deb -keyboxd 2.4.4-2ubuntu17.2 deb +keyboxd 2.4.4-2ubuntu17.3 deb krb5-locales 1.20.1-6ubuntu2.6 deb libacl1 2.3.2-1build1.1 deb libapt-pkg6.0t64 2.8.3 deb @@ -43,7 +43,7 @@ libassuan0 2.5.6-1build1 deb libattr1 1:2.5.2-1build1.1 deb libaudit-common 1:3.1.2-2.1build1.1 deb libaudit1 1:3.1.2-2.1build1.1 deb -libblkid1 2.39.3-9ubuntu6.2 deb +libblkid1 2.39.3-9ubuntu6.3 deb libbrotli1 1.1.0-2build2 deb libbsd0 0.12.1-1build1.1 deb libbz2-1.0 1.0.8-5.1build0.1 deb @@ -78,7 +78,7 @@ libldap2 2.6.7+dfsg-1~exp1ubuntu8.2 deb liblz4-1 1.9.4-1build1.1 deb liblzma5 5.6.1+really5.4.5-1ubuntu0.2 deb libmd0 1.1.0-2build1.1 deb -libmount1 2.39.3-9ubuntu6.2 deb +libmount1 2.39.3-9ubuntu6.3 deb libncursesw6 6.4+20240113-1ubuntu2 deb libnettle8t64 3.9.1-2.2build1.1 deb libnghttp2-14 1.59.0-1ubuntu0.2 deb @@ -102,10 +102,10 @@ libselinux1 3.5-2ubuntu2.1 deb libsemanage-common 3.5-1build5 deb libsemanage2 3.5-1build5 deb libsepol2 3.5-2build1 deb -libsmartcols1 2.39.3-9ubuntu6.2 deb +libsmartcols1 2.39.3-9ubuntu6.3 deb libsqlite3-0 3.45.1-1ubuntu2.3 deb libss2 1.47.0-2.4~exp1ubuntu4.1 deb -libssh-4 0.10.6-2build2 deb +libssh-4 0.10.6-2ubuntu0.1 deb libssl3t64 3.0.13-0ubuntu3.5 deb libstdc++6 14.2.0-4ubuntu2~24.04 deb libsystemd0 255.4-1ubuntu8.8 deb @@ -113,14 +113,14 @@ libtasn1-6 4.19.0-3ubuntu0.24.04.1 deb libtinfo6 6.4+20240113-1ubuntu2 deb libudev1 255.4-1ubuntu8.8 deb libunistring5 1.1-2build1.1 deb -libuuid1 2.39.3-9ubuntu6.2 deb +libuuid1 2.39.3-9ubuntu6.3 deb libxxhash0 0.8.2-2build1 deb libzstd1 1.5.5+dfsg2-2build1.1 deb locales 2.39-0ubuntu8.4 deb login 1:4.13+dfsg1-4ubuntu3.2 deb logsave 1.47.0-2.4~exp1ubuntu4.1 deb mawk 1.3.4.20240123-1build1 deb -mount 2.39.3-9ubuntu6.2 deb +mount 2.39.3-9ubuntu6.3 deb ncurses-base 6.4+20240113-1ubuntu2 deb ncurses-bin 6.4+20240113-1ubuntu2 deb netcat-openbsd 1.226-1ubuntu2 deb @@ -143,6 +143,6 @@ tzdata 2025b-0ubuntu0.24.04.1 deb ubuntu-keyring 2023.11.28.1 deb udev 255.4-1ubuntu8.8 deb unminimize 0.2.1 deb -util-linux 2.39.3-9ubuntu6.2 deb +util-linux 2.39.3-9ubuntu6.3 deb wget 1.21.4-1ubuntu4.1 deb zlib1g 1:1.3.dfsg-3.1ubuntu2.1 deb From 3975f3f4baffe477266d3f96a2cc74912e5649c0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 15 Jul 2025 15:37:49 +0000 Subject: [PATCH 474/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 1f54cc7..1d3e312 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -128,7 +128,7 @@ openssl 3.0.13-0ubuntu3.5 deb passwd 1:4.13+dfsg1-4ubuntu3.2 deb perl-base 5.38.2-3.2ubuntu0.1 deb pinentry-curses 1.2.1-3ubuntu5 deb -plexmediaserver 1.41.8.9834-071366d65 deb +plexmediaserver 1.41.9.9961-46083195d deb procps 2:4.0.4-4ubuntu3.2 deb publicsuffix 20231001.0357-0.1 deb readline-common 8.2-4build1 deb From 54bac1c3cf15128ecf7832fda93eb5378ac804a1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 21 Jul 2025 09:35:33 +0000 Subject: [PATCH 475/514] Bot Updating Package Versions --- package_versions.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 1d3e312..62c5a45 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -47,8 +47,8 @@ libblkid1 2.39.3-9ubuntu6.3 deb libbrotli1 1.1.0-2build2 deb libbsd0 0.12.1-1build1.1 deb libbz2-1.0 1.0.8-5.1build0.1 deb -libc-bin 2.39-0ubuntu8.4 deb -libc6 2.39-0ubuntu8.4 deb +libc-bin 2.39-0ubuntu8.5 deb +libc6 2.39-0ubuntu8.5 deb libcap-ng0 0.8.4-2build2 deb libcap2 1:2.66-5ubuntu2.2 deb libcom-err2 1.47.0-2.4~exp1ubuntu4.1 deb @@ -61,7 +61,7 @@ libffi8 3.4.6-1build1 deb libgcc-s1 14.2.0-4ubuntu2~24.04 deb libgcrypt20 1.10.3-2build1 deb libgmp10 2:6.3.0+dfsg-2ubuntu6.1 deb -libgnutls30t64 3.8.3-1.1ubuntu3.3 deb +libgnutls30t64 3.8.3-1.1ubuntu3.4 deb libgpg-error0 1.47-3build2.1 deb libgssapi-krb5-2 1.20.1-6ubuntu2.6 deb libhogweed6t64 3.9.1-2.2build1.1 deb @@ -108,15 +108,15 @@ libss2 1.47.0-2.4~exp1ubuntu4.1 deb libssh-4 0.10.6-2ubuntu0.1 deb libssl3t64 3.0.13-0ubuntu3.5 deb libstdc++6 14.2.0-4ubuntu2~24.04 deb -libsystemd0 255.4-1ubuntu8.8 deb +libsystemd0 255.4-1ubuntu8.10 deb libtasn1-6 4.19.0-3ubuntu0.24.04.1 deb libtinfo6 6.4+20240113-1ubuntu2 deb -libudev1 255.4-1ubuntu8.8 deb +libudev1 255.4-1ubuntu8.10 deb libunistring5 1.1-2build1.1 deb libuuid1 2.39.3-9ubuntu6.3 deb libxxhash0 0.8.2-2build1 deb libzstd1 1.5.5+dfsg2-2build1.1 deb -locales 2.39-0ubuntu8.4 deb +locales 2.39-0ubuntu8.5 deb login 1:4.13+dfsg1-4ubuntu3.2 deb logsave 1.47.0-2.4~exp1ubuntu4.1 deb mawk 1.3.4.20240123-1build1 deb @@ -134,14 +134,14 @@ publicsuffix 20231001.0357-0.1 deb readline-common 8.2-4build1 deb sed 4.9-2build1 deb sensible-utils 0.0.22 deb -systemd-dev 255.4-1ubuntu8.8 deb +systemd-dev 255.4-1ubuntu8.10 deb systemd-hwe-hwdb 255.1.4 deb -systemd-standalone-sysusers 255.4-1ubuntu8.8 deb +systemd-standalone-sysusers 255.4-1ubuntu8.10 deb sysvinit-utils 3.08-6ubuntu3 deb tar 1.35+dfsg-3build1 deb tzdata 2025b-0ubuntu0.24.04.1 deb ubuntu-keyring 2023.11.28.1 deb -udev 255.4-1ubuntu8.8 deb +udev 255.4-1ubuntu8.10 deb unminimize 0.2.1 deb util-linux 2.39.3-9ubuntu6.3 deb wget 1.21.4-1ubuntu4.1 deb From f0f381c0db2ce456f909e9223916769728485f2b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 28 Jul 2025 09:35:03 +0000 Subject: [PATCH 476/514] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 62c5a45..f8c336e 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -34,7 +34,7 @@ grep 3.11-4build1 deb gzip 1.12-1ubuntu3.1 deb hostname 3.23+nmu2ubuntu2 deb init-system-helpers 1.66ubuntu1 deb -jq 1.7.1-3build1 deb +jq 1.7.1-3ubuntu0.24.04.1 deb keyboxd 2.4.4-2ubuntu17.3 deb krb5-locales 1.20.1-6ubuntu2.6 deb libacl1 2.3.2-1build1.1 deb @@ -66,7 +66,7 @@ libgpg-error0 1.47-3build2.1 deb libgssapi-krb5-2 1.20.1-6ubuntu2.6 deb libhogweed6t64 3.9.1-2.2build1.1 deb libidn2-0 2.3.7-2build1.1 deb -libjq1 1.7.1-3build1 deb +libjq1 1.7.1-3ubuntu0.24.04.1 deb libk5crypto3 1.20.1-6ubuntu2.6 deb libkeyutils1 1.6.3-3build1 deb libkmod2 31+20240202-2ubuntu7.1 deb From b5d4cc7e71fb95a91480e9394a0e0b84ca609c21 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 4 Aug 2025 09:38:53 +0000 Subject: [PATCH 477/514] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index f8c336e..88b41c7 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -103,7 +103,7 @@ libsemanage-common 3.5-1build5 deb libsemanage2 3.5-1build5 deb libsepol2 3.5-2build1 deb libsmartcols1 2.39.3-9ubuntu6.3 deb -libsqlite3-0 3.45.1-1ubuntu2.3 deb +libsqlite3-0 3.45.1-1ubuntu2.4 deb libss2 1.47.0-2.4~exp1ubuntu4.1 deb libssh-4 0.10.6-2ubuntu0.1 deb libssl3t64 3.0.13-0ubuntu3.5 deb @@ -126,7 +126,7 @@ ncurses-bin 6.4+20240113-1ubuntu2 deb netcat-openbsd 1.226-1ubuntu2 deb openssl 3.0.13-0ubuntu3.5 deb passwd 1:4.13+dfsg1-4ubuntu3.2 deb -perl-base 5.38.2-3.2ubuntu0.1 deb +perl-base 5.38.2-3.2ubuntu0.2 deb pinentry-curses 1.2.1-3ubuntu5 deb plexmediaserver 1.41.9.9961-46083195d deb procps 2:4.0.4-4ubuntu3.2 deb From 5d98680464fb1f2db9e58f6b98f96d4fcb2dbef4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 8 Aug 2025 22:38:07 +0000 Subject: [PATCH 478/514] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 88b41c7..5ae3384 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -2,7 +2,7 @@ NAME VERSION TYPE adduser 3.137ubuntu1 deb apt 2.8.3 deb apt-utils 2.8.3 deb -base-files 13ubuntu10.2 deb +base-files 13ubuntu10.3 deb base-passwd 3.6.3build1 deb bash 5.2.21-2ubuntu4 deb bsdutils 1:2.39.3-9ubuntu6.3 deb @@ -128,7 +128,7 @@ openssl 3.0.13-0ubuntu3.5 deb passwd 1:4.13+dfsg1-4ubuntu3.2 deb perl-base 5.38.2-3.2ubuntu0.2 deb pinentry-curses 1.2.1-3ubuntu5 deb -plexmediaserver 1.41.9.9961-46083195d deb +plexmediaserver 1.42.1.10054-f333bdaa8 deb procps 2:4.0.4-4ubuntu3.2 deb publicsuffix 20231001.0357-0.1 deb readline-common 8.2-4build1 deb From 86f90113e589a64df76603fd4649058314fca409 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 11 Aug 2025 17:38:38 +0000 Subject: [PATCH 479/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 5ae3384..8f436db 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -128,7 +128,7 @@ openssl 3.0.13-0ubuntu3.5 deb passwd 1:4.13+dfsg1-4ubuntu3.2 deb perl-base 5.38.2-3.2ubuntu0.2 deb pinentry-curses 1.2.1-3ubuntu5 deb -plexmediaserver 1.42.1.10054-f333bdaa8 deb +plexmediaserver 1.42.1.10060-4e8b05daf deb procps 2:4.0.4-4ubuntu3.2 deb publicsuffix 20231001.0357-0.1 deb readline-common 8.2-4build1 deb From 65664b148aaac80f3ad19e86fe473e04646ae8bc Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 15 Sep 2025 09:28:27 +0000 Subject: [PATCH 480/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 8f436db..aeea39c 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -8,7 +8,7 @@ bash 5.2.21-2ubuntu4 deb bsdutils 1:2.39.3-9ubuntu6.3 deb ca-certificates 20240203 deb catatonit 0.1.7-1 deb -coreutils 9.4-3ubuntu6 deb +coreutils 9.4-3ubuntu6.1 deb cron 3.0pl1-184ubuntu2 deb cron-daemon-common 3.0pl1-184ubuntu2 deb curl 8.5.0-2ubuntu10.6 deb From 62d7a9ecfee55a04c598a6285f2a0e030d5ea674 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 22 Sep 2025 18:45:02 +0000 Subject: [PATCH 481/514] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index aeea39c..f2eb639 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -103,7 +103,7 @@ libsemanage-common 3.5-1build5 deb libsemanage2 3.5-1build5 deb libsepol2 3.5-2build1 deb libsmartcols1 2.39.3-9ubuntu6.3 deb -libsqlite3-0 3.45.1-1ubuntu2.4 deb +libsqlite3-0 3.45.1-1ubuntu2.5 deb libss2 1.47.0-2.4~exp1ubuntu4.1 deb libssh-4 0.10.6-2ubuntu0.1 deb libssl3t64 3.0.13-0ubuntu3.5 deb @@ -128,14 +128,14 @@ openssl 3.0.13-0ubuntu3.5 deb passwd 1:4.13+dfsg1-4ubuntu3.2 deb perl-base 5.38.2-3.2ubuntu0.2 deb pinentry-curses 1.2.1-3ubuntu5 deb -plexmediaserver 1.42.1.10060-4e8b05daf deb +plexmediaserver 1.42.2.10156-f737b826c deb procps 2:4.0.4-4ubuntu3.2 deb publicsuffix 20231001.0357-0.1 deb readline-common 8.2-4build1 deb sed 4.9-2build1 deb sensible-utils 0.0.22 deb systemd-dev 255.4-1ubuntu8.10 deb -systemd-hwe-hwdb 255.1.4 deb +systemd-hwe-hwdb 255.1.5 deb systemd-standalone-sysusers 255.4-1ubuntu8.10 deb sysvinit-utils 3.08-6ubuntu3 deb tar 1.35+dfsg-3build1 deb From b36fa22efe82bac4a0a51582d0b7359073379867 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 29 Sep 2025 09:29:13 +0000 Subject: [PATCH 482/514] Bot Updating Package Versions --- package_versions.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index f2eb639..cace5e0 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -17,7 +17,7 @@ debconf 1.5.86ubuntu1 deb debianutils 5.17build1 deb diffutils 1:3.10-1build1 deb dirmngr 2.4.4-2ubuntu17.3 deb -dpkg 1.22.6ubuntu6.1 deb +dpkg 1.22.6ubuntu6.2 deb e2fsprogs 1.47.0-2.4~exp1ubuntu4.1 deb findutils 4.9.0-5build1 deb gcc-14-base 14.2.0-4ubuntu2~24.04 deb @@ -47,8 +47,8 @@ libblkid1 2.39.3-9ubuntu6.3 deb libbrotli1 1.1.0-2build2 deb libbsd0 0.12.1-1build1.1 deb libbz2-1.0 1.0.8-5.1build0.1 deb -libc-bin 2.39-0ubuntu8.5 deb -libc6 2.39-0ubuntu8.5 deb +libc-bin 2.39-0ubuntu8.6 deb +libc6 2.39-0ubuntu8.6 deb libcap-ng0 0.8.4-2build2 deb libcap2 1:2.66-5ubuntu2.2 deb libcom-err2 1.47.0-2.4~exp1ubuntu4.1 deb @@ -85,10 +85,10 @@ libnghttp2-14 1.59.0-1ubuntu0.2 deb libnpth0t64 1.6-3.1build1 deb libonig5 6.9.9-1build1 deb libp11-kit0 0.25.3-4ubuntu2.1 deb -libpam-modules 1.5.3-5ubuntu5.4 deb -libpam-modules-bin 1.5.3-5ubuntu5.4 deb -libpam-runtime 1.5.3-5ubuntu5.4 deb -libpam0g 1.5.3-5ubuntu5.4 deb +libpam-modules 1.5.3-5ubuntu5.5 deb +libpam-modules-bin 1.5.3-5ubuntu5.5 deb +libpam-runtime 1.5.3-5ubuntu5.5 deb +libpam0g 1.5.3-5ubuntu5.5 deb libpcre2-8-0 10.42-4ubuntu2.1 deb libproc2-0 2:4.0.4-4ubuntu3.2 deb libpsl5t64 0.21.2-1.1build1 deb @@ -116,7 +116,7 @@ libunistring5 1.1-2build1.1 deb libuuid1 2.39.3-9ubuntu6.3 deb libxxhash0 0.8.2-2build1 deb libzstd1 1.5.5+dfsg2-2build1.1 deb -locales 2.39-0ubuntu8.5 deb +locales 2.39-0ubuntu8.6 deb login 1:4.13+dfsg1-4ubuntu3.2 deb logsave 1.47.0-2.4~exp1ubuntu4.1 deb mawk 1.3.4.20240123-1build1 deb From c2b3335d4fb5aba0d4850018dc704f8d2c999683 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 6 Oct 2025 09:29:43 +0000 Subject: [PATCH 483/514] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index cace5e0..889bb37 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -17,7 +17,7 @@ debconf 1.5.86ubuntu1 deb debianutils 5.17build1 deb diffutils 1:3.10-1build1 deb dirmngr 2.4.4-2ubuntu17.3 deb -dpkg 1.22.6ubuntu6.2 deb +dpkg 1.22.6ubuntu6.5 deb e2fsprogs 1.47.0-2.4~exp1ubuntu4.1 deb findutils 4.9.0-5build1 deb gcc-14-base 14.2.0-4ubuntu2~24.04 deb @@ -106,7 +106,7 @@ libsmartcols1 2.39.3-9ubuntu6.3 deb libsqlite3-0 3.45.1-1ubuntu2.5 deb libss2 1.47.0-2.4~exp1ubuntu4.1 deb libssh-4 0.10.6-2ubuntu0.1 deb -libssl3t64 3.0.13-0ubuntu3.5 deb +libssl3t64 3.0.13-0ubuntu3.6 deb libstdc++6 14.2.0-4ubuntu2~24.04 deb libsystemd0 255.4-1ubuntu8.10 deb libtasn1-6 4.19.0-3ubuntu0.24.04.1 deb @@ -124,7 +124,7 @@ mount 2.39.3-9ubuntu6.3 deb ncurses-base 6.4+20240113-1ubuntu2 deb ncurses-bin 6.4+20240113-1ubuntu2 deb netcat-openbsd 1.226-1ubuntu2 deb -openssl 3.0.13-0ubuntu3.5 deb +openssl 3.0.13-0ubuntu3.6 deb passwd 1:4.13+dfsg1-4ubuntu3.2 deb perl-base 5.38.2-3.2ubuntu0.2 deb pinentry-curses 1.2.1-3ubuntu5 deb From dbc5f5c85bc4a1026e014ae0181903bc7306f7df Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 13 Oct 2025 09:29:56 +0000 Subject: [PATCH 484/514] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 889bb37..e47249f 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -108,10 +108,10 @@ libss2 1.47.0-2.4~exp1ubuntu4.1 deb libssh-4 0.10.6-2ubuntu0.1 deb libssl3t64 3.0.13-0ubuntu3.6 deb libstdc++6 14.2.0-4ubuntu2~24.04 deb -libsystemd0 255.4-1ubuntu8.10 deb +libsystemd0 255.4-1ubuntu8.11 deb libtasn1-6 4.19.0-3ubuntu0.24.04.1 deb libtinfo6 6.4+20240113-1ubuntu2 deb -libudev1 255.4-1ubuntu8.10 deb +libudev1 255.4-1ubuntu8.11 deb libunistring5 1.1-2build1.1 deb libuuid1 2.39.3-9ubuntu6.3 deb libxxhash0 0.8.2-2build1 deb @@ -134,14 +134,14 @@ publicsuffix 20231001.0357-0.1 deb readline-common 8.2-4build1 deb sed 4.9-2build1 deb sensible-utils 0.0.22 deb -systemd-dev 255.4-1ubuntu8.10 deb -systemd-hwe-hwdb 255.1.5 deb -systemd-standalone-sysusers 255.4-1ubuntu8.10 deb +systemd-dev 255.4-1ubuntu8.11 deb +systemd-hwe-hwdb 255.1.6 deb +systemd-standalone-sysusers 255.4-1ubuntu8.11 deb sysvinit-utils 3.08-6ubuntu3 deb tar 1.35+dfsg-3build1 deb tzdata 2025b-0ubuntu0.24.04.1 deb ubuntu-keyring 2023.11.28.1 deb -udev 255.4-1ubuntu8.10 deb +udev 255.4-1ubuntu8.11 deb unminimize 0.2.1 deb util-linux 2.39.3-9ubuntu6.3 deb wget 1.21.4-1ubuntu4.1 deb From 2e4d6ad90366abb673d6e488fa588ceeafdb91a6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 27 Oct 2025 09:29:22 +0000 Subject: [PATCH 485/514] Bot Updating Templated Files --- Jenkinsfile | 108 +++++++++++++++++++++++++++++++++++----------------- 1 file changed, 73 insertions(+), 35 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7c4bb8d..50ed76a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -210,6 +210,7 @@ pipeline { env.META_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN env.BUILDCACHE = 'docker.io/lsiodev/buildcache,registry.gitlab.com/linuxserver.io/docker-jenkins-builder/lsiodev-buildcache,ghcr.io/linuxserver/lsiodev-buildcache,quay.io/linuxserver.io/lsiodev-buildcache' + env.CITEST_IMAGETAG = 'latest' } } } @@ -235,6 +236,7 @@ pipeline { env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/' env.BUILDCACHE = 'docker.io/lsiodev/buildcache,registry.gitlab.com/linuxserver.io/docker-jenkins-builder/lsiodev-buildcache,ghcr.io/linuxserver/lsiodev-buildcache,quay.io/linuxserver.io/lsiodev-buildcache' + env.CITEST_IMAGETAG = 'develop' } } } @@ -260,6 +262,7 @@ pipeline { env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/' env.BUILDCACHE = 'docker.io/lsiodev/buildcache,registry.gitlab.com/linuxserver.io/docker-jenkins-builder/lsiodev-buildcache,ghcr.io/linuxserver/lsiodev-buildcache,quay.io/linuxserver.io/lsiodev-buildcache' + env.CITEST_IMAGETAG = 'develop' } } } @@ -282,7 +285,7 @@ pipeline { -v ${WORKSPACE}:/mnt \ -e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \ -e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \ - ghcr.io/linuxserver/baseimage-alpine:3.20 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\ + ghcr.io/linuxserver/baseimage-alpine:3 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\ apk add --no-cache python3 && \ python3 -m venv /lsiopy && \ pip install --no-cache-dir -U pip && \ @@ -617,13 +620,16 @@ pipeline { echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin + if [[ "${PACKAGE_CHECK}" != "true" ]]; then + declare -A pids IFS=',' read -ra CACHE <<< "$BUILDCACHE" for i in "${CACHE[@]}"; do docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} & + pids[$!]="$i" done - for p in $(jobs -p); do - wait "$p" || { echo "job $p failed" >&2; exit 1; } + for p in "${!pids[@]}"; do + wait "$p" || { [[ "${pids[$p]}" != *"quay.io"* ]] && exit 1; } done fi ''' @@ -683,13 +689,16 @@ pipeline { echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin + if [[ "${PACKAGE_CHECK}" != "true" ]]; then + declare -A pids IFS=',' read -ra CACHE <<< "$BUILDCACHE" for i in "${CACHE[@]}"; do docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} & + pids[$!]="$i" done - for p in $(jobs -p); do - wait "$p" || { echo "job $p failed" >&2; exit 1; } + for p in "${!pids[@]}"; do + wait "$p" || { [[ "${pids[$p]}" != *"quay.io"* ]] && exit 1; } done fi ''' @@ -743,12 +752,14 @@ pipeline { echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin if [[ "${PACKAGE_CHECK}" != "true" ]]; then + declare -A pids IFS=',' read -ra CACHE <<< "$BUILDCACHE" for i in "${CACHE[@]}"; do docker push ${i}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} & + pids[$!]="$i" done - for p in $(jobs -p); do - wait "$p" || { echo "job $p failed" >&2; exit 1; } + for p in "${!pids[@]}"; do + wait "$p" || { [[ "${pids[$p]}" != *"quay.io"* ]] && exit 1; } done fi ''' @@ -873,7 +884,7 @@ pipeline { CI_DOCKERENV="LSIO_FIRST_PARTY=true" fi fi - docker pull ghcr.io/linuxserver/ci:latest + docker pull ghcr.io/linuxserver/ci:${CITEST_IMAGETAG} if [ "${MULTIARCH}" == "true" ]; then docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64 docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} @@ -897,7 +908,7 @@ pipeline { -e WEB_PATH=\"${CI_WEBPATH}\" \ -e NODE_NAME=\"${NODE_NAME}\" \ -e SYFT_IMAGE_TAG=\"${CI_SYFT_IMAGE_TAG:-${SYFT_IMAGE_TAG}}\" \ - -t ghcr.io/linuxserver/ci:latest \ + -t ghcr.io/linuxserver/ci:${CITEST_IMAGETAG} \ python3 test_build.py''' } } @@ -923,9 +934,11 @@ pipeline { CACHEIMAGE=${i} fi done - docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${META_TAG} -t ${PUSHIMAGE}:latest -t ${PUSHIMAGE}:${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} + docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${META_TAG} -t ${PUSHIMAGE}:latest -t ${PUSHIMAGE}:${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \ + { if [[ "${PUSHIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; } if [ -n "${SEMVER}" ]; then - docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} + docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \ + { if [[ "${PUSHIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; } fi done ''' @@ -950,20 +963,27 @@ pipeline { CACHEIMAGE=${i} fi done - docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${META_TAG} -t ${MANIFESTIMAGE}:amd64-latest -t ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} - docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${META_TAG} -t ${MANIFESTIMAGE}:arm64v8-latest -t ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} + docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${META_TAG} -t ${MANIFESTIMAGE}:amd64-latest -t ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \ + { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; } + docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${META_TAG} -t ${MANIFESTIMAGE}:arm64v8-latest -t ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || \ + { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; } if [ -n "${SEMVER}" ]; then - docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} - docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${SEMVER} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} + docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \ + { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; } + docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${SEMVER} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || \ + { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; } fi done for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do - docker buildx imagetools create -t ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest - docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} - - docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} + docker buildx imagetools create -t ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest || \ + { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; } + docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} || \ + { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; } + docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} || \ + { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; } if [ -n "${SEMVER}" ]; then - docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} + docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} || \ + { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; } fi done ''' @@ -981,23 +1001,41 @@ pipeline { environment name: 'EXIT_STATUS', value: '' } steps { - echo "Pushing New tag for current commit ${META_TAG}" - sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \ - -d '{"tag":"'${META_TAG}'",\ - "object": "'${COMMIT_SHA}'",\ - "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to master",\ - "type": "commit",\ - "tagger": {"name": "LinuxServer-CI","email": "ci@linuxserver.io","date": "'${GITHUB_DATE}'"}}' ''' - echo "Pushing New release for Tag" sh '''#! /bin/bash + echo "Auto-generating release notes" + if [ "$(git tag --points-at HEAD)" != "" ]; then + echo "Existing tag points to current commit, suggesting no new LS changes" + AUTO_RELEASE_NOTES="No changes" + else + AUTO_RELEASE_NOTES=$(curl -fsL -H "Authorization: token ${GITHUB_TOKEN}" -H "Accept: application/vnd.github+json" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases/generate-notes \ + -d '{"tag_name":"'${META_TAG}'",\ + "target_commitish": "master"}' \ + | jq -r '.body' | sed 's|## What.s Changed||') + fi + echo "Pushing New tag for current commit ${META_TAG}" + curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \ + -d '{"tag":"'${META_TAG}'",\ + "object": "'${COMMIT_SHA}'",\ + "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to master",\ + "type": "commit",\ + "tagger": {"name": "LinuxServer-CI","email": "ci@linuxserver.io","date": "'${GITHUB_DATE}'"}}' + echo "Pushing New release for Tag" echo "Data change at JSON endpoint ${JSON_URL}" > releasebody.json - echo '{"tag_name":"'${META_TAG}'",\ - "target_commitish": "master",\ - "name": "'${META_TAG}'",\ - "body": "**CI Report:**\\n\\n'${CI_URL:-N/A}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Remote Changes:**\\n\\n' > start - printf '","draft": false,"prerelease": false}' >> releasebody.json - paste -d'\\0' start releasebody.json > releasebody.json.done - curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done''' + jq -n \ + --arg tag_name "$META_TAG" \ + --arg target_commitish "master" \ + --arg ci_url "${CI_URL:-N/A}" \ + --arg ls_notes "$AUTO_RELEASE_NOTES" \ + --arg remote_notes "$(cat releasebody.json)" \ + '{ + "tag_name": $tag_name, + "target_commitish": $target_commitish, + "name": $tag_name, + "body": ("**CI Report:**\\n\\n" + $ci_url + "\\n\\n**LinuxServer Changes:**\\n\\n" + $ls_notes + "\\n\\n**Remote Changes:**\\n\\n" + $remote_notes), + "draft": false, + "prerelease": false }' > releasebody.json.done + curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done + ''' } } // Add protection to the release branch From 7adf1b75cabf9d38bdf1466966f3e8eff4684e3d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 10 Nov 2025 09:30:19 +0000 Subject: [PATCH 486/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index e47249f..b665769 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -105,7 +105,7 @@ libsepol2 3.5-2build1 deb libsmartcols1 2.39.3-9ubuntu6.3 deb libsqlite3-0 3.45.1-1ubuntu2.5 deb libss2 1.47.0-2.4~exp1ubuntu4.1 deb -libssh-4 0.10.6-2ubuntu0.1 deb +libssh-4 0.10.6-2ubuntu0.2 deb libssl3t64 3.0.13-0ubuntu3.6 deb libstdc++6 14.2.0-4ubuntu2~24.04 deb libsystemd0 255.4-1ubuntu8.11 deb From 215506d3cdc139bb1678e504f6f7013c60a3470e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 24 Nov 2025 09:30:42 +0000 Subject: [PATCH 487/514] Bot Updating Templated Files --- Jenkinsfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 50ed76a..338b91f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -908,6 +908,8 @@ pipeline { -e WEB_PATH=\"${CI_WEBPATH}\" \ -e NODE_NAME=\"${NODE_NAME}\" \ -e SYFT_IMAGE_TAG=\"${CI_SYFT_IMAGE_TAG:-${SYFT_IMAGE_TAG}}\" \ + -e COMMIT_SHA=\"${COMMIT_SHA}\" \ + -e BUILD_NUMBER=\"${BUILD_NUMBER}\" \ -t ghcr.io/linuxserver/ci:${CITEST_IMAGETAG} \ python3 test_build.py''' } From 64aed46150d64be24921d6f1536b506bd86ae607 Mon Sep 17 00:00:00 2001 From: aptalca <541623+aptalca@users.noreply.github.com> Date: Tue, 9 Dec 2025 12:58:58 -0500 Subject: [PATCH 488/514] use device perm fixer from baseimage --- Dockerfile | 3 +- Dockerfile.aarch64 | 3 +- .../s6-rc.d/init-plex-gid-video/run | 37 ------------------- .../s6-rc.d/init-plex-gid-video/type | 1 - .../s6-overlay/s6-rc.d/init-plex-gid-video/up | 1 - .../dependencies.d/init-plex-claim | 0 .../dependencies.d/init-plex-gid-video | 0 .../user/contents.d/init-plex-gid-video | 0 8 files changed, 4 insertions(+), 41 deletions(-) delete mode 100755 root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/run delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/type delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/up rename root/etc/s6-overlay/s6-rc.d/{init-plex-gid-video => init-plex-update}/dependencies.d/init-plex-claim (100%) delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-plex-update/dependencies.d/init-plex-gid-video delete mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-plex-gid-video diff --git a/Dockerfile b/Dockerfile index bf19423..0ad3c08 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,8 @@ ENV DEBIAN_FRONTEND="noninteractive" \ PLEX_MEDIA_SERVER_USER="abc" \ PLEX_MEDIA_SERVER_INFO_VENDOR="Docker" \ PLEX_MEDIA_SERVER_INFO_DEVICE="Docker Container (LinuxServer.io)" \ - TMPDIR=/run/plex-temp + TMPDIR=/run/plex-temp \ + ATTACHED_DEVICES_PERMS="/dev/dri /dev/dvb -type c" RUN \ echo "**** install runtime packages ****" && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index b1c14c6..50d9455 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -21,7 +21,8 @@ ENV DEBIAN_FRONTEND="noninteractive" \ PLEX_MEDIA_SERVER_USER="abc" \ PLEX_MEDIA_SERVER_INFO_VENDOR="Docker" \ PLEX_MEDIA_SERVER_INFO_DEVICE="Docker Container (LinuxServer.io)" \ - TMPDIR=/run/plex-temp + TMPDIR=/run/plex-temp \ + ATTACHED_DEVICES_PERMS="/dev/dri /dev/dvb -type c" RUN \ echo "**** install runtime packages ****" && \ diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/run b/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/run deleted file mode 100755 index 083570f..0000000 --- a/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/run +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/with-contenv bash -# shellcheck shell=bash - -if [[ -z ${LSIO_NON_ROOT_USER} ]]; then - FILES=$(find /dev/dri /dev/dvb -type c -print 2>/dev/null) - - for i in ${FILES}; do - VIDEO_GID=$(stat -c '%g' "${i}") - VIDEO_UID=$(stat -c '%u' "${i}") - # check if user matches device - if id -u abc | grep -qw "${VIDEO_UID}"; then - echo "**** permissions for ${i} are good ****" - else - # check if group matches and that device has group rw - if id -G abc | grep -qw "${VIDEO_GID}" && [[ $(stat -c '%A' "${i}" | cut -b 5,6) == "rw" ]]; then - echo "**** permissions for ${i} are good ****" - # check if device needs to be added to video group - elif ! id -G abc | grep -qw "${VIDEO_GID}"; then - # check if video group needs to be created - VIDEO_NAME=$(getent group "${VIDEO_GID}" | awk -F: '{print $1}') - if [[ -z "${VIDEO_NAME}" ]]; then - VIDEO_NAME="video$(head /dev/urandom | tr -dc 'a-z0-9' | head -c4)" - groupadd "${VIDEO_NAME}" - groupmod -g "${VIDEO_GID}" "${VIDEO_NAME}" - echo "**** creating video group ${VIDEO_NAME} with id ${VIDEO_GID} ****" - fi - echo "**** adding ${i} to video group ${VIDEO_NAME} with id ${VIDEO_GID} ****" - usermod -a -G "${VIDEO_NAME}" abc - fi - # check if device has group rw - if [[ $(stat -c '%A' "${i}" | cut -b 5,6) != "rw" ]]; then - echo -e "**** The device ${i} does not have group read/write permissions, attempting to fix inside the container. ****" - chmod g+rw "${i}" - fi - fi - done -fi diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/type b/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/type deleted file mode 100644 index 3d92b15..0000000 --- a/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/type +++ /dev/null @@ -1 +0,0 @@ -oneshot \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/up b/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/up deleted file mode 100644 index 05f6fde..0000000 --- a/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/up +++ /dev/null @@ -1 +0,0 @@ -/etc/s6-overlay/s6-rc.d/init-plex-gid-video/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/dependencies.d/init-plex-claim b/root/etc/s6-overlay/s6-rc.d/init-plex-update/dependencies.d/init-plex-claim similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-plex-gid-video/dependencies.d/init-plex-claim rename to root/etc/s6-overlay/s6-rc.d/init-plex-update/dependencies.d/init-plex-claim diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-update/dependencies.d/init-plex-gid-video b/root/etc/s6-overlay/s6-rc.d/init-plex-update/dependencies.d/init-plex-gid-video deleted file mode 100644 index e69de29..0000000 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-plex-gid-video b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-plex-gid-video deleted file mode 100644 index e69de29..0000000 From f32896aed44c649aa06a8574e6e7e3c98dd22ccc Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 13 Dec 2025 16:34:25 +0000 Subject: [PATCH 489/514] Bot Updating Templated Files --- readme-vars.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/readme-vars.yml b/readme-vars.yml index 7e2ea93..2ad47e0 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -112,8 +112,7 @@ init_diagram: | init-envfile -> init-os-end init-config -> init-plex-chown init-plex-chown -> init-plex-claim - init-plex-claim -> init-plex-gid-video - init-plex-gid-video -> init-plex-update + init-plex-claim -> init-plex-update init-custom-files -> init-services init-services -> svc-cron svc-cron -> legacy-services From 8056a354f583645d60f4ac2eb208f38b6ac06b4a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 22 Dec 2025 09:35:14 +0000 Subject: [PATCH 490/514] Bot Updating Package Versions --- package_versions.txt | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index b665769..5c9db03 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -5,7 +5,7 @@ apt-utils 2.8.3 deb base-files 13ubuntu10.3 deb base-passwd 3.6.3build1 deb bash 5.2.21-2ubuntu4 deb -bsdutils 1:2.39.3-9ubuntu6.3 deb +bsdutils 1:2.39.3-9ubuntu6.4 deb ca-certificates 20240203 deb catatonit 0.1.7-1 deb coreutils 9.4-3ubuntu6.1 deb @@ -43,7 +43,7 @@ libassuan0 2.5.6-1build1 deb libattr1 1:2.5.2-1build1.1 deb libaudit-common 1:3.1.2-2.1build1.1 deb libaudit1 1:3.1.2-2.1build1.1 deb -libblkid1 2.39.3-9ubuntu6.3 deb +libblkid1 2.39.3-9ubuntu6.4 deb libbrotli1 1.1.0-2build2 deb libbsd0 0.12.1-1build1.1 deb libbz2-1.0 1.0.8-5.1build0.1 deb @@ -78,7 +78,7 @@ libldap2 2.6.7+dfsg-1~exp1ubuntu8.2 deb liblz4-1 1.9.4-1build1.1 deb liblzma5 5.6.1+really5.4.5-1ubuntu0.2 deb libmd0 1.1.0-2build1.1 deb -libmount1 2.39.3-9ubuntu6.3 deb +libmount1 2.39.3-9ubuntu6.4 deb libncursesw6 6.4+20240113-1ubuntu2 deb libnettle8t64 3.9.1-2.2build1.1 deb libnghttp2-14 1.59.0-1ubuntu0.2 deb @@ -102,25 +102,25 @@ libselinux1 3.5-2ubuntu2.1 deb libsemanage-common 3.5-1build5 deb libsemanage2 3.5-1build5 deb libsepol2 3.5-2build1 deb -libsmartcols1 2.39.3-9ubuntu6.3 deb +libsmartcols1 2.39.3-9ubuntu6.4 deb libsqlite3-0 3.45.1-1ubuntu2.5 deb libss2 1.47.0-2.4~exp1ubuntu4.1 deb libssh-4 0.10.6-2ubuntu0.2 deb libssl3t64 3.0.13-0ubuntu3.6 deb libstdc++6 14.2.0-4ubuntu2~24.04 deb -libsystemd0 255.4-1ubuntu8.11 deb +libsystemd0 255.4-1ubuntu8.12 deb libtasn1-6 4.19.0-3ubuntu0.24.04.1 deb libtinfo6 6.4+20240113-1ubuntu2 deb -libudev1 255.4-1ubuntu8.11 deb +libudev1 255.4-1ubuntu8.12 deb libunistring5 1.1-2build1.1 deb -libuuid1 2.39.3-9ubuntu6.3 deb +libuuid1 2.39.3-9ubuntu6.4 deb libxxhash0 0.8.2-2build1 deb libzstd1 1.5.5+dfsg2-2build1.1 deb locales 2.39-0ubuntu8.6 deb login 1:4.13+dfsg1-4ubuntu3.2 deb logsave 1.47.0-2.4~exp1ubuntu4.1 deb mawk 1.3.4.20240123-1build1 deb -mount 2.39.3-9ubuntu6.3 deb +mount 2.39.3-9ubuntu6.4 deb ncurses-base 6.4+20240113-1ubuntu2 deb ncurses-bin 6.4+20240113-1ubuntu2 deb netcat-openbsd 1.226-1ubuntu2 deb @@ -134,15 +134,15 @@ publicsuffix 20231001.0357-0.1 deb readline-common 8.2-4build1 deb sed 4.9-2build1 deb sensible-utils 0.0.22 deb -systemd-dev 255.4-1ubuntu8.11 deb +systemd-dev 255.4-1ubuntu8.12 deb systemd-hwe-hwdb 255.1.6 deb -systemd-standalone-sysusers 255.4-1ubuntu8.11 deb +systemd-standalone-sysusers 255.4-1ubuntu8.12 deb sysvinit-utils 3.08-6ubuntu3 deb tar 1.35+dfsg-3build1 deb tzdata 2025b-0ubuntu0.24.04.1 deb ubuntu-keyring 2023.11.28.1 deb -udev 255.4-1ubuntu8.11 deb +udev 255.4-1ubuntu8.12 deb unminimize 0.2.1 deb -util-linux 2.39.3-9ubuntu6.3 deb +util-linux 2.39.3-9ubuntu6.4 deb wget 1.21.4-1ubuntu4.1 deb zlib1g 1:1.3.dfsg-3.1ubuntu2.1 deb From 77cca7947b54dcb09a9461898cb07467ee74fabc Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 19 Jan 2026 09:41:26 +0000 Subject: [PATCH 491/514] Bot Updating Package Versions --- package_versions.txt | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 5c9db03..362af80 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -16,26 +16,26 @@ dash 0.5.12-6ubuntu5 deb debconf 1.5.86ubuntu1 deb debianutils 5.17build1 deb diffutils 1:3.10-1build1 deb -dirmngr 2.4.4-2ubuntu17.3 deb +dirmngr 2.4.4-2ubuntu17.4 deb dpkg 1.22.6ubuntu6.5 deb e2fsprogs 1.47.0-2.4~exp1ubuntu4.1 deb findutils 4.9.0-5build1 deb gcc-14-base 14.2.0-4ubuntu2~24.04 deb -gnupg 2.4.4-2ubuntu17.3 deb -gnupg-l10n 2.4.4-2ubuntu17.3 deb -gnupg-utils 2.4.4-2ubuntu17.3 deb -gpg 2.4.4-2ubuntu17.3 deb -gpg-agent 2.4.4-2ubuntu17.3 deb -gpg-wks-client 2.4.4-2ubuntu17.3 deb -gpgconf 2.4.4-2ubuntu17.3 deb -gpgsm 2.4.4-2ubuntu17.3 deb -gpgv 2.4.4-2ubuntu17.3 deb +gnupg 2.4.4-2ubuntu17.4 deb +gnupg-l10n 2.4.4-2ubuntu17.4 deb +gnupg-utils 2.4.4-2ubuntu17.4 deb +gpg 2.4.4-2ubuntu17.4 deb +gpg-agent 2.4.4-2ubuntu17.4 deb +gpg-wks-client 2.4.4-2ubuntu17.4 deb +gpgconf 2.4.4-2ubuntu17.4 deb +gpgsm 2.4.4-2ubuntu17.4 deb +gpgv 2.4.4-2ubuntu17.4 deb grep 3.11-4build1 deb gzip 1.12-1ubuntu3.1 deb hostname 3.23+nmu2ubuntu2 deb init-system-helpers 1.66ubuntu1 deb jq 1.7.1-3ubuntu0.24.04.1 deb -keyboxd 2.4.4-2ubuntu17.3 deb +keyboxd 2.4.4-2ubuntu17.4 deb krb5-locales 1.20.1-6ubuntu2.6 deb libacl1 2.3.2-1build1.1 deb libapt-pkg6.0t64 2.8.3 deb @@ -109,7 +109,7 @@ libssh-4 0.10.6-2ubuntu0.2 deb libssl3t64 3.0.13-0ubuntu3.6 deb libstdc++6 14.2.0-4ubuntu2~24.04 deb libsystemd0 255.4-1ubuntu8.12 deb -libtasn1-6 4.19.0-3ubuntu0.24.04.1 deb +libtasn1-6 4.19.0-3ubuntu0.24.04.2 deb libtinfo6 6.4+20240113-1ubuntu2 deb libudev1 255.4-1ubuntu8.12 deb libunistring5 1.1-2build1.1 deb From 163c200dcb433b38e1dd0cae9c8b925f0305b058 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 27 Jan 2026 19:43:54 +0000 Subject: [PATCH 492/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 362af80..da3815d 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -128,7 +128,7 @@ openssl 3.0.13-0ubuntu3.6 deb passwd 1:4.13+dfsg1-4ubuntu3.2 deb perl-base 5.38.2-3.2ubuntu0.2 deb pinentry-curses 1.2.1-3ubuntu5 deb -plexmediaserver 1.42.2.10156-f737b826c deb +plexmediaserver 1.43.0.10467-2b1ba6e69 deb procps 2:4.0.4-4ubuntu3.2 deb publicsuffix 20231001.0357-0.1 deb readline-common 8.2-4build1 deb From 2d9cdff1636eca28014ccc437b1ff200df4c18c4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Wed, 28 Jan 2026 20:54:07 +0000 Subject: [PATCH 493/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index da3815d..362af80 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -128,7 +128,7 @@ openssl 3.0.13-0ubuntu3.6 deb passwd 1:4.13+dfsg1-4ubuntu3.2 deb perl-base 5.38.2-3.2ubuntu0.2 deb pinentry-curses 1.2.1-3ubuntu5 deb -plexmediaserver 1.43.0.10467-2b1ba6e69 deb +plexmediaserver 1.42.2.10156-f737b826c deb procps 2:4.0.4-4ubuntu3.2 deb publicsuffix 20231001.0357-0.1 deb readline-common 8.2-4build1 deb From c9ffa886373e16154375f3d1e5075d0395efc6f2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 9 Feb 2026 10:08:55 +0000 Subject: [PATCH 494/514] Bot Updating Package Versions --- package_versions.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 362af80..5c8c1bb 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -47,8 +47,8 @@ libblkid1 2.39.3-9ubuntu6.4 deb libbrotli1 1.1.0-2build2 deb libbsd0 0.12.1-1build1.1 deb libbz2-1.0 1.0.8-5.1build0.1 deb -libc-bin 2.39-0ubuntu8.6 deb -libc6 2.39-0ubuntu8.6 deb +libc-bin 2.39-0ubuntu8.7 deb +libc6 2.39-0ubuntu8.7 deb libcap-ng0 0.8.4-2build2 deb libcap2 1:2.66-5ubuntu2.2 deb libcom-err2 1.47.0-2.4~exp1ubuntu4.1 deb @@ -73,8 +73,8 @@ libkmod2 31+20240202-2ubuntu7.1 deb libkrb5-3 1.20.1-6ubuntu2.6 deb libkrb5support0 1.20.1-6ubuntu2.6 deb libksba8 1.6.6-1build1 deb -libldap-common 2.6.7+dfsg-1~exp1ubuntu8.2 deb -libldap2 2.6.7+dfsg-1~exp1ubuntu8.2 deb +libldap-common 2.6.10+dfsg-0ubuntu0.24.04.1 deb +libldap2 2.6.10+dfsg-0ubuntu0.24.04.1 deb liblz4-1 1.9.4-1build1.1 deb liblzma5 5.6.1+really5.4.5-1ubuntu0.2 deb libmd0 1.1.0-2build1.1 deb @@ -106,7 +106,7 @@ libsmartcols1 2.39.3-9ubuntu6.4 deb libsqlite3-0 3.45.1-1ubuntu2.5 deb libss2 1.47.0-2.4~exp1ubuntu4.1 deb libssh-4 0.10.6-2ubuntu0.2 deb -libssl3t64 3.0.13-0ubuntu3.6 deb +libssl3t64 3.0.13-0ubuntu3.7 deb libstdc++6 14.2.0-4ubuntu2~24.04 deb libsystemd0 255.4-1ubuntu8.12 deb libtasn1-6 4.19.0-3ubuntu0.24.04.2 deb @@ -116,7 +116,7 @@ libunistring5 1.1-2build1.1 deb libuuid1 2.39.3-9ubuntu6.4 deb libxxhash0 0.8.2-2build1 deb libzstd1 1.5.5+dfsg2-2build1.1 deb -locales 2.39-0ubuntu8.6 deb +locales 2.39-0ubuntu8.7 deb login 1:4.13+dfsg1-4ubuntu3.2 deb logsave 1.47.0-2.4~exp1ubuntu4.1 deb mawk 1.3.4.20240123-1build1 deb @@ -124,7 +124,7 @@ mount 2.39.3-9ubuntu6.4 deb ncurses-base 6.4+20240113-1ubuntu2 deb ncurses-bin 6.4+20240113-1ubuntu2 deb netcat-openbsd 1.226-1ubuntu2 deb -openssl 3.0.13-0ubuntu3.6 deb +openssl 3.0.13-0ubuntu3.7 deb passwd 1:4.13+dfsg1-4ubuntu3.2 deb perl-base 5.38.2-3.2ubuntu0.2 deb pinentry-curses 1.2.1-3ubuntu5 deb From 944fc560c6550440d707bcab090452b349666a7a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Wed, 11 Feb 2026 16:18:08 +0000 Subject: [PATCH 495/514] Bot Updating Templated Files --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 338b91f..b4fb77c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -285,7 +285,7 @@ pipeline { -v ${WORKSPACE}:/mnt \ -e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \ -e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \ - ghcr.io/linuxserver/baseimage-alpine:3 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\ + ghcr.io/linuxserver/baseimage-alpine:3.23 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\ apk add --no-cache python3 && \ python3 -m venv /lsiopy && \ pip install --no-cache-dir -U pip && \ From 6374e18803562032815f83c169f43eb2e098d573 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Wed, 11 Feb 2026 16:20:09 +0000 Subject: [PATCH 496/514] Bot Updating Templated Files --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5831463..94c1429 100644 --- a/README.md +++ b/README.md @@ -122,7 +122,7 @@ This image can be run with a non-root user. For details please [read the docs](h To help you get started creating a container from this image you can either use docker-compose or the docker cli. >[!NOTE] ->Unless a parameter is flaged as 'optional', it is *mandatory* and a value must be provided. +>Unless a parameter is flagged as 'optional', it is *mandatory* and a value must be provided. ### docker-compose (recommended, [click here for more info](https://docs.linuxserver.io/general/docker-compose)) From 82cbb863bc48970752fb1b889b24360aa135ee6e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Wed, 11 Feb 2026 16:23:50 +0000 Subject: [PATCH 497/514] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 5c8c1bb..747e3d9 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -2,7 +2,7 @@ NAME VERSION TYPE adduser 3.137ubuntu1 deb apt 2.8.3 deb apt-utils 2.8.3 deb -base-files 13ubuntu10.3 deb +base-files 13ubuntu10.4 deb base-passwd 3.6.3build1 deb bash 5.2.21-2ubuntu4 deb bsdutils 1:2.39.3-9ubuntu6.4 deb @@ -128,7 +128,7 @@ openssl 3.0.13-0ubuntu3.7 deb passwd 1:4.13+dfsg1-4ubuntu3.2 deb perl-base 5.38.2-3.2ubuntu0.2 deb pinentry-curses 1.2.1-3ubuntu5 deb -plexmediaserver 1.42.2.10156-f737b826c deb +plexmediaserver 1.43.0.10492-121068a07 deb procps 2:4.0.4-4ubuntu3.2 deb publicsuffix 20231001.0357-0.1 deb readline-common 8.2-4build1 deb From 4a4dc88e6c48e41f87ad02180045a491c7acb378 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 23 Feb 2026 10:03:04 +0000 Subject: [PATCH 498/514] Bot Updating Package Versions --- package_versions.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 747e3d9..b1ccad2 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -20,7 +20,7 @@ dirmngr 2.4.4-2ubuntu17.4 deb dpkg 1.22.6ubuntu6.5 deb e2fsprogs 1.47.0-2.4~exp1ubuntu4.1 deb findutils 4.9.0-5build1 deb -gcc-14-base 14.2.0-4ubuntu2~24.04 deb +gcc-14-base 14.2.0-4ubuntu2~24.04.1 deb gnupg 2.4.4-2ubuntu17.4 deb gnupg-l10n 2.4.4-2ubuntu17.4 deb gnupg-utils 2.4.4-2ubuntu17.4 deb @@ -58,10 +58,10 @@ libdb5.3t64 5.3.28+dfsg2-7 deb libdebconfclient0 0.271ubuntu3 deb libext2fs2t64 1.47.0-2.4~exp1ubuntu4.1 deb libffi8 3.4.6-1build1 deb -libgcc-s1 14.2.0-4ubuntu2~24.04 deb +libgcc-s1 14.2.0-4ubuntu2~24.04.1 deb libgcrypt20 1.10.3-2build1 deb libgmp10 2:6.3.0+dfsg-2ubuntu6.1 deb -libgnutls30t64 3.8.3-1.1ubuntu3.4 deb +libgnutls30t64 3.8.3-1.1ubuntu3.5 deb libgpg-error0 1.47-3build2.1 deb libgssapi-krb5-2 1.20.1-6ubuntu2.6 deb libhogweed6t64 3.9.1-2.2build1.1 deb @@ -107,7 +107,7 @@ libsqlite3-0 3.45.1-1ubuntu2.5 deb libss2 1.47.0-2.4~exp1ubuntu4.1 deb libssh-4 0.10.6-2ubuntu0.2 deb libssl3t64 3.0.13-0ubuntu3.7 deb -libstdc++6 14.2.0-4ubuntu2~24.04 deb +libstdc++6 14.2.0-4ubuntu2~24.04.1 deb libsystemd0 255.4-1ubuntu8.12 deb libtasn1-6 4.19.0-3ubuntu0.24.04.2 deb libtinfo6 6.4+20240113-1ubuntu2 deb @@ -135,7 +135,7 @@ readline-common 8.2-4build1 deb sed 4.9-2build1 deb sensible-utils 0.0.22 deb systemd-dev 255.4-1ubuntu8.12 deb -systemd-hwe-hwdb 255.1.6 deb +systemd-hwe-hwdb 255.1.7 deb systemd-standalone-sysusers 255.4-1ubuntu8.12 deb sysvinit-utils 3.08-6ubuntu3 deb tar 1.35+dfsg-3build1 deb From cb3568d81a96efc2b7b5487517e1796349c8cdd0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 2 Mar 2026 09:58:27 +0000 Subject: [PATCH 499/514] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index b1ccad2..a28714d 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -11,7 +11,7 @@ catatonit 0.1.7-1 deb coreutils 9.4-3ubuntu6.1 deb cron 3.0pl1-184ubuntu2 deb cron-daemon-common 3.0pl1-184ubuntu2 deb -curl 8.5.0-2ubuntu10.6 deb +curl 8.5.0-2ubuntu10.7 deb dash 0.5.12-6ubuntu5 deb debconf 1.5.86ubuntu1 deb debianutils 5.17build1 deb @@ -53,7 +53,7 @@ libcap-ng0 0.8.4-2build2 deb libcap2 1:2.66-5ubuntu2.2 deb libcom-err2 1.47.0-2.4~exp1ubuntu4.1 deb libcrypt1 1:4.4.36-4build1 deb -libcurl4t64 8.5.0-2ubuntu10.6 deb +libcurl4t64 8.5.0-2ubuntu10.7 deb libdb5.3t64 5.3.28+dfsg2-7 deb libdebconfclient0 0.271ubuntu3 deb libext2fs2t64 1.47.0-2.4~exp1ubuntu4.1 deb @@ -105,7 +105,7 @@ libsepol2 3.5-2build1 deb libsmartcols1 2.39.3-9ubuntu6.4 deb libsqlite3-0 3.45.1-1ubuntu2.5 deb libss2 1.47.0-2.4~exp1ubuntu4.1 deb -libssh-4 0.10.6-2ubuntu0.2 deb +libssh-4 0.10.6-2ubuntu0.3 deb libssl3t64 3.0.13-0ubuntu3.7 deb libstdc++6 14.2.0-4ubuntu2~24.04.1 deb libsystemd0 255.4-1ubuntu8.12 deb From e64b2579d71e6a0ba8e1760814aa6fd4cee1197a Mon Sep 17 00:00:00 2001 From: Evan Champion <110177090+evan314159@users.noreply.github.com> Date: Sun, 15 Mar 2026 12:01:53 +0800 Subject: [PATCH 500/514] init-plex-claim/run: do not run s6-setuidgid on non-root containers Fixes #422 --- README.md | 1 + root/etc/s6-overlay/s6-rc.d/init-plex-claim/run | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 94c1429..eae4382 100644 --- a/README.md +++ b/README.md @@ -371,6 +371,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **15.03.26:** - Fix initial claim setup on non-root containers * **04.11.24:** - Add Nvidia capability needed for h265 * **18.07.24:** - Rebase to Ubuntu Noble. * **12.02.24:** - Use universal hardware acceleration blurb diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-claim/run b/root/etc/s6-overlay/s6-rc.d/init-plex-claim/run index a94451e..700b1c0 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-plex-claim/run +++ b/root/etc/s6-overlay/s6-rc.d/init-plex-claim/run @@ -19,8 +19,15 @@ if [[ ! -f "${PLEX_MEDIA_SERVER_PREFERENCES}" ]]; then export PLEX_MEDIA_SERVER_INFO_MODEL PLEX_MEDIA_SERVER_INFO_PLATFORM_VERSION=$(uname -r) export PLEX_MEDIA_SERVER_INFO_PLATFORM_VERSION - s6-setuidgid abc /bin/bash -c \ - 'LD_LIBRARY_PATH=/usr/lib/plexmediaserver:/usr/lib/plexmediaserver/lib /usr/lib/plexmediaserver/Plex\ Media\ Server' & + + if [[ -z ${LSIO_NON_ROOT_USER} ]]; then + s6-setuidgid abc /bin/bash -c \ + 'LD_LIBRARY_PATH=/usr/lib/plexmediaserver:/usr/lib/plexmediaserver/lib /usr/lib/plexmediaserver/Plex\ Media\ Server' & + else + /bin/bash -c \ + 'LD_LIBRARY_PATH=/usr/lib/plexmediaserver:/usr/lib/plexmediaserver/lib /usr/lib/plexmediaserver/Plex\ Media\ Server' & + fi + PID=$! echo "Waiting for Plex to generate its config" DBNAME="/config/Library/Application Support/Plex Media Server/Plug-in Support/Databases/com.plexapp.plugins.library.db-wal" From 2186587d378a9111a2d3d20ce89010fdafe1bcd6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 15 Mar 2026 21:47:12 +0000 Subject: [PATCH 501/514] Bot Updating Templated Files --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index eae4382..94c1429 100644 --- a/README.md +++ b/README.md @@ -371,7 +371,6 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions -* **15.03.26:** - Fix initial claim setup on non-root containers * **04.11.24:** - Add Nvidia capability needed for h265 * **18.07.24:** - Rebase to Ubuntu Noble. * **12.02.24:** - Use universal hardware acceleration blurb From 094d2071e2c9af11847c1ebaabe0d80b10901e34 Mon Sep 17 00:00:00 2001 From: Evan Champion <110177090+evan314159@users.noreply.github.com> Date: Sun, 15 Mar 2026 12:45:15 +0800 Subject: [PATCH 502/514] init-plex-chown/run: use TMPDIR instead of hardcoded /run/plex-temp Changes init-plex-chown/run to use TMPDIR instead of hardcoded /run/plex-temp Plex uses TMPDIR to store transcodes of music to WAV format for music analysis (and maybe other things). LS.io container sets TMPDIR=/run/plex-temp. With read-only root this means the /run tmpfs needs to have enough memory to store music analysis transcodes. LS.io container hardcoded /run/plex-temp in init so TMPDIR could not be flexibly changed -- changed to use TMPDIR and clean on restart in case of unclean shutdown. Plex container is marked as supporting read-only root. --- README.md | 2 ++ root/etc/s6-overlay/s6-rc.d/init-plex-chown/run | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 94c1429..e0be438 100644 --- a/README.md +++ b/README.md @@ -371,6 +371,8 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **15.03.26:** - Allow TMPDIR to be changed to better support read-only containers +* **15.03.26:** - Fix initial claim setup on non-root containers * **04.11.24:** - Add Nvidia capability needed for h265 * **18.07.24:** - Rebase to Ubuntu Noble. * **12.02.24:** - Use universal hardware acceleration blurb diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-chown/run b/root/etc/s6-overlay/s6-rc.d/init-plex-chown/run index f98e669..47b1c1e 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-plex-chown/run +++ b/root/etc/s6-overlay/s6-rc.d/init-plex-chown/run @@ -1,7 +1,11 @@ #!/usr/bin/with-contenv bash # shellcheck shell=bash -mkdir -p /run/plex-temp +# remove plex temporary directory after unclean stop +if [[ -d "${TMPDIR}" ]]; then + rm -rf "${TMPDIR}" +fi +mkdir -p ${TMPDIR} # create folders if [[ ! -d "${PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR}" ]]; then @@ -40,7 +44,7 @@ if [[ -z ${LSIO_NON_ROOT_USER} ]]; then # permissions (non-recursive) on config root and folders lsiown abc:abc \ - /run/plex-temp \ + "${TMPDIR}" \ /config \ /config/* fi From a56f4d3e85b425f79aaa4a9260c63d8b29d94de4 Mon Sep 17 00:00:00 2001 From: Evan Champion <110177090+evan314159@users.noreply.github.com> Date: Tue, 17 Mar 2026 06:34:26 +0800 Subject: [PATCH 503/514] Update readme-vars.yml --- readme-vars.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/readme-vars.yml b/readme-vars.yml index 2ad47e0..9f7a516 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -125,6 +125,8 @@ init_diagram: | "plex:latest" <- Base Images # changelog changelogs: + - {date: "15.03.26:", desc: "Allow TMPDIR to be changed to better support read-only containers"} + - {date: "15.03.26:", desc: "Fix initial claim setup on non-root containers"} - {date: "04.11.24:", desc: "Add Nvidia capability needed for h265"} - {date: "18.07.24:", desc: "Rebase to Ubuntu Noble."} - {date: "12.02.24:", desc: "Use universal hardware acceleration blurb"} From ee772de585fc24cb7ad1dd09b9507556bf59b909 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 21 Mar 2026 14:30:06 +0000 Subject: [PATCH 504/514] Bot Updating Package Versions --- package_versions.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index a28714d..20c2c7f 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -5,13 +5,13 @@ apt-utils 2.8.3 deb base-files 13ubuntu10.4 deb base-passwd 3.6.3build1 deb bash 5.2.21-2ubuntu4 deb -bsdutils 1:2.39.3-9ubuntu6.4 deb +bsdutils 1:2.39.3-9ubuntu6.5 deb ca-certificates 20240203 deb catatonit 0.1.7-1 deb coreutils 9.4-3ubuntu6.1 deb cron 3.0pl1-184ubuntu2 deb cron-daemon-common 3.0pl1-184ubuntu2 deb -curl 8.5.0-2ubuntu10.7 deb +curl 8.5.0-2ubuntu10.8 deb dash 0.5.12-6ubuntu5 deb debconf 1.5.86ubuntu1 deb debianutils 5.17build1 deb @@ -43,7 +43,7 @@ libassuan0 2.5.6-1build1 deb libattr1 1:2.5.2-1build1.1 deb libaudit-common 1:3.1.2-2.1build1.1 deb libaudit1 1:3.1.2-2.1build1.1 deb -libblkid1 2.39.3-9ubuntu6.4 deb +libblkid1 2.39.3-9ubuntu6.5 deb libbrotli1 1.1.0-2build2 deb libbsd0 0.12.1-1build1.1 deb libbz2-1.0 1.0.8-5.1build0.1 deb @@ -53,7 +53,7 @@ libcap-ng0 0.8.4-2build2 deb libcap2 1:2.66-5ubuntu2.2 deb libcom-err2 1.47.0-2.4~exp1ubuntu4.1 deb libcrypt1 1:4.4.36-4build1 deb -libcurl4t64 8.5.0-2ubuntu10.7 deb +libcurl4t64 8.5.0-2ubuntu10.8 deb libdb5.3t64 5.3.28+dfsg2-7 deb libdebconfclient0 0.271ubuntu3 deb libext2fs2t64 1.47.0-2.4~exp1ubuntu4.1 deb @@ -78,7 +78,7 @@ libldap2 2.6.10+dfsg-0ubuntu0.24.04.1 deb liblz4-1 1.9.4-1build1.1 deb liblzma5 5.6.1+really5.4.5-1ubuntu0.2 deb libmd0 1.1.0-2build1.1 deb -libmount1 2.39.3-9ubuntu6.4 deb +libmount1 2.39.3-9ubuntu6.5 deb libncursesw6 6.4+20240113-1ubuntu2 deb libnettle8t64 3.9.1-2.2build1.1 deb libnghttp2-14 1.59.0-1ubuntu0.2 deb @@ -102,10 +102,10 @@ libselinux1 3.5-2ubuntu2.1 deb libsemanage-common 3.5-1build5 deb libsemanage2 3.5-1build5 deb libsepol2 3.5-2build1 deb -libsmartcols1 2.39.3-9ubuntu6.4 deb +libsmartcols1 2.39.3-9ubuntu6.5 deb libsqlite3-0 3.45.1-1ubuntu2.5 deb libss2 1.47.0-2.4~exp1ubuntu4.1 deb -libssh-4 0.10.6-2ubuntu0.3 deb +libssh-4 0.10.6-2ubuntu0.4 deb libssl3t64 3.0.13-0ubuntu3.7 deb libstdc++6 14.2.0-4ubuntu2~24.04.1 deb libsystemd0 255.4-1ubuntu8.12 deb @@ -113,14 +113,14 @@ libtasn1-6 4.19.0-3ubuntu0.24.04.2 deb libtinfo6 6.4+20240113-1ubuntu2 deb libudev1 255.4-1ubuntu8.12 deb libunistring5 1.1-2build1.1 deb -libuuid1 2.39.3-9ubuntu6.4 deb +libuuid1 2.39.3-9ubuntu6.5 deb libxxhash0 0.8.2-2build1 deb libzstd1 1.5.5+dfsg2-2build1.1 deb locales 2.39-0ubuntu8.7 deb login 1:4.13+dfsg1-4ubuntu3.2 deb logsave 1.47.0-2.4~exp1ubuntu4.1 deb mawk 1.3.4.20240123-1build1 deb -mount 2.39.3-9ubuntu6.4 deb +mount 2.39.3-9ubuntu6.5 deb ncurses-base 6.4+20240113-1ubuntu2 deb ncurses-bin 6.4+20240113-1ubuntu2 deb netcat-openbsd 1.226-1ubuntu2 deb @@ -143,6 +143,6 @@ tzdata 2025b-0ubuntu0.24.04.1 deb ubuntu-keyring 2023.11.28.1 deb udev 255.4-1ubuntu8.12 deb unminimize 0.2.1 deb -util-linux 2.39.3-9ubuntu6.4 deb +util-linux 2.39.3-9ubuntu6.5 deb wget 1.21.4-1ubuntu4.1 deb zlib1g 1:1.3.dfsg-3.1ubuntu2.1 deb From ecb66b1ca36a31b38f02a84e580874690b8e68c0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 30 Mar 2026 10:23:10 +0000 Subject: [PATCH 505/514] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 20c2c7f..d6deaa3 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -8,7 +8,7 @@ bash 5.2.21-2ubuntu4 deb bsdutils 1:2.39.3-9ubuntu6.5 deb ca-certificates 20240203 deb catatonit 0.1.7-1 deb -coreutils 9.4-3ubuntu6.1 deb +coreutils 9.4-3ubuntu6.2 deb cron 3.0pl1-184ubuntu2 deb cron-daemon-common 3.0pl1-184ubuntu2 deb curl 8.5.0-2ubuntu10.8 deb @@ -108,10 +108,10 @@ libss2 1.47.0-2.4~exp1ubuntu4.1 deb libssh-4 0.10.6-2ubuntu0.4 deb libssl3t64 3.0.13-0ubuntu3.7 deb libstdc++6 14.2.0-4ubuntu2~24.04.1 deb -libsystemd0 255.4-1ubuntu8.12 deb +libsystemd0 255.4-1ubuntu8.14 deb libtasn1-6 4.19.0-3ubuntu0.24.04.2 deb libtinfo6 6.4+20240113-1ubuntu2 deb -libudev1 255.4-1ubuntu8.12 deb +libudev1 255.4-1ubuntu8.14 deb libunistring5 1.1-2build1.1 deb libuuid1 2.39.3-9ubuntu6.5 deb libxxhash0 0.8.2-2build1 deb @@ -134,14 +134,14 @@ publicsuffix 20231001.0357-0.1 deb readline-common 8.2-4build1 deb sed 4.9-2build1 deb sensible-utils 0.0.22 deb -systemd-dev 255.4-1ubuntu8.12 deb +systemd-dev 255.4-1ubuntu8.14 deb systemd-hwe-hwdb 255.1.7 deb -systemd-standalone-sysusers 255.4-1ubuntu8.12 deb +systemd-standalone-sysusers 255.4-1ubuntu8.14 deb sysvinit-utils 3.08-6ubuntu3 deb tar 1.35+dfsg-3build1 deb tzdata 2025b-0ubuntu0.24.04.1 deb ubuntu-keyring 2023.11.28.1 deb -udev 255.4-1ubuntu8.12 deb +udev 255.4-1ubuntu8.14 deb unminimize 0.2.1 deb util-linux 2.39.3-9ubuntu6.5 deb wget 1.21.4-1ubuntu4.1 deb From be4e12409d7e0fcb0705677335c9b2a24c421227 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 6 Apr 2026 10:14:36 +0000 Subject: [PATCH 506/514] Bot Updating Templated Files --- Jenkinsfile | 172 ++++++++++++++++++++++++++-------------------------- 1 file changed, 85 insertions(+), 87 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b4fb77c..f0e1f0d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -77,6 +77,7 @@ pipeline { ''' script{ env.EXIT_STATUS = '' + env.CI_TEST_ATTEMPTED = '' env.LS_RELEASE = sh( script: '''docker run --rm quay.io/skopeo/stable:v1 inspect docker://ghcr.io/${LS_USER}/${CONTAINER_NAME}:latest 2>/dev/null | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''', returnStdout: true).trim() @@ -873,6 +874,7 @@ pipeline { script{ env.CI_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/index.html' env.CI_JSON_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/report.json' + env.CI_TEST_ATTEMPTED = 'true' } sh '''#! /bin/bash set -e @@ -1075,98 +1077,13 @@ EOF ) ''' } } - // If this is a Pull request send the CI link as a comment on it - stage('Pull Request Comment') { - when { - not {environment name: 'CHANGE_ID', value: ''} - environment name: 'EXIT_STATUS', value: '' - } - steps { - sh '''#! /bin/bash - # Function to retrieve JSON data from URL - get_json() { - local url="$1" - local response=$(curl -s "$url") - if [ $? -ne 0 ]; then - echo "Failed to retrieve JSON data from $url" - return 1 - fi - local json=$(echo "$response" | jq .) - if [ $? -ne 0 ]; then - echo "Failed to parse JSON data from $url" - return 1 - fi - echo "$json" - } - - build_table() { - local data="$1" - - # Get the keys in the JSON data - local keys=$(echo "$data" | jq -r 'to_entries | map(.key) | .[]') - - # Check if keys are empty - if [ -z "$keys" ]; then - echo "JSON report data does not contain any keys or the report does not exist." - return 1 - fi - - # Build table header - local header="| Tag | Passed |\\n| --- | --- |\\n" - - # Loop through the JSON data to build the table rows - local rows="" - for build in $keys; do - local status=$(echo "$data" | jq -r ".[\\"$build\\"].test_success") - if [ "$status" = "true" ]; then - status="✅" - else - status="❌" - fi - local row="| "$build" | "$status" |\\n" - rows="${rows}${row}" - done - - local table="${header}${rows}" - local escaped_table=$(echo "$table" | sed 's/\"/\\\\"/g') - echo "$escaped_table" - } - - if [[ "${CI}" = "true" ]]; then - # Retrieve JSON data from URL - data=$(get_json "$CI_JSON_URL") - # Create table from JSON data - table=$(build_table "$data") - echo -e "$table" - - curl -X POST -H "Authorization: token $GITHUB_TOKEN" \ - -H "Accept: application/vnd.github.v3+json" \ - "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \ - -d "{\\"body\\": \\"I am a bot, here are the test results for this PR: \\n${CI_URL}\\n${SHELLCHECK_URL}\\n${table}\\"}" - else - curl -X POST -H "Authorization: token $GITHUB_TOKEN" \ - -H "Accept: application/vnd.github.v3+json" \ - "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \ - -d "{\\"body\\": \\"I am a bot, here is the pushed image/manifest for this PR: \\n\\n\\`${GITHUBIMAGE}:${META_TAG}\\`\\"}" - fi - ''' - - } - } } /* ###################### - Send status to Discord + Comment on PR and Send status to Discord ###################### */ post { always { - sh '''#!/bin/bash - rm -rf /config/.ssh/id_sign - rm -rf /config/.ssh/id_sign.pub - git config --global --unset gpg.format - git config --global --unset user.signingkey - git config --global --unset commit.gpgsign - ''' - script{ + script { env.JOB_DATE = sh( script: '''date '+%Y-%m-%dT%H:%M:%S%:z' ''', returnStdout: true).trim() @@ -1209,6 +1126,87 @@ EOF "username": "Jenkins"}' ${BUILDS_DISCORD} ''' } } + script { + if (env.GITHUBIMAGE =~ /lspipepr/){ + if (env.CI_TEST_ATTEMPTED == "true"){ + sh '''#! /bin/bash + # Function to retrieve JSON data from URL + get_json() { + local url="$1" + local response=$(curl -s "$url") + if [ $? -ne 0 ]; then + echo "Failed to retrieve JSON data from $url" + return 1 + fi + local json=$(echo "$response" | jq .) + if [ $? -ne 0 ]; then + echo "Failed to parse JSON data from $url" + return 1 + fi + echo "$json" + } + + build_table() { + local data="$1" + + # Get the keys in the JSON data + local keys=$(echo "$data" | jq -r 'to_entries | map(.key) | .[]') + + # Check if keys are empty + if [ -z "$keys" ]; then + echo "JSON report data does not contain any keys or the report does not exist." + return 1 + fi + + # Build table header + local header="| Tag | Passed |\\n| --- | --- |\\n" + + # Loop through the JSON data to build the table rows + local rows="" + for build in $keys; do + local status=$(echo "$data" | jq -r ".[\\"$build\\"].test_success") + if [ "$status" = "true" ]; then + status="✅" + else + status="❌" + fi + local row="| "$build" | "$status" |\\n" + rows="${rows}${row}" + done + + local table="${header}${rows}" + local escaped_table=$(echo "$table" | sed 's/\"/\\\\"/g') + echo "$escaped_table" + } + + if [[ "${CI}" = "true" ]]; then + # Retrieve JSON data from URL + data=$(get_json "$CI_JSON_URL") + # Create table from JSON data + table=$(build_table "$data") + echo -e "$table" + + curl -X POST -H "Authorization: token $GITHUB_TOKEN" \ + -H "Accept: application/vnd.github.v3+json" \ + "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \ + -d "{\\"body\\": \\"I am a bot, here are the test results for this PR: \\n${CI_URL}\\n${SHELLCHECK_URL}\\n${table}\\"}" + else + curl -X POST -H "Authorization: token $GITHUB_TOKEN" \ + -H "Accept: application/vnd.github.v3+json" \ + "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \ + -d "{\\"body\\": \\"I am a bot, here is the pushed image/manifest for this PR: \\n\\n\\`${GITHUBIMAGE}:${META_TAG}\\`\\"}" + fi + ''' + } + } + } + sh '''#!/bin/bash + rm -rf /config/.ssh/id_sign + rm -rf /config/.ssh/id_sign.pub + git config --global --unset gpg.format + git config --global --unset user.signingkey + git config --global --unset commit.gpgsign + ''' } cleanup { sh '''#! /bin/bash From e0048bb650bfc34561e28b0fce398708aff479a7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Wed, 8 Apr 2026 15:46:39 +0000 Subject: [PATCH 507/514] Bot Updating Package Versions --- package_versions.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index d6deaa3..d3c49a0 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -108,10 +108,10 @@ libss2 1.47.0-2.4~exp1ubuntu4.1 deb libssh-4 0.10.6-2ubuntu0.4 deb libssl3t64 3.0.13-0ubuntu3.7 deb libstdc++6 14.2.0-4ubuntu2~24.04.1 deb -libsystemd0 255.4-1ubuntu8.14 deb +libsystemd0 255.4-1ubuntu8.15 deb libtasn1-6 4.19.0-3ubuntu0.24.04.2 deb libtinfo6 6.4+20240113-1ubuntu2 deb -libudev1 255.4-1ubuntu8.14 deb +libudev1 255.4-1ubuntu8.15 deb libunistring5 1.1-2build1.1 deb libuuid1 2.39.3-9ubuntu6.5 deb libxxhash0 0.8.2-2build1 deb @@ -128,20 +128,20 @@ openssl 3.0.13-0ubuntu3.7 deb passwd 1:4.13+dfsg1-4ubuntu3.2 deb perl-base 5.38.2-3.2ubuntu0.2 deb pinentry-curses 1.2.1-3ubuntu5 deb -plexmediaserver 1.43.0.10492-121068a07 deb +plexmediaserver 1.43.1.10576-06378bdcd deb procps 2:4.0.4-4ubuntu3.2 deb publicsuffix 20231001.0357-0.1 deb readline-common 8.2-4build1 deb sed 4.9-2build1 deb sensible-utils 0.0.22 deb -systemd-dev 255.4-1ubuntu8.14 deb +systemd-dev 255.4-1ubuntu8.15 deb systemd-hwe-hwdb 255.1.7 deb -systemd-standalone-sysusers 255.4-1ubuntu8.14 deb +systemd-standalone-sysusers 255.4-1ubuntu8.15 deb sysvinit-utils 3.08-6ubuntu3 deb tar 1.35+dfsg-3build1 deb -tzdata 2025b-0ubuntu0.24.04.1 deb +tzdata 2026a-0ubuntu0.24.04.1 deb ubuntu-keyring 2023.11.28.1 deb -udev 255.4-1ubuntu8.14 deb +udev 255.4-1ubuntu8.15 deb unminimize 0.2.1 deb util-linux 2.39.3-9ubuntu6.5 deb wget 1.21.4-1ubuntu4.1 deb From 1a7cf74b6ec7ab0ce9efedd7b53963c40153e512 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 10 Apr 2026 13:52:50 +0000 Subject: [PATCH 508/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index d3c49a0..47beda4 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -128,7 +128,7 @@ openssl 3.0.13-0ubuntu3.7 deb passwd 1:4.13+dfsg1-4ubuntu3.2 deb perl-base 5.38.2-3.2ubuntu0.2 deb pinentry-curses 1.2.1-3ubuntu5 deb -plexmediaserver 1.43.1.10576-06378bdcd deb +plexmediaserver 1.43.1.10611-1e34174b1 deb procps 2:4.0.4-4ubuntu3.2 deb publicsuffix 20231001.0357-0.1 deb readline-common 8.2-4build1 deb From 7378fb237dcfbd304b14f64ef0533590cff62dd5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 20 Apr 2026 10:55:12 +0000 Subject: [PATCH 509/514] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 47beda4..64660a3 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -106,7 +106,7 @@ libsmartcols1 2.39.3-9ubuntu6.5 deb libsqlite3-0 3.45.1-1ubuntu2.5 deb libss2 1.47.0-2.4~exp1ubuntu4.1 deb libssh-4 0.10.6-2ubuntu0.4 deb -libssl3t64 3.0.13-0ubuntu3.7 deb +libssl3t64 3.0.13-0ubuntu3.9 deb libstdc++6 14.2.0-4ubuntu2~24.04.1 deb libsystemd0 255.4-1ubuntu8.15 deb libtasn1-6 4.19.0-3ubuntu0.24.04.2 deb @@ -124,7 +124,7 @@ mount 2.39.3-9ubuntu6.5 deb ncurses-base 6.4+20240113-1ubuntu2 deb ncurses-bin 6.4+20240113-1ubuntu2 deb netcat-openbsd 1.226-1ubuntu2 deb -openssl 3.0.13-0ubuntu3.7 deb +openssl 3.0.13-0ubuntu3.9 deb passwd 1:4.13+dfsg1-4ubuntu3.2 deb perl-base 5.38.2-3.2ubuntu0.2 deb pinentry-curses 1.2.1-3ubuntu5 deb From 68fa685a3cd2e3a6d3972e6adc35a72b97988c50 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 27 Apr 2026 11:10:30 +0000 Subject: [PATCH 510/514] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 64660a3..5e522eb 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -50,7 +50,7 @@ libbz2-1.0 1.0.8-5.1build0.1 deb libc-bin 2.39-0ubuntu8.7 deb libc6 2.39-0ubuntu8.7 deb libcap-ng0 0.8.4-2build2 deb -libcap2 1:2.66-5ubuntu2.2 deb +libcap2 1:2.66-5ubuntu2.4 deb libcom-err2 1.47.0-2.4~exp1ubuntu4.1 deb libcrypt1 1:4.4.36-4build1 deb libcurl4t64 8.5.0-2ubuntu10.8 deb From 0a43190ac9160d7f4e9b92e86a75b9e43dd4cc00 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 4 May 2026 11:10:31 +0000 Subject: [PATCH 511/514] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 5e522eb..d36b5b4 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -34,7 +34,7 @@ grep 3.11-4build1 deb gzip 1.12-1ubuntu3.1 deb hostname 3.23+nmu2ubuntu2 deb init-system-helpers 1.66ubuntu1 deb -jq 1.7.1-3ubuntu0.24.04.1 deb +jq 1.7.1-3ubuntu0.24.04.2 deb keyboxd 2.4.4-2ubuntu17.4 deb krb5-locales 1.20.1-6ubuntu2.6 deb libacl1 2.3.2-1build1.1 deb @@ -66,10 +66,10 @@ libgpg-error0 1.47-3build2.1 deb libgssapi-krb5-2 1.20.1-6ubuntu2.6 deb libhogweed6t64 3.9.1-2.2build1.1 deb libidn2-0 2.3.7-2build1.1 deb -libjq1 1.7.1-3ubuntu0.24.04.1 deb +libjq1 1.7.1-3ubuntu0.24.04.2 deb libk5crypto3 1.20.1-6ubuntu2.6 deb libkeyutils1 1.6.3-3build1 deb -libkmod2 31+20240202-2ubuntu7.1 deb +libkmod2 31+20240202-2ubuntu7.2 deb libkrb5-3 1.20.1-6ubuntu2.6 deb libkrb5support0 1.20.1-6ubuntu2.6 deb libksba8 1.6.6-1build1 deb From 3faea15cf31915e16f38111665a862fbb52c0efc Mon Sep 17 00:00:00 2001 From: BuildTools <unconfigured@null.spigotmc.org> Date: Sat, 9 May 2026 10:03:33 +0200 Subject: [PATCH 512/514] ci: add forgejo actions build workflow --- .forgejo/workflows/build.yml | 46 ++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 .forgejo/workflows/build.yml diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml new file mode 100644 index 0000000..71e6389 --- /dev/null +++ b/.forgejo/workflows/build.yml @@ -0,0 +1,46 @@ +name: Build and push image + +on: + push: + branches: [master] + schedule: + - cron: '0 4 * * *' # daily, picks up LSIO base image updates + workflow_dispatch: + +jobs: + build: + runs-on: docker + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + token: ${{ secrets.PUSH_TOKEN }} + + - name: Merge upstream + run: | + git config user.name "forgejo-runner" + git config user.email "runner@forge.jannis.wtf" + git remote add upstream https://github.com/linuxserver/docker-plex + git fetch upstream + git merge upstream/master --no-edit + git push origin master + + - name: Set up Buildx + uses: docker/setup-buildx-action@v3 + + - name: Login to Forgejo registry + uses: docker/login-action@v3 + with: + registry: git.example.com + username: ${{ secrets.REGISTRY_USER }} + password: ${{ secrets.REGISTRY_TOKEN }} + + - name: Build and push + uses: docker/build-push-action@v5 + with: + context: . + push: true + tags: | + forge.jannis.wtf/fej/plex-wireguard:latest + forge.jannis.wtf/fej/plex-wireguard:${{ github.sha }} From 2d16c92cb3d95145bced7e44256cb245e2317c7f Mon Sep 17 00:00:00 2001 From: BuildTools <unconfigured@null.spigotmc.org> Date: Sat, 9 May 2026 10:30:50 +0200 Subject: [PATCH 513/514] fix pipeline --- .forgejo/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index 71e6389..1a1fb83 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -14,6 +14,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 with: + ref: master fetch-depth: 0 token: ${{ secrets.PUSH_TOKEN }} @@ -21,6 +22,8 @@ jobs: run: | git config user.name "forgejo-runner" git config user.email "runner@forge.jannis.wtf" + git fetch origin master + git reset --hard origin/master git remote add upstream https://github.com/linuxserver/docker-plex git fetch upstream git merge upstream/master --no-edit From 492da39dea5c38bdfc7b1398b39e2418e193e0f4 Mon Sep 17 00:00:00 2001 From: fej <hi@jannis.wtf> Date: Sat, 9 May 2026 10:34:17 +0200 Subject: [PATCH 514/514] Update .forgejo/workflows/build.yml --- .forgejo/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index 1a1fb83..7152c11 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -35,7 +35,7 @@ jobs: - name: Login to Forgejo registry uses: docker/login-action@v3 with: - registry: git.example.com + registry: forge.jannis.wtf username: ${{ secrets.REGISTRY_USER }} password: ${{ secrets.REGISTRY_TOKEN }} @@ -46,4 +46,4 @@ jobs: push: true tags: | forge.jannis.wtf/fej/plex-wireguard:latest - forge.jannis.wtf/fej/plex-wireguard:${{ github.sha }} + forge.jannis.wtf/fej/plex-wireguard:${{ github.sha }} \ No newline at end of file