From 164f134e6cb80a62731664fb90ef401eafe59ba9 Mon Sep 17 00:00:00 2001 From: cyrus104 Date: Sat, 21 Feb 2026 15:54:20 -0500 Subject: [PATCH 1/4] feat: add Docker plugin entry --- manifest.json | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 46758e5..bf14450 100644 --- a/manifest.json +++ b/manifest.json @@ -294,7 +294,22 @@ "www-data ALL=(ALL) NOPASSWD:/bin/cp /tmp/nodogsplash.conf /etc/nodogsplash/nodogsplash.conf", "www-data ALL=(ALL) NOPASSWD:/usr/bin/ndsctl *" ] + }, + { + "id": "9", + "name": "Docker", + "version": "v1.0.0", + "description": "A Docker container management plugin for RaspAP", + "author": "RaspAP", + "author_uri": "https://github.com/RaspAP", + "plugin_uri": "https://github.com/cyrus104/raspap-insiders/tree/feat/docker-plugin/plugins-available/Docker", + "plugin_docs": "https://docs.raspap.com/docker", + "license": "GPL-3.0", + "namespace": "RaspAP\\Plugins\\Docker", + "icon": "fab fa-docker", + "install_path": "plugins-available", + "manifest_version": "1.0", + "default_locale": "en_US" } ] -} - +} \ No newline at end of file From 7c19f25deb6fa67e555c62de5e312ad5bab9f359 Mon Sep 17 00:00:00 2001 From: cyrus104 Date: Sat, 21 Feb 2026 22:39:31 -0500 Subject: [PATCH 2/4] chore: update Docker plugin URI and install path --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index bf14450..3a5f15a 100644 --- a/manifest.json +++ b/manifest.json @@ -302,12 +302,12 @@ "description": "A Docker container management plugin for RaspAP", "author": "RaspAP", "author_uri": "https://github.com/RaspAP", - "plugin_uri": "https://github.com/cyrus104/raspap-insiders/tree/feat/docker-plugin/plugins-available/Docker", + "plugin_uri": "https://github.com/cyrus104/docker-plugin", "plugin_docs": "https://docs.raspap.com/docker", "license": "GPL-3.0", "namespace": "RaspAP\\Plugins\\Docker", "icon": "fab fa-docker", - "install_path": "plugins-available", + "install_path": "plugins", "manifest_version": "1.0", "default_locale": "en_US" } From 283c1f6c0b6cf402aec7cc17ea7478cd70bd47c2 Mon Sep 17 00:00:00 2001 From: cyrus104 Date: Sun, 22 Feb 2026 02:06:44 -0500 Subject: [PATCH 3/4] fix: complete Docker registry entry and correct authorship - Fix author/author_uri: RaspAP -> cyrus104 - Add missing installation fields: keys (Docker GPG/apt), dependencies (docker-ce, docker-ce-cli, containerd.io, buildx, compose), configuration, sudoers (5 www-data NOPASSWD rules), and javascript source reference - Registry entry was previously a metadata-only stub; now matches full format of other plugins that install packages (Tailscale, SocksProxy, etc.) --- manifest.json | 37 ++++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/manifest.json b/manifest.json index 3a5f15a..0894016 100644 --- a/manifest.json +++ b/manifest.json @@ -300,8 +300,8 @@ "name": "Docker", "version": "v1.0.0", "description": "A Docker container management plugin for RaspAP", - "author": "RaspAP", - "author_uri": "https://github.com/RaspAP", + "author": "cyrus104", + "author_uri": "https://github.com/cyrus104", "plugin_uri": "https://github.com/cyrus104/docker-plugin", "plugin_docs": "https://docs.raspap.com/docker", "license": "GPL-3.0", @@ -309,7 +309,38 @@ "icon": "fab fa-docker", "install_path": "plugins", "manifest_version": "1.0", - "default_locale": "en_US" + "default_locale": "en_US", + "keys": [ + { + "key_url": "https://download.docker.com/linux/debian/gpg", + "keyring": "/usr/share/keyrings/docker-archive-keyring.gpg", + "repo": "https://download.docker.com/linux/debian", + "sources": "/etc/apt/sources.list.d/docker.list" + } + ], + "dependencies": { + "docker-ce": "latest", + "docker-ce-cli": "latest", + "containerd.io": "latest", + "docker-buildx-plugin": "latest", + "docker-compose-plugin": "latest" + }, + "configuration": [ + { + "source": "config/.gitkeep", + "destination": "/etc/raspap/docker/compose/.gitkeep" + } + ], + "sudoers": [ + "www-data ALL=(ALL) NOPASSWD:/usr/bin/docker *", + "www-data ALL=(ALL) NOPASSWD:/usr/bin/docker compose *", + "www-data ALL=(ALL) NOPASSWD:/bin/systemctl start docker", + "www-data ALL=(ALL) NOPASSWD:/bin/systemctl stop docker", + "www-data ALL=(ALL) NOPASSWD:/bin/ls *" + ], + "javascript": { + "source": "app/js/Docker.js" + } } ] } \ No newline at end of file From e6e710f49640846ee106f86566367f0f00e7727c Mon Sep 17 00:00:00 2001 From: cyrus104 Date: Mon, 23 Feb 2026 18:51:19 -0500 Subject: [PATCH 4/4] fix: update Docker plugin keys to use modern keyring path and local repo file Replace deprecated /usr/share/keyrings/ keyring path with the modern /etc/apt/keyrings/docker.asc location. Replace the bare URL repo field with a local config/docker.list reference, enabling REPLACEME_CODENAME token substitution via plugin_vars.json so the correct Debian codename is resolved at install time rather than hardcoded. --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 0894016..8ef0595 100644 --- a/manifest.json +++ b/manifest.json @@ -313,8 +313,8 @@ "keys": [ { "key_url": "https://download.docker.com/linux/debian/gpg", - "keyring": "/usr/share/keyrings/docker-archive-keyring.gpg", - "repo": "https://download.docker.com/linux/debian", + "keyring": "/etc/apt/keyrings/docker.asc", + "repo": "config/docker.list", "sources": "/etc/apt/sources.list.d/docker.list" } ],