Переглянути джерело

Update the arm64 json file to use arm64 images instead of arm32 based ones. (#122)

Robert Middleswarth 3 роки тому
батько
коміт
ed1440a33e
2 змінених файлів з 58 додано та 59 видалено
  1. 2 2
      stack/nextcloud.yml
  2. 56 57
      template/portainer-v2-arm64.json

+ 2 - 2
stack/nextcloud.yml

@@ -2,7 +2,7 @@
 version: "2"
 version: "2"
 services:
 services:
   nextcloud:
   nextcloud:
-    image: linuxserver/nextcloud
+    image: linuxserver/nextcloud:latest
     container_name: nextcloud
     container_name: nextcloud
     environment:
     environment:
       - PUID=${PUID}
       - PUID=${PUID}
@@ -16,7 +16,7 @@ services:
     depends_on:
     depends_on:
       - nextcloud_db
       - nextcloud_db
   nextcloud_db:
   nextcloud_db:
-    image: linuxserver/mariadb
+    image: linuxserver/mariadb:latest
     container_name: nextcloud_db
     container_name: nextcloud_db
     environment:
     environment:
       - PUID=${PUID}
       - PUID=${PUID}

+ 56 - 57
template/portainer-v2-arm64.json

@@ -32,7 +32,7 @@
 					"set": "-Xms256m -Xmx512m"
 					"set": "-Xms256m -Xmx512m"
 				}
 				}
 			],
 			],
-			"image": "linuxserver/airsonic:arm32v7-latest",
+			"image": "linuxserver/airsonic:arm64v8-latest",
 			"logo": "https://raw.githubusercontent.com/novaspirit/pi-hosted/master/images/airsonic-logo.png",
 			"logo": "https://raw.githubusercontent.com/novaspirit/pi-hosted/master/images/airsonic-logo.png",
 			"name": "airsonic",
 			"name": "airsonic",
 			"platform": "linux",
 			"platform": "linux",
@@ -798,32 +798,32 @@
 					"name": "PGID"
 					"name": "PGID"
 				},
 				},
 				{
 				{
-                                        "label": "DB_HOST",
-                                        "name": "DB_HOST",
-                                        "set": "mariadb"
-                                },
-                                {
-                                        "label": "DB_USERNAME",
-                                        "name": "DB_USERNAME",
-                                        "set": "lychee"
-                                },
-                                {
-                                        "label": "DB_PASSWORD",
-                                        "name": "DB_PASSWORD",
-                                        "set": "dbpassword_that_was_set_in_lychee-mariadb"
-                                },
-                                {
-                                        "label": "DB_DATABASE",
-                                        "name": "DB_DATABASE",
-                                        "set": "lychee"
-                                },
-                                {
-                                        "label": "DB_PORT",
-                                        "name": "DB_PORT",
-                                        "set": "3306"
-                                }
-			],
-			"image": "linuxserver/lychee:arm32v7-latest",
+                    "label": "DB_HOST",
+                    "name": "DB_HOST",
+                    "set": "mariadb"
+                },
+                {
+                    "label": "DB_USERNAME",
+                    "name": "DB_USERNAME",
+                    "set": "lychee"
+                },
+                {
+                    "label": "DB_PASSWORD",
+                    "name": "DB_PASSWORD",
+                    "set": "dbpassword_that_was_set_in_lychee-mariadb"
+                },
+                {
+                    "label": "DB_DATABASE",
+                    "name": "DB_DATABASE",
+                    "set": "lychee"
+                },
+                {
+                    "label": "DB_PORT",
+                    "name": "DB_PORT",
+                    "set": "3306"
+                }
+			],
+			"image": "linuxserver/lychee:arm64v8-latest",
 			"logo": "https://raw.githubusercontent.com/novaspirit/pi-hosted/master/images/lychee-icon.png",
 			"logo": "https://raw.githubusercontent.com/novaspirit/pi-hosted/master/images/lychee-icon.png",
 			"name": "lychee",
 			"name": "lychee",
 			"platform": "linux",
 			"platform": "linux",
