From 997fb4ee7e22e67c3b89f26450f1bb2003f316ec Mon Sep 17 00:00:00 2001 From: Stellar Rounin Date: Sun, 12 Apr 2026 16:33:16 -0600 Subject: [PATCH 01/11] feat(: add wallabag blueprint --- blueprints/wallabag/docker-compose.yml | 44 +++++++++++++++++++++++++ blueprints/wallabag/template.toml | 11 +++++++ blueprints/wallabag/wallabag.png | Bin 0 -> 13 bytes meta.json | 18 ++++++++++ 4 files changed, 73 insertions(+) create mode 100644 blueprints/wallabag/docker-compose.yml create mode 100644 blueprints/wallabag/template.toml create mode 100644 blueprints/wallabag/wallabag.png diff --git a/blueprints/wallabag/docker-compose.yml b/blueprints/wallabag/docker-compose.yml new file mode 100644 index 000000000..cd6bfc7b9 --- /dev/null +++ b/blueprints/wallabag/docker-compose.yml @@ -0,0 +1,44 @@ +services: + wallabag: + image: wallabag/wallabag + environment: + - MYSQL_ROOT_PASSWORD=wallaroot + - SYMFONY__ENV__DATABASE_DRIVER=pdo_mysql + - SYMFONY__ENV__DATABASE_HOST=db + - SYMFONY__ENV__DATABASE_PORT=3306 + - SYMFONY__ENV__DATABASE_NAME=wallabag + - SYMFONY__ENV__DATABASE_USER=wallabag + - SYMFONY__ENV__DATABASE_PASSWORD=wallapass + - SYMFONY__ENV__DATABASE_CHARSET=utf8mb4 + - 'SYMFONY__ENV__DATABASE_TABLE_PREFIX="wallabag_"' + - 'SYMFONY__ENV__MAILER_DSN=smtp://127.0.0.1' + - SYMFONY__ENV__FROM_EMAIL=wallabag@example.com + - 'SYMFONY__ENV__DOMAIN_NAME=https://wallabag.dominio.com' + - 'SYMFONY__ENV__SERVER_NAME="wallabag"' + volumes: + - '/opt/wallabag/images:/var/www/wallabag/web/assets/images' + depends_on: + - db + - redis + + db: + image: mariadb + restart: unless-stopped + environment: + - MYSQL_ROOT_PASSWORD=wallaroot + volumes: + - '/opt/wallabag/data:/var/lib/mysql' + healthcheck: + test: ["CMD", "/usr/local/bin/healthcheck.sh", "--innodb_initialized"] + interval: 20s + timeout: 3s + retries: 5 + + redis: + image: 'redis:alpine' + restart: unless-stopped + healthcheck: + test: ["CMD", "redis-cli", "ping"] + interval: 20s + timeout: 3s + retries: 5 \ No newline at end of file diff --git a/blueprints/wallabag/template.toml b/blueprints/wallabag/template.toml new file mode 100644 index 000000000..6259a7b3a --- /dev/null +++ b/blueprints/wallabag/template.toml @@ -0,0 +1,11 @@ +[variables] +main_domain = "${domain}" + +[config] +env = {} +mounts = [] + +[[config.domains]] +serviceName = "wallabag" +host = "${main_domain}" +port = 3000 \ No newline at end of file diff --git a/blueprints/wallabag/wallabag.png b/blueprints/wallabag/wallabag.png new file mode 100644 index 0000000000000000000000000000000000000000..ba5213fb23dc34699739844ece8c4e1d3730a40f GIT binary patch literal 13 UcmaFAe{X=FJC_s}0|NsW048?>i2wiq literal 0 HcmV?d00001 diff --git a/meta.json b/meta.json index 3ae0cb5ef..b212f8f72 100644 --- a/meta.json +++ b/meta.json @@ -6497,6 +6497,24 @@ "project-management" ] }, + { + "id": "wallabag", + "name": "wallabag", + "version": "latest", + "description": "", + "logo": "wallabag.png", + "links": { + "github": "https://github.com/wallabag/wallabag", + "website": "https://wallabag.org/", + "docs": "https://doc.wallabag.org/" + }, + "tags": [ + "bookmarks", + "articles", + "rss", + "content" + ] + }, { "id": "wallos", "name": "Wallos", From cc81777a24ec42b461ab72f507c67b505d3df89f Mon Sep 17 00:00:00 2001 From: Stellar Rounin Date: Sun, 12 Apr 2026 16:44:56 -0600 Subject: [PATCH 02/11] fix: Add version & restart --- blueprints/wallabag/docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/blueprints/wallabag/docker-compose.yml b/blueprints/wallabag/docker-compose.yml index cd6bfc7b9..8c766a1bc 100644 --- a/blueprints/wallabag/docker-compose.yml +++ b/blueprints/wallabag/docker-compose.yml @@ -1,6 +1,8 @@ +version: "3.8" services: wallabag: image: wallabag/wallabag + restart: unless-stopped environment: - MYSQL_ROOT_PASSWORD=wallaroot - SYMFONY__ENV__DATABASE_DRIVER=pdo_mysql From 1c18c7f15900a0000abe0c50c356fd5c34847bc1 Mon Sep 17 00:00:00 2001 From: Stellar Rounin Date: Sun, 12 Apr 2026 16:48:30 -0600 Subject: [PATCH 03/11] fix: add description to meta json --- meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta.json b/meta.json index b212f8f72..bae11d23f 100644 --- a/meta.json +++ b/meta.json @@ -6501,7 +6501,7 @@ "id": "wallabag", "name": "wallabag", "version": "latest", - "description": "", + "description": "wallabag is a self hostable application for saving web pages: Save and classify articles", "logo": "wallabag.png", "links": { "github": "https://github.com/wallabag/wallabag", From ac1f131973e1c1da13a410835c2b2386a507977b Mon Sep 17 00:00:00 2001 From: Stellar Rounin Date: Sun, 12 Apr 2026 16:49:25 -0600 Subject: [PATCH 04/11] fix: Fix env & port in template toml --- blueprints/wallabag/template.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/blueprints/wallabag/template.toml b/blueprints/wallabag/template.toml index 6259a7b3a..8f889c854 100644 --- a/blueprints/wallabag/template.toml +++ b/blueprints/wallabag/template.toml @@ -2,10 +2,10 @@ main_domain = "${domain}" [config] -env = {} +env = [] mounts = [] [[config.domains]] serviceName = "wallabag" host = "${main_domain}" -port = 3000 \ No newline at end of file +port = 80 \ No newline at end of file From f28a263cf0f3e0bf5b3c60569e0387d1e6aff729 Mon Sep 17 00:00:00 2001 From: Stellar Rounin Date: Sun, 12 Apr 2026 16:50:11 -0600 Subject: [PATCH 05/11] fix: Image --- blueprints/wallabag/wallabag.png | Bin 13 -> 2605 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/blueprints/wallabag/wallabag.png b/blueprints/wallabag/wallabag.png index ba5213fb23dc34699739844ece8c4e1d3730a40f..2dada55dbb848ffc1ea72e4e7d8efb17439ef01f 100644 GIT binary patch literal 2605 zcmaJ@X;@P07T#c*SteFQ{{24SajHOo?|leg4E7$6O2i$Q?G75am42A>@Wx`S+Pn2$<`B6E`%Q4W2$DvC4@%ka2!4n_LW&?GzUY!P`-L2@v73>=R|VK-XY*w|RYaTqKHjlrR@I3(7Fv=K+bVBlXL zgeIGq8$fcW(ZA->L}WyeR4O8&(c$6YsPK&_p*RqYB@&4<8aNzMgFs3m1yXhdQXnz^ zra%KF95GKMJI+n_lLp~&qxu7b_XTGP%%f-xB&B+R3eh27-UO@Vo#wkh&SUQD3A>goBr;SuPo=T+= z9C0`z(Takne&f=FoKQX}kbdKG|KU=9%AFYnzDSdq28wxMAeSx{^5I{uOyd2(3*O1m z%7*UrbG@%z?hm|ty6ct&);+A|$mK!BMJ4or&{$zK9HS(UQgJ7K;Q{37{TR>^_T*^j*H!s`6AUwI{z zKzrXKju863bN5TzilFu4nt;)?Yb5GaPL;D?TV+n(k~5@A$5nc_TE-l za+XGgBfU=5oGdo>XSJ$FjmMZ5rYZ<)yLnq=W;*xNXbtKnXR}~yL*SgLFu%TSRsGwT z{Yvc$OSrJT1f#UFQ?P^fV?V(FeOce`{}k?C7c=k4ed}a~k*Ahw&OGEr?M|&UKc6wv zWEMnGpLP9}?d?F=btqmd9lsVNn;it5U)E7(;}2>%I$t?aJd}POaKJRLfu) zUg*-yrWeZ$+B5F#Yq%H6qRjqvon^&c?#i9p#(neyC0144dt6MQ1*`#KQjfXK3x1DGhgLO%!JbakqO_NvlXn_Id5OCY?1a=STfzVd{B67kRLjA@8M|LWqsTEkmk zv&1o@&aU;ohs{;x)vMZLlM=2DR*t?CBQqX|TqS`aO&E<8opnk4~SQGcJCS z){(s?_ua3I=wjt$+^XS}fb{93{OQ8HXRP_vD4zd{yf^lQd>=`^cjePca+wPC-1W3i zS8&qDxhGdXp+?iMHddAIH87#oJe^X0dc1c-TjCyHtJu$hg`=l$^n3l%Yu24O6?eb< z8Fl=?)9~Jf*Q!6nLm=A~^GY_HAe-dB&BGi7#tO7Pnl7C+>upnl*#Tq>491$ztk@-A z4?k|5mAtz2#D~YO8%)o-nrajDyc`nigR^9xSI8&XM(v$sp{k<~JqWJJm({-LoOs=_s$)axSytv279`n_6lUfHq9~)fbmU(<~ zz5+VDuli!&HG~uzdlYIX9x;)ZJ-DO}N98Pp#pprcyr{tsBY4VcZAVMSBY|0;s1l(A z1lYG$&&tN9Pm|A&2hg6-Ggaq^z86Ly2~BPW1bP=uw!K|HrW&eVoH$`X>4+`C+z@Gb zuy$Y|NbQb5;a7;MB}jt?yE?KjE~&wWpQk_u4t=yXAEgmZJjRDSkYQSJ$4Y(WiF zR+s+j$kpN=oiQ$JK$4VY`21G%5qrgC zO8mg|sb*J~<_Spa^A(dlc$49Pu`##oc_YxpKt=yV4tMl?&Cwknlyu-Na@84Tz0~1% z;K@ljEohrnj!Fip3y>EF*hyXyK0+IGL-sg#>+aM^oE`JT9-;#i2wiq From 5bb5f853f8a1e0fca08e211e1956603a4fbe4974 Mon Sep 17 00:00:00 2001 From: Stellar Rounin Date: Sun, 12 Apr 2026 16:54:24 -0600 Subject: [PATCH 06/11] fix: Change password string for helper --- blueprints/wallabag/docker-compose.yml | 4 ++-- blueprints/wallabag/template.toml | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/blueprints/wallabag/docker-compose.yml b/blueprints/wallabag/docker-compose.yml index 8c766a1bc..0c61247d7 100644 --- a/blueprints/wallabag/docker-compose.yml +++ b/blueprints/wallabag/docker-compose.yml @@ -4,13 +4,13 @@ services: image: wallabag/wallabag restart: unless-stopped environment: - - MYSQL_ROOT_PASSWORD=wallaroot + - MYSQL_ROOT_PASSWORD=${ROOT_PASSWORD} - SYMFONY__ENV__DATABASE_DRIVER=pdo_mysql - SYMFONY__ENV__DATABASE_HOST=db - SYMFONY__ENV__DATABASE_PORT=3306 - SYMFONY__ENV__DATABASE_NAME=wallabag - SYMFONY__ENV__DATABASE_USER=wallabag - - SYMFONY__ENV__DATABASE_PASSWORD=wallapass + - SYMFONY__ENV__DATABASE_PASSWORD=${DB_PASSWORD} - SYMFONY__ENV__DATABASE_CHARSET=utf8mb4 - 'SYMFONY__ENV__DATABASE_TABLE_PREFIX="wallabag_"' - 'SYMFONY__ENV__MAILER_DSN=smtp://127.0.0.1' diff --git a/blueprints/wallabag/template.toml b/blueprints/wallabag/template.toml index 8f889c854..6a499e64e 100644 --- a/blueprints/wallabag/template.toml +++ b/blueprints/wallabag/template.toml @@ -1,5 +1,7 @@ [variables] main_domain = "${domain}" +db_password = "${password:16}" +root_password = "${password:16}" [config] env = [] @@ -8,4 +10,6 @@ mounts = [] [[config.domains]] serviceName = "wallabag" host = "${main_domain}" -port = 80 \ No newline at end of file +port = 80 +DB_PASSWORD = "${db_password}" +ROOT_PASSWORD = "${root_password}" \ No newline at end of file From fb8fb08770f0cca43baff057b998a5453247fcb4 Mon Sep 17 00:00:00 2001 From: Stellar Rounin Date: Sun, 12 Apr 2026 16:56:07 -0600 Subject: [PATCH 07/11] fix: Change domain string for helper --- blueprints/wallabag/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blueprints/wallabag/docker-compose.yml b/blueprints/wallabag/docker-compose.yml index 0c61247d7..d4b0165d7 100644 --- a/blueprints/wallabag/docker-compose.yml +++ b/blueprints/wallabag/docker-compose.yml @@ -15,7 +15,7 @@ services: - 'SYMFONY__ENV__DATABASE_TABLE_PREFIX="wallabag_"' - 'SYMFONY__ENV__MAILER_DSN=smtp://127.0.0.1' - SYMFONY__ENV__FROM_EMAIL=wallabag@example.com - - 'SYMFONY__ENV__DOMAIN_NAME=https://wallabag.dominio.com' + - 'SYMFONY__ENV__DOMAIN_NAME=https://${DOMAIN}' - 'SYMFONY__ENV__SERVER_NAME="wallabag"' volumes: - '/opt/wallabag/images:/var/www/wallabag/web/assets/images' From eef4c57f79c0a1f2103f5dc06d7c7a7c2818a913 Mon Sep 17 00:00:00 2001 From: Stellar Rounin Date: Sun, 12 Apr 2026 16:57:45 -0600 Subject: [PATCH 08/11] fix: Change absolute for relative paths --- blueprints/wallabag/docker-compose.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/blueprints/wallabag/docker-compose.yml b/blueprints/wallabag/docker-compose.yml index d4b0165d7..70fdd0083 100644 --- a/blueprints/wallabag/docker-compose.yml +++ b/blueprints/wallabag/docker-compose.yml @@ -18,7 +18,7 @@ services: - 'SYMFONY__ENV__DOMAIN_NAME=https://${DOMAIN}' - 'SYMFONY__ENV__SERVER_NAME="wallabag"' volumes: - - '/opt/wallabag/images:/var/www/wallabag/web/assets/images' + - './images:/var/www/wallabag/web/assets/images' depends_on: - db - redis @@ -27,11 +27,11 @@ services: image: mariadb restart: unless-stopped environment: - - MYSQL_ROOT_PASSWORD=wallaroot + - MYSQL_ROOT_PASSWORD=${ROOT_PASSWORD} # Best practice to keep this synced with wallabag volumes: - - '/opt/wallabag/data:/var/lib/mysql' + - './data:/var/lib/mysql' healthcheck: - test: ["CMD", "/usr/local/bin/healthcheck.sh", "--innodb_initialized"] + test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"] interval: 20s timeout: 3s retries: 5 From 186de04aed807f2baa39b7e04169a051a95281e0 Mon Sep 17 00:00:00 2001 From: Stellar Rounin Date: Sun, 12 Apr 2026 17:01:27 -0600 Subject: [PATCH 09/11] fix: Add specific verision to meta.json --- meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta.json b/meta.json index bae11d23f..d0c37240e 100644 --- a/meta.json +++ b/meta.json @@ -6500,7 +6500,7 @@ { "id": "wallabag", "name": "wallabag", - "version": "latest", + "version": "2.6.14", "description": "wallabag is a self hostable application for saving web pages: Save and classify articles", "logo": "wallabag.png", "links": { From 169a06cf45d81d76f7296b41a5205ac30d920aaf Mon Sep 17 00:00:00 2001 From: Stellar Rounin Date: Sun, 12 Apr 2026 17:03:04 -0600 Subject: [PATCH 10/11] fix --- meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta.json b/meta.json index d0c37240e..c35d9fd70 100644 --- a/meta.json +++ b/meta.json @@ -6499,7 +6499,7 @@ }, { "id": "wallabag", - "name": "wallabag", + "name": "Wallabag", "version": "2.6.14", "description": "wallabag is a self hostable application for saving web pages: Save and classify articles", "logo": "wallabag.png", From 8ae670edeafba626d26dc01e925e2ca2886dccea Mon Sep 17 00:00:00 2001 From: Stellar Rounin Date: Sun, 12 Apr 2026 17:04:59 -0600 Subject: [PATCH 11/11] fix: Delete duplicate strapi from meta json --- meta.json | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/meta.json b/meta.json index c35d9fd70..16b35e324 100644 --- a/meta.json +++ b/meta.json @@ -5952,24 +5952,6 @@ "media" ] }, - { - "id": "strapi", - "name": "Strapi", - "version": "v5.33.0", - "description": "Open-source headless CMS to build powerful APIs with built-in content management.", - "logo": "strapi.svg", - "links": { - "github": "https://github.com/strapi/strapi", - "discord": "https://discord.com/invite/strapi", - "docs": "https://docs.strapi.io", - "website": "https://strapi.io" - }, - "tags": [ - "headless", - "cms", - "content-management" - ] - }, { "id": "supabase", "name": "SupaBase",