Pārlūkot izejas kodu

Merge branch 'master' of github.com:pi-hosted/pi-hosted

Robert Middleswarth 3 gadi atpakaļ
vecāks
revīzija
608bd52869

+ 1 - 1
docs/AppList.md

@@ -136,7 +136,7 @@ List of all apps included in this project with info related to it.
 |[SyncThing](https://syncthing.net/)|32/64 bit|Container| [![](../build/images/blue_doc_icon.png)](https://docs.linuxserver.io/images/docker-syncthing) |  |  |  |  |
 |[Tautulli](https://tautulli.com/)|32/64 bit|Container| [![](../build/images/blue_doc_icon.png)](https://docs.linuxserver.io/images/docker-tautulli) |  |  |  |  |
 |[TheLounge](https://thelounge.chat/)|32/64 bit|Container| [![](../build/images/blue_doc_icon.png)](https://docs.linuxserver.io/images/docker-thelounge) |  |  |  |  |
-|[TiddlyWiki](https://tiddlywiki.com/)|32/64 bit|Container| [![](../build/images/blue_doc_icon.png)](https://github.com/djmaze/tiddlywiki-docker) |  |  |  |  |
+|[TiddlyWiki](https://tiddlywiki.com/)|32/64 bit|Container| [![](../build/images/blue_doc_icon.png)](https://gitlab.com/nicolaw/tiddlywiki) |  |  |  |  |
 |[Traefik](https://doc.traefik.io/traefik/)|32/64 bit|Container| [![](../build/images/blue_doc_icon.png)](https://doc.traefik.io/traefik/getting-started/install-traefik/) |  | [![](../build/images/script_icon.png)](../tools/traefik.sh) |  |  |
 |[Transmission](https://transmissionbt.com/)|32/64 bit|Container| [![](../build/images/blue_doc_icon.png)](https://docs.linuxserver.io/images/docker-transmission) |  |  |  |  |
 |[Transmission-OpenVPN](https://transmissionbt.com/)|32/64 bit|Container| [![](../build/images/blue_doc_icon.png)](https://haugene.github.io/docker-transmission-openvpn/run-container/) |  |  |  | [![YouTube](https://img.shields.io/badge/YouTube-FF0000?style=plastic&logo=youtube&logoColor=white)](https://www.youtube.com/watch?v=tGLVEq913_4&list=PL846hFPMqg3jwkxcScD1xw2bKXrJVvarc&index=5) |

+ 2 - 2
pi-hosted_template/template/portainer-v2.json

@@ -5145,7 +5145,7 @@
 				"Tools"
 			],
 			"description": "A unique, non-linear notebook wiki.",
-			"image": "mazzolino/tiddlywiki:latest",
+			"image": "nicolaw/tiddlywiki:latest",
 			"logo": "https://raw.githubusercontent.com/pi-hosted/pi-hosted/master/images/tiddlywiki.png",
 			"name": "tiddlywiki",
 			"platform": "linux",
@@ -5161,7 +5161,7 @@
 					"container": "/var/lib/tiddlywiki"
 				}
 			],
-			"note": "<h3>Template created by Pi-Hosted Series</h3><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://tiddlywiki.com/\" target=\"_blank\">https://tiddlywiki.com/</a><br><b>Official Docker Documentation: </b><a href=\"https://github.com/djmaze/tiddlywiki-docker\" target=\"_blank\">https://github.com/djmaze/tiddlywiki-docker</a><br><br><br>"
+			"note": "<h3>Template created by Pi-Hosted Series</h3><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://tiddlywiki.com/\" target=\"_blank\">https://tiddlywiki.com/</a><br><b>Official Docker Documentation: </b><a href=\"https://gitlab.com/nicolaw/tiddlywiki\" target=\"_blank\">https://gitlab.com/nicolaw/tiddlywiki</a><br><br><br>"
 		},
 		{
 			"categories": [

+ 1 - 1
template/apps/nextcloudpi.json

@@ -21,7 +21,7 @@
 	],
 	"extraScript": "reset_premissions_nextcloud.sh",
 	"image32": "ownyourbits/nextcloudpi",
-	"image64": "ownyourbits/nextcloudpi:latest",
+	"image64": "ownyourbits/nextcloudpi-arm64:latest",
 	"name": "nextcloudpi",
 	"note": "The database user is nextcloud and the database is nextcloud_db. The host of the database will be located at the bottom of the DB conotainer in portainer.",
 	"officialDoc": "https://ownyourbits.com/2017/06/08/nextcloudpi-docker-for-raspberry-pi/",

+ 2 - 2
template/portainer-v2-arm32.json

@@ -5145,7 +5145,7 @@
 				"Tools"
 			],
 			"description": "A unique, non-linear notebook wiki.",
-			"image": "mazzolino/tiddlywiki:latest",
+			"image": "nicolaw/tiddlywiki:latest",
 			"logo": "https://raw.githubusercontent.com/pi-hosted/pi-hosted/master/images/tiddlywiki.png",
 			"name": "tiddlywiki",
 			"platform": "linux",
@@ -5161,7 +5161,7 @@
 					"container": "/var/lib/tiddlywiki"
 				}
 			],
-			"note": "<h3>Template created by Pi-Hosted Series</h3><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://tiddlywiki.com/\" target=\"_blank\">https://tiddlywiki.com/</a><br><b>Official Docker Documentation: </b><a href=\"https://github.com/djmaze/tiddlywiki-docker\" target=\"_blank\">https://github.com/djmaze/tiddlywiki-docker</a><br><br><br>"
+			"note": "<h3>Template created by Pi-Hosted Series</h3><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://tiddlywiki.com/\" target=\"_blank\">https://tiddlywiki.com/</a><br><b>Official Docker Documentation: </b><a href=\"https://gitlab.com/nicolaw/tiddlywiki\" target=\"_blank\">https://gitlab.com/nicolaw/tiddlywiki</a><br><br><br>"
 		},
 		{
 			"categories": [

+ 3 - 3
template/portainer-v2-arm64.json

@@ -3499,7 +3499,7 @@
 					"name": "PGID"
 				}
 			],
-			"image": "ownyourbits/nextcloudpi:latest",
+			"image": "ownyourbits/nextcloudpi-arm64:latest",
 			"name": "nextcloudpi",
 			"note": "<h3>Template created by Pi-Hosted Series</h3><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://ownyourbits.com/nextcloudpi/\" target=\"_blank\">https://ownyourbits.com/nextcloudpi/</a><br><b>Official Docker Documentation: </b><a href=\"https://ownyourbits.com/2017/06/08/nextcloudpi-docker-for-raspberry-pi/\" target=\"_blank\">https://ownyourbits.com/2017/06/08/nextcloudpi-docker-for-raspberry-pi/</a><br><br><b>Extra useful script: </b><a href=\"https://github.com/pi-hosted/pi-hosted/blob/master/tools/reset_premissions_nextcloud.sh\" target=\"_blank\">reset_premissions_nextcloud.sh</a><br><br><b>Youtube Video: </b><a href=\"https://www.youtube.com/watch?v=E6IrT3g5Gqc&list=PL846hFPMqg3jwkxcScD1xw2bKXrJVvarc&index=9\" target=\"_blank\">Installing Nextcloud on Raspberry Pi Docker</a><br><br>The database user is nextcloud and the database is nextcloud_db. The host of the database will be located at the bottom of the DB conotainer in portainer.",
 			"platform": "linux",
@@ -5530,7 +5530,7 @@
 				"Tools"
 			],
 			"description": "A unique, non-linear notebook wiki.",
-			"image": "mazzolino/tiddlywiki:latest",
+			"image": "nicolaw/tiddlywiki:latest",
 			"logo": "https://raw.githubusercontent.com/pi-hosted/pi-hosted/master/images/tiddlywiki.png",
 			"name": "tiddlywiki",
 			"platform": "linux",
@@ -5546,7 +5546,7 @@
 					"container": "/var/lib/tiddlywiki"
 				}
 			],
-			"note": "<h3>Template created by Pi-Hosted Series</h3><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://tiddlywiki.com/\" target=\"_blank\">https://tiddlywiki.com/</a><br><b>Official Docker Documentation: </b><a href=\"https://github.com/djmaze/tiddlywiki-docker\" target=\"_blank\">https://github.com/djmaze/tiddlywiki-docker</a><br><br><br>"
+			"note": "<h3>Template created by Pi-Hosted Series</h3><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://tiddlywiki.com/\" target=\"_blank\">https://tiddlywiki.com/</a><br><b>Official Docker Documentation: </b><a href=\"https://gitlab.com/nicolaw/tiddlywiki\" target=\"_blank\">https://gitlab.com/nicolaw/tiddlywiki</a><br><br><br>"
 		},
 		{
 			"categories": [