@@ -862,27 +862,27 @@
 					"name": "PGID"
 					"name": "PGID"
 				},
 				},
 				{
 				{
-                                        "label": "MYSQL_ROOT_PASSWORD",
-                                        "name": "MYSQL_ROOT_PASSWORD",
-                                        "set": "rootpassword"
-                                },
+                    "label": "MYSQL_ROOT_PASSWORD",
+                    "name": "MYSQL_ROOT_PASSWORD",
+                    "set": "rootpassword"
+                },
 				{
 				{
-                                        "label": "MYSQL_DATABASE",
-                                        "name": "MYSQL_DATABASE",
-                                        "set": "lychee"
-                                },
+                    "label": "MYSQL_DATABASE",
+                    "name": "MYSQL_DATABASE",
+                    "set": "lychee"
+                },
 				{
 				{
 					"label": "MYSQL_USER",
 					"label": "MYSQL_USER",
 					"name": "MYSQL_USER",
 					"name": "MYSQL_USER",
 					"set": "lychee"
 					"set": "lychee"
 				},
 				},
 				{
 				{
-                                        "label": "MYSQL_PASSWORD",
-                                        "name": "MYSQL_PASSWORD",
-                                        "set": "dbpassword"
-                                }
+                    "label": "MYSQL_PASSWORD",
+                    "name": "MYSQL_PASSWORD",
+                    "set": "dbpassword"
+                }
 			],
 			],
-			"image": "linuxserver/mariadb:arm32v7-latest",
+			"image": "linuxserver/mariadb:arm64v8-latest",
 			"logo": "https://raw.githubusercontent.com/novaspirit/pi-hosted/master/images/mariadb-icon.png",
 			"logo": "https://raw.githubusercontent.com/novaspirit/pi-hosted/master/images/mariadb-icon.png",
 			"name": "mariadb",
 			"name": "mariadb",
 			"platform": "linux",
 			"platform": "linux",
@@ -922,7 +922,7 @@
 					"name": "MYJD_PASSWORD"
 					"name": "MYJD_PASSWORD"
 				}
 				}
 			],
 			],
-			"image": "jaymoulin/jdownloader:1.4.3-armhf",
+			"image": "jaymoulin/jdownloader:latest",
 			"logo": "https://raw.githubusercontent.com/novaspirit/pi-hosted/master/images/jdownloader.png",
 			"logo": "https://raw.githubusercontent.com/novaspirit/pi-hosted/master/images/jdownloader.png",
 			"name": "JDownloader",
 			"name": "JDownloader",
 			"platform": "linux",
 			"platform": "linux",
@@ -1360,7 +1360,7 @@
 			"name": "nextcloudpi",
 			"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.",
 			"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.",
 			"platform": "linux",
 			"platform": "linux",
-			"image": "ownyourbits/nextcloudpi",
+			"image": "ownyourbits/nextcloudpi:latest",
 			"title": "NextcloudPi",
 			"title": "NextcloudPi",
 			"type": 1,
 			"type": 1,
 			"ports":[
 			"ports":[
@@ -2479,7 +2479,7 @@
 				"Other",
 				"Other",
 				"Tools"
 				"Tools"
 			],
 			],
-			"description": "[arm] Web File Browser which can be used as a middleware or standalone app.",
+			"description": "Web File Browser which can be used as a middleware or standalone app.",
 			"image": "filebrowser/filebrowser:latest",
 			"image": "filebrowser/filebrowser:latest",
 			"logo": "https://raw.githubusercontent.com/novaspirit/pi-hosted/master/images/filebrowser.png",
 			"logo": "https://raw.githubusercontent.com/novaspirit/pi-hosted/master/images/filebrowser.png",
 			"name": "filebrowser",
 			"name": "filebrowser",
@@ -2621,7 +2621,7 @@
 				"Other",
 				"Other",
 				"Tools"
 				"Tools"
 			],
 			],
-			"description": "[arm] A clientless remote desktop gateway.",
+			"description": "A clientless remote desktop gateway.",
 			"image": "oznu/guacamole:armhf",
 			"image": "oznu/guacamole:armhf",
 			"logo": "https://raw.githubusercontent.com/novaspirit/pi-hosted/master/images/guacamole.png",
 			"logo": "https://raw.githubusercontent.com/novaspirit/pi-hosted/master/images/guacamole.png",
 			"name": "guacamole",
 			"name": "guacamole",
@@ -3743,7 +3743,7 @@
 				"VPN",
 				"VPN",
 				"Tools"
 				"Tools"
 			],
 			],
