John BigoudOps 1 год назад
Родитель
Сommit
dd8c9ee54d

+ 2 - 1
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| [![](../build/images/blue_doc_icon.png)](https://docs.linuxserver.io/images/docker-jellyfin) |  |  |  |
 |[Jellyseerr](https://github.com/Fallenbagel/jellyseerr)|:x:|:heavy_check_mark:|:heavy_check_mark:|Container| [![](../build/images/blue_doc_icon.png)](https://hub.docker.com/r/fallenbagel/jellyseerr) |  |  |  |
 |[Jellyfin-Accounts](https://jfa-go.com/)|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|Container| [![](../build/images/blue_doc_icon.png)](https://wiki.jfa-go.com/) |  |  |  |
+|[Joplin server](https://hub.docker.com/r/etechonomy/joplin-server)|:x:|:heavy_check_mark:|:heavy_check_mark:|Stack| [![](../build/images/blue_doc_icon.png)](https://github.com/etechonomy/joplin-server) |  |  |  |
 |[Kasm](https://www.kasmweb.com/)|:x:|:heavy_check_mark:|:heavy_check_mark:|Container| [![](../build/images/blue_doc_icon.png)](https://github.com/linuxserver/docker-kasm) |  |  |  |
 |[Kasm with renderD128 support](https://www.kasmweb.com/)|:x:|:heavy_check_mark:|:heavy_check_mark:|Container| [![](../build/images/blue_doc_icon.png)](https://github.com/linuxserver/docker-kasm) |  |  |  |
 |[Kavita](https://www.kavitareader.com/#home)|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|Container| [![](../build/images/blue_doc_icon.png)](https://wiki.kavitareader.com/en/install/docker-install) |  |  |  |

+ 2 - 2
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]<br>Nginx Proxy Manager v2 with Sqlite and Goaccess Charts<br>Nginx Proxy Manager v2 with Sqllite<br>Nginx Proxy Manager v3 [DEVEL] NOT READY FOR USE<br>Nginx Proxy Manager v2 with Mysql [DEPRECATED]|[![YouTube](https://img.shields.io/badge/YouTube-FF0000?style=plastic&logo=youtube&logoColor=white)]("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<br>Nginx Proxy Manager v2 with Sqlite and Goaccess Charts<br>Nginx Proxy Manager v2 with Mysql [DEPRECATED]<br>Nginx Proxy Manager v2 with Mysql and Goaccess Charts [DEPRECATED]<br>Nginx Proxy Manager v3 [DEVEL] NOT READY FOR USE|[![YouTube](https://img.shields.io/badge/YouTube-FF0000?style=plastic&logo=youtube&logoColor=white)]("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<br>Pi-Hole-Unbound<br>Pi-Hole DoH/DoT||
+|[pi-hole.md](../docs/pi-hole.md)|Install and Setup Pi-Hole for Network-Wide Ad Block|Pi-Hole<br>Pi-Hole DoH/DoT<br>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|[![YouTube](https://img.shields.io/badge/YouTube-FF0000?style=plastic&logo=youtube&logoColor=white)]("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|||

BIN
images/joplin.png


+ 32 - 0
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}

+ 54 - 0
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"
+}

+ 52 - 0
template/portainer-v2-amd64.json

@@ -3831,6 +3831,58 @@
 			],
 			"note": "<b>Template created by Pi-Hosted Series</b><br><b>Check our Github page: <a href=\"https://github.com/pi-hosted/pi-hosted\" target=\"_blank\">https://github.com/pi-hosted/pi-hosted</a></b><br><br><b>Official Webpage: </b><a href=\"https://github.com/Fallenbagel/jellyseerr\" target=\"_blank\">https://github.com/Fallenbagel/jellyseerr</a><br><b>Official Docker Documentation: </b><a href=\"https://hub.docker.com/r/fallenbagel/jellyseerr\" target=\"_blank\">https://hub.docker.com/r/fallenbagel/jellyseerr</a><br><br><br>"
 		},
+		{
+			"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": "<b>Template created by Pi-Hosted Series</b><br><b>Check our Github page: <a href=\"https://github.com/pi-hosted/pi-hosted\" target=\"_blank\">https://github.com/pi-hosted/pi-hosted</a></b><br><br><b>Official Webpage: </b><a href=\"https://hub.docker.com/r/etechonomy/joplin-server\" target=\"_blank\">https://hub.docker.com/r/etechonomy/joplin-server</a><br><b>Official Docker Documentation: </b><a href=\"https://github.com/etechonomy/joplin-server\" target=\"_blank\">https://github.com/etechonomy/joplin-server</a><br><br><br>"
+		},
 		{
 			"categories": [
 				"Utilities",

+ 52 - 0
template/portainer-v2-arm64.json

@@ -3732,6 +3732,58 @@
 			],
 			"note": "<b>Template created by Pi-Hosted Series</b><br><b>Check our Github page: <a href=\"https://github.com/pi-hosted/pi-hosted\" target=\"_blank\">https://github.com/pi-hosted/pi-hosted</a></b><br><br><b>Official Webpage: </b><a href=\"https://github.com/Fallenbagel/jellyseerr\" target=\"_blank\">https://github.com/Fallenbagel/jellyseerr</a><br><b>Official Docker Documentation: </b><a href=\"https://hub.docker.com/r/fallenbagel/jellyseerr\" target=\"_blank\">https://hub.docker.com/r/fallenbagel/jellyseerr</a><br><br><br>"
 		},
+		{
+			"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": "<b>Template created by Pi-Hosted Series</b><br><b>Check our Github page: <a href=\"https://github.com/pi-hosted/pi-hosted\" target=\"_blank\">https://github.com/pi-hosted/pi-hosted</a></b><br><br><b>Official Webpage: </b><a href=\"https://hub.docker.com/r/etechonomy/joplin-server\" target=\"_blank\">https://hub.docker.com/r/etechonomy/joplin-server</a><br><b>Official Docker Documentation: </b><a href=\"https://github.com/etechonomy/joplin-server\" target=\"_blank\">https://github.com/etechonomy/joplin-server</a><br><br><br>"
+		},
 		{
 			"categories": [
 				"Utilities",