From 11a58f41db208955390420e4ed9326e88e6dc222 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Mon, 22 Apr 2024 17:45:29 +0100 Subject: [PATCH 1/5] Fix main filename, copy config template on start --- root/etc/s6-overlay/s6-rc.d/init-pmm-config/run | 2 ++ root/etc/s6-overlay/s6-rc.d/init-pmm-oneshot/run | 8 ++++---- root/etc/s6-overlay/s6-rc.d/svc-pmm/run | 8 ++++---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/root/etc/s6-overlay/s6-rc.d/init-pmm-config/run b/root/etc/s6-overlay/s6-rc.d/init-pmm-config/run index efea851..ce0aedd 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-pmm-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-pmm-config/run @@ -1,6 +1,8 @@ #!/usr/bin/with-contenv bash # shellcheck shell=bash +cp /app/pmm/config/config.yml.template /config + # permissions lsiown -R abc:abc \ /config diff --git a/root/etc/s6-overlay/s6-rc.d/init-pmm-oneshot/run b/root/etc/s6-overlay/s6-rc.d/init-pmm-oneshot/run index 26127eb..bd938db 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-pmm-oneshot/run +++ b/root/etc/s6-overlay/s6-rc.d/init-pmm-oneshot/run @@ -23,11 +23,11 @@ if [[ -n "${CONFIG_FILE}" ]] && [[ ! -e "${CONFIG_FILE}" ]]; then fi if { echo "${CLI_OPTIONS[@]}" | grep -qPo '([\s]|^)(--run|-r)([\s]|$)'; } && { echo "${CLI_OPTIONS[@]}" | grep -qPo '([\s]|^)(--config|-c)([\s])(.+\/[^\/]+)\.(yml|yaml)'; }; then - s6-setuidgid abc python3 /app/pmm/plex_meta_manager.py "${CLI_OPTIONS[@]}" + s6-setuidgid abc python3 /app/pmm/kometa.py "${CLI_OPTIONS[@]}" elif echo "${CLI_OPTIONS[@]}" | grep -qPo '([\s]|^)(--run|-r)([\s]|$)'; then - s6-setuidgid abc python3 /app/pmm/plex_meta_manager.py --config "${CONFIG_FILE}" "${CLI_OPTIONS[@]}" + s6-setuidgid abc python3 /app/pmm/kometa.py --config "${CONFIG_FILE}" "${CLI_OPTIONS[@]}" elif echo "${CLI_OPTIONS[@]}" | grep -qPo '([\s]|^)(--config|-c)([\s])(.+\/[^\/]+)\.(yml|yaml)'; then - s6-setuidgid abc python3 /app/pmm/plex_meta_manager.py --run "${CLI_OPTIONS[@]}" + s6-setuidgid abc python3 /app/pmm/kometa.py --run "${CLI_OPTIONS[@]}" else - s6-setuidgid abc python3 /app/pmm/plex_meta_manager.py --run --config "${CONFIG_FILE}" "${CLI_OPTIONS[@]}" + s6-setuidgid abc python3 /app/pmm/kometa.py --run --config "${CONFIG_FILE}" "${CLI_OPTIONS[@]}" fi diff --git a/root/etc/s6-overlay/s6-rc.d/svc-pmm/run b/root/etc/s6-overlay/s6-rc.d/svc-pmm/run index c169aba..fdf2a3d 100755 --- a/root/etc/s6-overlay/s6-rc.d/svc-pmm/run +++ b/root/etc/s6-overlay/s6-rc.d/svc-pmm/run @@ -23,14 +23,14 @@ fi if { echo "${CLI_OPTIONS[@]}" | grep -qPo '([\s]|^)(--time|-t)([\s])'; } && { echo "${CLI_OPTIONS[@]}" | grep -qPo '([\s]|^)(--config|-c)([\s])(.+\/[^\/]+)\.(yml|yaml)'; }; then exec \ - s6-setuidgid abc python3 /app/pmm/plex_meta_manager.py "${CLI_OPTIONS[@]}" + s6-setuidgid abc python3 /app/pmm/kometa.py "${CLI_OPTIONS[@]}" elif echo "${CLI_OPTIONS[@]}" | grep -qPo '([\s]|^)(--time|-t)([\s])'; then exec \ - s6-setuidgid abc python3 /app/pmm/plex_meta_manager.py --config "${CONFIG_FILE}" "${CLI_OPTIONS[@]}" + s6-setuidgid abc python3 /app/pmm/kometa.py --config "${CONFIG_FILE}" "${CLI_OPTIONS[@]}" elif echo "${CLI_OPTIONS[@]}" | grep -qPo '([\s]|^)(--config|-c)([\s])(.+\/[^\/]+)\.(yml|yaml)'; then exec \ - s6-setuidgid abc python3 /app/pmm/plex_meta_manager.py --time "${PMM_TIME:-03:00}" "${CLI_OPTIONS[@]}" + s6-setuidgid abc python3 /app/pmm/kometa.py --time "${PMM_TIME:-03:00}" "${CLI_OPTIONS[@]}" else exec \ - s6-setuidgid abc python3 /app/pmm/plex_meta_manager.py --config "${CONFIG_FILE}" --time "${PMM_TIME:-03:00}" "${CLI_OPTIONS[@]}" + s6-setuidgid abc python3 /app/pmm/kometa.py --config "${CONFIG_FILE}" --time "${PMM_TIME:-03:00}" "${CLI_OPTIONS[@]}" fi From 8f23082b6cbde3c4b27566145385c3f4288a349a Mon Sep 17 00:00:00 2001 From: TheSpad Date: Mon, 22 Apr 2024 17:52:13 +0100 Subject: [PATCH 2/5] Update project name and logo --- readme-vars.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/readme-vars.yml b/readme-vars.yml index dad8f65..51d95da 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -1,9 +1,9 @@ --- # project information -project_name: plex-meta-manager -project_url: "https://github.com/meisnate12/Plex-Meta-Manager" -project_logo: "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/plex-meta-manager-banner.png" +project_name: kometa +project_url: "https://github.com/Kometa-Team/Kometa" +project_logo: "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/kometa-banner.png" project_blurb: "[{{ project_name|capitalize }}]({{ project_url }}) is a Python 3 script that can be continuously run using YAML configuration files to update on a schedule the metadata of the movies, shows, and collections in your libraries as well as automatically build collections based on various methods all detailed in the wiki." project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}" project_blurb_optional_extras_enabled: false From 141647d7d941314cdd93a62d08627ad043a45485 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Mon, 22 Apr 2024 17:57:50 +0100 Subject: [PATCH 3/5] Don't change project name, stuff breaks --- Jenkinsfile | 6 +++--- README.md | 4 ++-- readme-vars.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 756c0f9..b77beac 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -531,7 +531,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-meta-manager\" \ - --label \"org.opencontainers.image.description=[Plex-meta-manager](https://github.com/meisnate12/Plex-Meta-Manager) is a Python 3 script that can be continuously run using YAML configuration files to update on a schedule the metadata of the movies, shows, and collections in your libraries as well as automatically build collections based on various methods all detailed in the wiki.\" \ + --label \"org.opencontainers.image.description=[Plex-meta-manager](https://github.com/Kometa-Team/Kometa) is a Python 3 script that can be continuously run using YAML configuration files to update on a schedule the metadata of the movies, shows, and collections in your libraries as well as automatically build collections based on various methods all detailed in the wiki.\" \ --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} ." } @@ -562,7 +562,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-meta-manager\" \ - --label \"org.opencontainers.image.description=[Plex-meta-manager](https://github.com/meisnate12/Plex-Meta-Manager) is a Python 3 script that can be continuously run using YAML configuration files to update on a schedule the metadata of the movies, shows, and collections in your libraries as well as automatically build collections based on various methods all detailed in the wiki.\" \ + --label \"org.opencontainers.image.description=[Plex-meta-manager](https://github.com/Kometa-Team/Kometa) is a Python 3 script that can be continuously run using YAML configuration files to update on a schedule the metadata of the movies, shows, and collections in your libraries as well as automatically build collections based on various methods all detailed in the wiki.\" \ --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} ." } @@ -590,7 +590,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-meta-manager\" \ - --label \"org.opencontainers.image.description=[Plex-meta-manager](https://github.com/meisnate12/Plex-Meta-Manager) is a Python 3 script that can be continuously run using YAML configuration files to update on a schedule the metadata of the movies, shows, and collections in your libraries as well as automatically build collections based on various methods all detailed in the wiki.\" \ + --label \"org.opencontainers.image.description=[Plex-meta-manager](https://github.com/Kometa-Team/Kometa) is a Python 3 script that can be continuously run using YAML configuration files to update on a schedule the metadata of the movies, shows, and collections in your libraries as well as automatically build collections based on various methods all detailed in the wiki.\" \ --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 65faf1a..21823b4 100644 --- a/README.md +++ b/README.md @@ -39,9 +39,9 @@ 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-meta-manager%2Fjob%2Fnightly%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-plex-meta-manager/job/nightly/) [![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-meta-manager%2Flatest%2Fci-status.yml)](https://ci-tests.linuxserver.io/linuxserver/plex-meta-manager/latest/index.html) -[Plex-meta-manager](https://github.com/meisnate12/Plex-Meta-Manager) is a Python 3 script that can be continuously run using YAML configuration files to update on a schedule the metadata of the movies, shows, and collections in your libraries as well as automatically build collections based on various methods all detailed in the wiki. +[Plex-meta-manager](https://github.com/Kometa-Team/Kometa) is a Python 3 script that can be continuously run using YAML configuration files to update on a schedule the metadata of the movies, shows, and collections in your libraries as well as automatically build collections based on various methods all detailed in the wiki. -[![plex-meta-manager](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/plex-meta-manager-banner.png)](https://github.com/meisnate12/Plex-Meta-Manager) +[![plex-meta-manager](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/kometa-banner.png)](https://github.com/Kometa-Team/Kometa) ## Supported Architectures diff --git a/readme-vars.yml b/readme-vars.yml index 51d95da..65ee705 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -1,7 +1,7 @@ --- # project information -project_name: kometa +project_name: plex-meta-manager project_url: "https://github.com/Kometa-Team/Kometa" project_logo: "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/kometa-banner.png" project_blurb: "[{{ project_name|capitalize }}]({{ project_url }}) is a Python 3 script that can be continuously run using YAML configuration files to update on a schedule the metadata of the movies, shows, and collections in your libraries as well as automatically build collections based on various methods all detailed in the wiki." From 434823f81eed429bedfaead32fa131aa6b0d1709 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Mon, 22 Apr 2024 17:58:28 +0100 Subject: [PATCH 4/5] Update project description --- Jenkinsfile | 6 +++--- README.md | 2 +- readme-vars.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b77beac..c209015 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -531,7 +531,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-meta-manager\" \ - --label \"org.opencontainers.image.description=[Plex-meta-manager](https://github.com/Kometa-Team/Kometa) is a Python 3 script that can be continuously run using YAML configuration files to update on a schedule the metadata of the movies, shows, and collections in your libraries as well as automatically build collections based on various methods all detailed in the wiki.\" \ + --label \"org.opencontainers.image.description=[Plex-meta-manager](https://github.com/Kometa-Team/Kometa) is a powerful tool designed to give you complete control over your media libraries. With Plex-meta-manager, you can take your customization to the next level, with granular control over metadata, collections, overlays, and much more.\" \ --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} ." } @@ -562,7 +562,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-meta-manager\" \ - --label \"org.opencontainers.image.description=[Plex-meta-manager](https://github.com/Kometa-Team/Kometa) is a Python 3 script that can be continuously run using YAML configuration files to update on a schedule the metadata of the movies, shows, and collections in your libraries as well as automatically build collections based on various methods all detailed in the wiki.\" \ + --label \"org.opencontainers.image.description=[Plex-meta-manager](https://github.com/Kometa-Team/Kometa) is a powerful tool designed to give you complete control over your media libraries. With Plex-meta-manager, you can take your customization to the next level, with granular control over metadata, collections, overlays, and much more.\" \ --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} ." } @@ -590,7 +590,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-meta-manager\" \ - --label \"org.opencontainers.image.description=[Plex-meta-manager](https://github.com/Kometa-Team/Kometa) is a Python 3 script that can be continuously run using YAML configuration files to update on a schedule the metadata of the movies, shows, and collections in your libraries as well as automatically build collections based on various methods all detailed in the wiki.\" \ + --label \"org.opencontainers.image.description=[Plex-meta-manager](https://github.com/Kometa-Team/Kometa) is a powerful tool designed to give you complete control over your media libraries. With Plex-meta-manager, you can take your customization to the next level, with granular control over metadata, collections, overlays, and much more.\" \ --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 21823b4..122e98e 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,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-meta-manager%2Fjob%2Fnightly%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-plex-meta-manager/job/nightly/) [![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-meta-manager%2Flatest%2Fci-status.yml)](https://ci-tests.linuxserver.io/linuxserver/plex-meta-manager/latest/index.html) -[Plex-meta-manager](https://github.com/Kometa-Team/Kometa) is a Python 3 script that can be continuously run using YAML configuration files to update on a schedule the metadata of the movies, shows, and collections in your libraries as well as automatically build collections based on various methods all detailed in the wiki. +[Plex-meta-manager](https://github.com/Kometa-Team/Kometa) is a powerful tool designed to give you complete control over your media libraries. With Plex-meta-manager, you can take your customization to the next level, with granular control over metadata, collections, overlays, and much more. [![plex-meta-manager](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/kometa-banner.png)](https://github.com/Kometa-Team/Kometa) diff --git a/readme-vars.yml b/readme-vars.yml index 65ee705..242f005 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -4,7 +4,7 @@ project_name: plex-meta-manager project_url: "https://github.com/Kometa-Team/Kometa" project_logo: "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/kometa-banner.png" -project_blurb: "[{{ project_name|capitalize }}]({{ project_url }}) is a Python 3 script that can be continuously run using YAML configuration files to update on a schedule the metadata of the movies, shows, and collections in your libraries as well as automatically build collections based on various methods all detailed in the wiki." +project_blurb: "[{{ project_name|capitalize }}]({{ project_url }}) is a powerful tool designed to give you complete control over your media libraries. With {{ project_name|capitalize }}, you can take your customization to the next level, with granular control over metadata, collections, overlays, and much more." project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}" project_blurb_optional_extras_enabled: false From 71e3bc111b266ded7005e8ff31dd671caabf56ed Mon Sep 17 00:00:00 2001 From: thespad Date: Mon, 22 Apr 2024 19:14:16 +0100 Subject: [PATCH 5/5] Deprecate --- readme-vars.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/readme-vars.yml b/readme-vars.yml index 242f005..ba47861 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -3,11 +3,16 @@ # project information project_name: plex-meta-manager project_url: "https://github.com/Kometa-Team/Kometa" -project_logo: "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/kometa-banner.png" +project_logo: "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/plex-meta-manager-banner.png" project_blurb: "[{{ project_name|capitalize }}]({{ project_url }}) is a powerful tool designed to give you complete control over your media libraries. With {{ project_name|capitalize }}, you can take your customization to the next level, with granular control over metadata, collections, overlays, and much more." project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}" project_blurb_optional_extras_enabled: false +project_deprecation_status: true +project_deprecation_message: | + Please migrate to our Kometa image instead: + https://github.com/linuxserver/docker-kometa + # supported architectures available_architectures: - { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"} @@ -61,6 +66,7 @@ app_setup_block: | # changelog changelogs: + - { date: "22.04.24:", desc: "Deprecate."} - { date: "22.04.24:", desc: "Update backend to reflect upstream repo rename."} - { date: "23.12.23:", desc: "Rebase to Alpine 3.19."} - { date: "10.06.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." }