From 0a3ad6e16e75ed91a3d7ac5a17df5aa23e7b29d8 Mon Sep 17 00:00:00 2001
From: Alexandre <alexandre.pary@gmail.com>
Date: Mon, 10 Jan 2022 09:53:41 +0100
Subject: [PATCH] Webtop update

---
 webtop/CHANGELOG.md |  3 ++-
 webtop/Readme.md    |  9 ++++++---
 webtop/config.json  | 27 +++++++--------------------
 3 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/webtop/CHANGELOG.md b/webtop/CHANGELOG.md
index f1d9c337c..51dd34ec9 100644
--- a/webtop/CHANGELOG.md
+++ b/webtop/CHANGELOG.md
@@ -1,6 +1,7 @@
+- Switch to ubuntu-mate
 
 ## 4.16 (07-01-2022)
+
 - Update to latest version from linuxserver/docker-webtop
-- Switch to alpine-kde
 - New standardized logic for Dockerfile build and packages installation
 - Initial release
diff --git a/webtop/Readme.md b/webtop/Readme.md
index 1e23dd47d..079b0de5d 100644
--- a/webtop/Readme.md
+++ b/webtop/Readme.md
@@ -1,4 +1,4 @@
-# Home assistant add-on: Webtop Alpine
+# Home assistant add-on: Webtop
 
 [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium)
 
@@ -14,7 +14,7 @@ _Thanks to everyone having starred my repo! To star it click on the image below,
 
 ## About
 
-[webtop](https://github.com/webtop/webtop) is a full Alpine desktop environments accessible via any modern web browser.
+[webtop](https://github.com/webtop/webtop) is a full desktop environments accessible via any modern web browser.
 This addon is based on the docker image https://github.com/linuxserver/docker-webtop
 
 ## Configuration
@@ -25,9 +25,12 @@ By default the image is based around the abc user and we recommend using this us
 
 http://localhost:3000/?login=true
 
+Apps installations are not remanent, you need to do it via addon options. Their config, however, is.
+
 ```yaml
 TZ: timezone
-DNS_servers : 8.8.8.8,1.1.1.1 # Keep blank to use router’s DNS, or set custom DNS to avoid spamming in case of local DNS ad-remover
+additional_apps: engrampa,thunderbird # Allows installation of apps, as they are not persistent
+DNS_servers: 8.8.8.8,1.1.1.1 # Keep blank to use router’s DNS, or set custom DNS to avoid spamming in case of local DNS ad-remover
 localdisks: sda1 #put the hardware name of your drive to mount separated by commas, or its label. Ex: sda1, sdb1, MYNAS...
 networkdisks: "//SERVER/SHARE" # optional, list of smb servers to mount, separated by commas
 cifsusername: "username" # optional, smb username, same for all smb shares
diff --git a/webtop/config.json b/webtop/config.json
index 2ca8bec5b..fb9001d03 100644
--- a/webtop/config.json
+++ b/webtop/config.json
@@ -1,18 +1,13 @@
 {
   "apparmor": true,
-  "arch": [
-    "aarch64",
-    "amd64",
-    "armv7",
-    "armhf"
-  ],
+  "arch": ["aarch64", "amd64", "armv7", "armhf"],
   "boot": "auto",
   "environment": {
     "PUID": "0",
     "PGID": "0",
     "HOME": "/share/webtop"
   },
-  "description": "Full Alpine desktop environments accessible via any modern web browser",
+  "description": "Full linux desktop environment accessible via any modern web browser",
   "devices": [
     "/dev/dri",
     "/dev/dri/card0",
@@ -63,17 +58,9 @@
     "PGID": "0",
     "shm_size": "1gb"
   },
-  "map": [
-    "media:rw",
-    "share:rw",
-    "ssl"
-  ],
-  "name": "Webtop Alpine",
-  "privileged": [
-    "SYS_ADMIN",
-    "DAC_READ_SEARCH",
-    "NET_ADMIN"
-  ],
+  "map": ["media:rw", "share:rw", "ssl"],
+  "name": "Webtop",
+  "privileged": ["SYS_ADMIN", "DAC_READ_SEARCH", "NET_ADMIN"],
   "ports": {
     "3000/tcp": 3000
   },
@@ -82,7 +69,7 @@
   },
   "options": {
     "additional_apps": "engrampa,thunderbird"
-},
+  },
   "schema": {
     "TZ": "str?",
     "localdisks": "str?",
@@ -93,7 +80,7 @@
     "DNS_server": "str?",
     "additional_apps": "str?"
   },
-  "slug": "webtop_alpine",
+  "slug": "webtop",
   "upstream": "4.16",
   "url": "https://github.com/alexbelgium/hassio-addons",
   "version": "4.16",