-			"description": "[arm] This container contains OpenVPN and Transmission with a configuration\nwhere Transmission is running only when OpenVPN has an active tunnel.\nIt bundles configuration files for many popular VPN providers to make the setup easier.",
+			"description": "This container contains OpenVPN and Transmission with a configuration\nwhere Transmission is running only when OpenVPN has an active tunnel.\nIt bundles configuration files for many popular VPN providers to make the setup easier.",
 			"env": [
 			"env": [
 				{
 				{
 					"default": "1000",
 					"default": "1000",
@@ -3761,12 +3761,12 @@
 					"label": "OPENVPN_PROVIDER",
 					"label": "OPENVPN_PROVIDER",
 					"name": "OPENVPN_PROVIDER"
 					"name": "OPENVPN_PROVIDER"
 				},
 				},
-                                {
-                                        "default": "",
-                                        "description": "Optional. Mostly used to narrow down what location to use by the provider",
-                                        "label": "OPENVPN_CONFIG",
-                                        "name": "OPENVPN_CONFIG"
-                                },
+                {
+                    "default": "",
+                    "description": "Optional. Mostly used to narrow down what location to use by the provider",
+                    "label": "OPENVPN_CONFIG",
+                    "name": "OPENVPN_CONFIG"
+                },
 				{
 				{
 					"default": "",
 					"default": "",
 					"label": "OPENVPN_USERNAME",
 					"label": "OPENVPN_USERNAME",
@@ -4293,7 +4293,7 @@
 					"default": "192.168.0.0/16"
 					"default": "192.168.0.0/16"
 				}
 				}
 			],
 			],
-			"image": "sgtsquiggs/deluge-openvpn:arm32v7-latest",
+			"image": "sgtsquiggs/deluge-openvpn:arm64v8-latest",
 			"name": "deluge-openvpn",
 			"name": "deluge-openvpn",
 			"platform": "linux",
 			"platform": "linux",
 			"ports": [
 			"ports": [
@@ -4367,9 +4367,9 @@
 			"description": "Run a Speedtest every hour and graph the results.  See https://hub.docker.com/r/henrywhitaker3/speedtest-tracker/tags for arch options",
 			"description": "Run a Speedtest every hour and graph the results.  See https://hub.docker.com/r/henrywhitaker3/speedtest-tracker/tags for arch options",
 			"env": [
 			"env": [
 				{
 				{
-					"default": "latest-arm",
 					"label": "arch",
 					"label": "arch",
-					"set": "x86_64"
+					"name": "arch",
+					"default": "latest-arm"
 				},
 				},
 				{
 				{
 					"label": "OOKLA_EULA_GDPR",
 					"label": "OOKLA_EULA_GDPR",
@@ -4488,7 +4488,7 @@
 				"VPN"
 				"VPN"
 			],
 			],
 			"description": "You have found the easiest way to install & manage WireGuard on any Linux host!",
 			"description": "You have found the easiest way to install & manage WireGuard on any Linux host!",
-			"image": "weejewel/wg-easy",
+			"image": "weejewel/wg-easy:latest",
 			"logo": "https://raw.githubusercontent.com/novaspirit/pi-hosted/master/images/wireguard.png",
 			"logo": "https://raw.githubusercontent.com/novaspirit/pi-hosted/master/images/wireguard.png",
 			"name": "wg-easy",
 			"name": "wg-easy",
 			"platform": "linux",
 			"platform": "linux",
@@ -4629,14 +4629,13 @@
 			]
 			]
 
 
 		},
 		},
-
 		{
 		{
 			"categories": [
 			"categories": [
 				"Other",
 				"Other",
 				"Tools"
 				"Tools"
 			],
 			],
 			"description": "A simple server for sending and receiving messages",
 			"description": "A simple server for sending and receiving messages",
-			"image": "gotify/server-arm7:latest",
+			"image": "gotify/server-arm64:latest",
 			"logo": "https://raw.githubusercontent.com/novaspirit/pi-hosted/master/images/gotify.png",
 			"logo": "https://raw.githubusercontent.com/novaspirit/pi-hosted/master/images/gotify.png",
 			"name": "gotify",
 			"name": "gotify",
 			"note": "ARM7 Image. Documentation is Available \u003ca href='https://gotify.net/docs/index'\u003ehere\u003c/a\u003e.",
 			"note": "ARM7 Image. Documentation is Available \u003ca href='https://gotify.net/docs/index'\u003ehere\u003c/a\u003e.",