diff --git a/docs/AppList.md b/docs/AppList.md
index 66857fe..2048191 100644
--- a/docs/AppList.md
+++ b/docs/AppList.md
@@ -4,7 +4,7 @@ List of all apps included in this project with info related to it.
|**Arm32:** |**Arm64:**|**Amd64:**|**Total:**|
|:-------------------|:--------:|:--------:|:--------:|
-| 106 apps | 225 apps | 227 apps | 230 apps |
+| 106 apps | 226 apps | 228 apps | 231 apps |
---
@@ -102,6 +102,7 @@ List of all apps included in this project with info related to it.
|[Jellyfin](https://jellyfin.org/)|:x:|:heavy_check_mark:|:heavy_check_mark:|Container| [](https://docs.linuxserver.io/images/docker-jellyfin) | | | |
|[Jellyseerr](https://github.com/Fallenbagel/jellyseerr)|:x:|:heavy_check_mark:|:heavy_check_mark:|Container| [](https://hub.docker.com/r/fallenbagel/jellyseerr) | | | |
|[Jellyfin-Accounts](https://jfa-go.com/)|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|Container| [](https://wiki.jfa-go.com/) | | | |
+|[Joplin server](https://hub.docker.com/r/etechonomy/joplin-server)|:x:|:heavy_check_mark:|:heavy_check_mark:|Stack| [](https://github.com/etechonomy/joplin-server) | | | |
|[Kasm](https://www.kasmweb.com/)|:x:|:heavy_check_mark:|:heavy_check_mark:|Container| [](https://github.com/linuxserver/docker-kasm) | | | |
|[Kasm with renderD128 support](https://www.kasmweb.com/)|:x:|:heavy_check_mark:|:heavy_check_mark:|Container| [](https://github.com/linuxserver/docker-kasm) | | | |
|[Kavita](https://www.kavitareader.com/#home)|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|Container| [](https://wiki.kavitareader.com/en/install/docker-install) | | | |
diff --git a/docs/DocumentList.md b/docs/DocumentList.md
index b3e90f4..cb2de1d 100644
--- a/docs/DocumentList.md
+++ b/docs/DocumentList.md
@@ -8,9 +8,9 @@ List of all Documents used within this project with related Apps and Videos.
| File Name | Description | Related Apps | YouTube |
| --------- | ----------- | ------------ |:-------:|
|[macvlan_setup.md](../docs/macvlan_setup.md)|Attach a container directly to local network (macvlan)|||
-|[nginx_proxy_manager.md](../docs/nginx_proxy_manager.md)|Install and setup instructions for Nginx Proxy Manager (NPM)|Nginx Proxy Manager v2 with Mysql and Goaccess Charts [DEPRECATED]
Nginx Proxy Manager v2 with Sqlite and Goaccess Charts
Nginx Proxy Manager v2 with Sqllite
Nginx Proxy Manager v3 [DEVEL] NOT READY FOR USE
Nginx Proxy Manager v2 with Mysql [DEPRECATED]|[]("https://www.youtube.com/watch?v=yl2Laxbqvo8&list=PL846hFPMqg3jwkxcScD1xw2bKXrJVvarc&index=10")|
+|[nginx_proxy_manager.md](../docs/nginx_proxy_manager.md)|Install and setup instructions for Nginx Proxy Manager (NPM)|Nginx Proxy Manager v2 with Sqllite
Nginx Proxy Manager v2 with Sqlite and Goaccess Charts
Nginx Proxy Manager v2 with Mysql [DEPRECATED]
Nginx Proxy Manager v2 with Mysql and Goaccess Charts [DEPRECATED]
Nginx Proxy Manager v3 [DEVEL] NOT READY FOR USE|[]("https://www.youtube.com/watch?v=yl2Laxbqvo8&list=PL846hFPMqg3jwkxcScD1xw2bKXrJVvarc&index=10")|
|[photoprism.md](../docs/photoprism.md)|Install and Setup Instructions for PhotoPrism Stack|PhotoPrism||
-|[pi-hole.md](../docs/pi-hole.md)|Install and Setup Pi-Hole for Network-Wide Ad Block|Pi-Hole
Pi-Hole-Unbound
Pi-Hole DoH/DoT||
+|[pi-hole.md](../docs/pi-hole.md)|Install and Setup Pi-Hole for Network-Wide Ad Block|Pi-Hole
Pi-Hole DoH/DoT
Pi-Hole-Unbound||
|[rpi_docker_monitor.md](../docs/rpi_docker_monitor.md)|Install and setup instructions for the RPI Docker Monitor|Raspberry Pi Docker Monitor|[]("https://www.youtube.com/watch?v=IoD3vFuep64&list=PL846hFPMqg3jwkxcScD1xw2bKXrJVvarc&index=8")|
|[searxng.md](../docs/searxng.md)|Install and Setup Instructions for SearXNG Meta Search|SearXNG||
|[throttled.md](../docs/throttled.md)|Install and Setup Instructions for the Throttled Script|||
diff --git a/images/joplin.png b/images/joplin.png
new file mode 100644
index 0000000..da72613
Binary files /dev/null and b/images/joplin.png differ
diff --git a/stack/joplin-server.yml b/stack/joplin-server.yml
new file mode 100644
index 0000000..d39b297
--- /dev/null
+++ b/stack/joplin-server.yml
@@ -0,0 +1,32 @@
+version: "3.7"
+services:
+ joplin:
+ image: etechonomy/joplin-server:latest
+ container_name: joplin-server
+ environment:
+ - APP_BASE_URL=${URL}
+ - APP_PORT=${__PORT__}
+ - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
+ - POSTGRES_DATABASE=${POSTGRES_DATABASE}
+ - POSTGRES_USER=${POSTGRES_USER}
+ - POSTGRES_PORT=5432
+ - POSTGRES_HOST=joplin-db
+ - DB_CLIENT=pg
+
+ restart: unless-stopped
+ ports:
+ - 22300:22300
+ joplin-db:
+ image: postgres:15
+ container_name: joplin-db
+ restart: unless-stopped
+ healthcheck:
+ test: ["CMD-SHELL", "pg_isready -d ${POSTGRES_DB} -U ${POSTGRES_USER}"]
+ ports:
+ - 5432:5432
+ volumes:
+ - /foo/bar/joplin-data:/var/lib/postgresql/data
+ environment:
+ POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+ POSTGRES_USER: ${POSTGRES_USER}
+ POSTGRES_DB: ${POSTGRES_DB}
diff --git a/template/apps/joplin-server.json b/template/apps/joplin-server.json
new file mode 100644
index 0000000..a814e18
--- /dev/null
+++ b/template/apps/joplin-server.json
@@ -0,0 +1,54 @@
+{
+ "categories": [
+ "Backup",
+ "CMD",
+ "Web",
+ "Tools"
+ ],
+ "description": "Joplin Server is a web app that allows you to sync and share notes with Joplin, a popular note-taking app.",
+ "env": [
+ {
+ "default":"http://localhost:22300",
+ "label":"URL",
+ "name" : "URL"
+ },
+ {
+ "default":"22300",
+ "label":"APP_PORT",
+ "name":"__PORT__"
+ },
+ {
+ "default": "joplin",
+ "label": "POSTGRES_USER",
+ "name": "POSTGRES_USER"
+ },
+ {
+ "default": "joplin",
+ "label": "POSTGRES_DB",
+ "name": "POSTGRES_DB"
+ },
+ {
+ "default":"joplin",
+ "label":"POSTGRES_DATABASE",
+ "name": "POSTGRES_DATABASE"
+ },
+ {
+ "default": "joplin",
+ "label": "POSTGRES_PASSWORD",
+ "name": "POSTGRES_PASSWORD"
+ }
+ ],
+ "logo": "https://raw.githubusercontent.com/pi-hosted/pi-hosted/master/images/joplin.png",
+ "name": "joplin-server",
+ "officialDoc": "https://github.com/etechonomy/joplin-server",
+ "platform": "linux",
+ "repository": {
+ "stackfile_arm64": "stack/joplin-server.yml",
+ "stackfile_amd64": "stack/joplin-server.yml",
+ "url": "https://github.com/pi-hosted/pi-hosted/master/"
+ },
+ "restart_policy": "unless-stopped",
+ "title": "Joplin server",
+ "type": 3,
+ "webpage": "https://hub.docker.com/r/etechonomy/joplin-server"
+}
diff --git a/template/portainer-v2-amd64.json b/template/portainer-v2-amd64.json
index a336937..d4ac92a 100644
--- a/template/portainer-v2-amd64.json
+++ b/template/portainer-v2-amd64.json
@@ -3831,6 +3831,58 @@
],
"note": "Template created by Pi-Hosted Series
Check our Github page: https://github.com/pi-hosted/pi-hosted
Official Webpage: https://github.com/Fallenbagel/jellyseerr
Official Docker Documentation: https://hub.docker.com/r/fallenbagel/jellyseerr
"
},
+ {
+ "categories": [
+ "Backup",
+ "CMD",
+ "Web",
+ "Tools"
+ ],
+ "description": "Joplin Server is a web app that allows you to sync and share notes with Joplin, a popular note-taking app.",
+ "env": [
+ {
+ "default": "http://localhost:22300",
+ "label": "URL",
+ "name": "URL"
+ },
+ {
+ "default": "22300",
+ "label": "APP_PORT",
+ "name": "__PORT__"
+ },
+ {
+ "default": "joplin",
+ "label": "POSTGRES_USER",
+ "name": "POSTGRES_USER"
+ },
+ {
+ "default": "joplin",
+ "label": "POSTGRES_DB",
+ "name": "POSTGRES_DB"
+ },
+ {
+ "default": "joplin",
+ "label": "POSTGRES_DATABASE",
+ "name": "POSTGRES_DATABASE"
+ },
+ {
+ "default": "joplin",
+ "label": "POSTGRES_PASSWORD",
+ "name": "POSTGRES_PASSWORD"
+ }
+ ],
+ "logo": "https://raw.githubusercontent.com/pi-hosted/pi-hosted/master/images/joplin.png",
+ "name": "joplin-server",
+ "platform": "linux",
+ "repository": {
+ "stackfile": "stack/joplin-server.yml",
+ "url": "https://github.com/pi-hosted/pi-hosted/master/"
+ },
+ "restart_policy": "unless-stopped",
+ "title": "Joplin server",
+ "type": 3,
+ "note": "Template created by Pi-Hosted Series
Check our Github page: https://github.com/pi-hosted/pi-hosted
Official Webpage: https://hub.docker.com/r/etechonomy/joplin-server
Official Docker Documentation: https://github.com/etechonomy/joplin-server
"
+ },
{
"categories": [
"Utilities",
diff --git a/template/portainer-v2-arm64.json b/template/portainer-v2-arm64.json
index a9b77bd..742ec67 100644
--- a/template/portainer-v2-arm64.json
+++ b/template/portainer-v2-arm64.json
@@ -3732,6 +3732,58 @@
],
"note": "Template created by Pi-Hosted Series
Check our Github page: https://github.com/pi-hosted/pi-hosted
Official Webpage: https://github.com/Fallenbagel/jellyseerr
Official Docker Documentation: https://hub.docker.com/r/fallenbagel/jellyseerr
"
},
+ {
+ "categories": [
+ "Backup",
+ "CMD",
+ "Web",
+ "Tools"
+ ],
+ "description": "Joplin Server is a web app that allows you to sync and share notes with Joplin, a popular note-taking app.",
+ "env": [
+ {
+ "default": "http://localhost:22300",
+ "label": "URL",
+ "name": "URL"
+ },
+ {
+ "default": "22300",
+ "label": "APP_PORT",
+ "name": "__PORT__"
+ },
+ {
+ "default": "joplin",
+ "label": "POSTGRES_USER",
+ "name": "POSTGRES_USER"
+ },
+ {
+ "default": "joplin",
+ "label": "POSTGRES_DB",
+ "name": "POSTGRES_DB"
+ },
+ {
+ "default": "joplin",
+ "label": "POSTGRES_DATABASE",
+ "name": "POSTGRES_DATABASE"
+ },
+ {
+ "default": "joplin",
+ "label": "POSTGRES_PASSWORD",
+ "name": "POSTGRES_PASSWORD"
+ }
+ ],
+ "logo": "https://raw.githubusercontent.com/pi-hosted/pi-hosted/master/images/joplin.png",
+ "name": "joplin-server",
+ "platform": "linux",
+ "repository": {
+ "stackfile": "stack/joplin-server.yml",
+ "url": "https://github.com/pi-hosted/pi-hosted/master/"
+ },
+ "restart_policy": "unless-stopped",
+ "title": "Joplin server",
+ "type": 3,
+ "note": "Template created by Pi-Hosted Series
Check our Github page: https://github.com/pi-hosted/pi-hosted
Official Webpage: https://hub.docker.com/r/etechonomy/joplin-server
Official Docker Documentation: https://github.com/etechonomy/joplin-server
"
+ },
{
"categories": [
"Utilities",