From a5c5d6d447a39117e7f16170bf0ba57f87d18a1e Mon Sep 17 00:00:00 2001 From: Xstar97 Date: Mon, 9 Jan 2023 01:04:21 -0500 Subject: [PATCH] feat(webtop) image selector,gui improvement,docs (#6170) --- charts/stable/webtop/Chart.yaml | 13 +-- charts/stable/webtop/ci/alpine-i3-values.yaml | 1 + .../stable/webtop/ci/alpine-icewm-values.yaml | 1 + .../stable/webtop/ci/alpine-kde-values.yaml | 1 + .../stable/webtop/ci/alpine-mate-values.yaml | 1 + .../webtop/ci/alpine-openbox-values.yaml | 1 + charts/stable/webtop/ci/arch-i3-values.yaml | 1 + .../stable/webtop/ci/arch-icewm-values.yaml | 1 + charts/stable/webtop/ci/arch-kde-values.yaml | 1 + charts/stable/webtop/ci/arch-mate-values.yaml | 1 + .../stable/webtop/ci/arch-openbox-values.yaml | 1 + charts/stable/webtop/ci/arch-xfce-values.yaml | 1 + charts/stable/webtop/ci/base-values.yaml | 1 + charts/stable/webtop/ci/fedora-i3-values.yaml | 1 + .../stable/webtop/ci/fedora-icewm-values.yaml | 1 + .../stable/webtop/ci/fedora-kde-values.yaml | 1 + .../stable/webtop/ci/fedora-mate-values.yaml | 1 + .../webtop/ci/fedora-openbox-values.yaml | 1 + .../stable/webtop/ci/fedora-xfce-values.yaml | 1 + charts/stable/webtop/ci/ubuntu-i3-values.yaml | 1 + .../stable/webtop/ci/ubuntu-icewm-values.yaml | 1 + .../stable/webtop/ci/ubuntu-kde-values.yaml | 1 + .../stable/webtop/ci/ubuntu-mate-values.yaml | 1 + .../webtop/ci/ubuntu-openbox-values.yaml | 1 + .../stable/webtop/ci/ubuntu-xfce-values.yaml | 1 + charts/stable/webtop/docs/credentials.md | 4 + charts/stable/webtop/questions.yaml | 96 ++++++++++++++++- charts/stable/webtop/values.yaml | 101 +++++++++++++++++- 28 files changed, 229 insertions(+), 9 deletions(-) create mode 100644 charts/stable/webtop/ci/alpine-i3-values.yaml create mode 100644 charts/stable/webtop/ci/alpine-icewm-values.yaml create mode 100644 charts/stable/webtop/ci/alpine-kde-values.yaml create mode 100644 charts/stable/webtop/ci/alpine-mate-values.yaml create mode 100644 charts/stable/webtop/ci/alpine-openbox-values.yaml create mode 100644 charts/stable/webtop/ci/arch-i3-values.yaml create mode 100644 charts/stable/webtop/ci/arch-icewm-values.yaml create mode 100644 charts/stable/webtop/ci/arch-kde-values.yaml create mode 100644 charts/stable/webtop/ci/arch-mate-values.yaml create mode 100644 charts/stable/webtop/ci/arch-openbox-values.yaml create mode 100644 charts/stable/webtop/ci/arch-xfce-values.yaml create mode 100644 charts/stable/webtop/ci/base-values.yaml create mode 100644 charts/stable/webtop/ci/fedora-i3-values.yaml create mode 100644 charts/stable/webtop/ci/fedora-icewm-values.yaml create mode 100644 charts/stable/webtop/ci/fedora-kde-values.yaml create mode 100644 charts/stable/webtop/ci/fedora-mate-values.yaml create mode 100644 charts/stable/webtop/ci/fedora-openbox-values.yaml create mode 100644 charts/stable/webtop/ci/fedora-xfce-values.yaml create mode 100644 charts/stable/webtop/ci/ubuntu-i3-values.yaml create mode 100644 charts/stable/webtop/ci/ubuntu-icewm-values.yaml create mode 100644 charts/stable/webtop/ci/ubuntu-kde-values.yaml create mode 100644 charts/stable/webtop/ci/ubuntu-mate-values.yaml create mode 100644 charts/stable/webtop/ci/ubuntu-openbox-values.yaml create mode 100644 charts/stable/webtop/ci/ubuntu-xfce-values.yaml create mode 100644 charts/stable/webtop/docs/credentials.md diff --git a/charts/stable/webtop/Chart.yaml b/charts/stable/webtop/Chart.yaml index 7c317c854dd..1cc74189f71 100644 --- a/charts/stable/webtop/Chart.yaml +++ b/charts/stable/webtop/Chart.yaml @@ -1,7 +1,3 @@ -annotations: - truecharts.org/SCALE-support: "true" - truecharts.org/catagories: | - - Tools-Utilities apiVersion: v2 appVersion: "latest" dependencies: @@ -9,7 +5,7 @@ dependencies: repository: https://library-charts.truecharts.org version: 11.1.2 deprecated: false -description: Webtop(https://github.com/linuxserver/gclient) - Alpine, Ubuntu, Fedora, and Arch based Charts containing full desktop environments in officially supported flavors accessible via any modern web browser. +description: Webtop full desktop environments in officially supported flavors accessible via any modern web browser. home: https://truecharts.org/charts/stable/webtop icon: https://truecharts.org/img/hotlink-ok/chart-icons/webtop.png keywords: @@ -27,4 +23,9 @@ sources: - https://github.com/orgs/linuxserver/packages/container/package/webtop - https://github.com/linuxserver/docker-webtop#readme type: application -version: 3.0.13 +version: 4.0.0 +annotations: + truecharts.org/catagories: | + - Tools-Utilities + truecharts.org/SCALE-support: "true" + truecharts.org/grade: U diff --git a/charts/stable/webtop/ci/alpine-i3-values.yaml b/charts/stable/webtop/ci/alpine-i3-values.yaml new file mode 100644 index 00000000000..e4ad482b6b1 --- /dev/null +++ b/charts/stable/webtop/ci/alpine-i3-values.yaml @@ -0,0 +1 @@ +imageSelector: alpineI3Image diff --git a/charts/stable/webtop/ci/alpine-icewm-values.yaml b/charts/stable/webtop/ci/alpine-icewm-values.yaml new file mode 100644 index 00000000000..7d44bfa9b3d --- /dev/null +++ b/charts/stable/webtop/ci/alpine-icewm-values.yaml @@ -0,0 +1 @@ +imageSelector: alpineICEWMImage diff --git a/charts/stable/webtop/ci/alpine-kde-values.yaml b/charts/stable/webtop/ci/alpine-kde-values.yaml new file mode 100644 index 00000000000..48f87ecfb97 --- /dev/null +++ b/charts/stable/webtop/ci/alpine-kde-values.yaml @@ -0,0 +1 @@ +imageSelector: alpineKDEImage diff --git a/charts/stable/webtop/ci/alpine-mate-values.yaml b/charts/stable/webtop/ci/alpine-mate-values.yaml new file mode 100644 index 00000000000..2ded37171bb --- /dev/null +++ b/charts/stable/webtop/ci/alpine-mate-values.yaml @@ -0,0 +1 @@ +imageSelector: alpineMATEImage diff --git a/charts/stable/webtop/ci/alpine-openbox-values.yaml b/charts/stable/webtop/ci/alpine-openbox-values.yaml new file mode 100644 index 00000000000..4b7be30d38b --- /dev/null +++ b/charts/stable/webtop/ci/alpine-openbox-values.yaml @@ -0,0 +1 @@ +imageSelector: alpineOpenBoxImage diff --git a/charts/stable/webtop/ci/arch-i3-values.yaml b/charts/stable/webtop/ci/arch-i3-values.yaml new file mode 100644 index 00000000000..5c41c0ddb19 --- /dev/null +++ b/charts/stable/webtop/ci/arch-i3-values.yaml @@ -0,0 +1 @@ +imageSelector: archI3Image diff --git a/charts/stable/webtop/ci/arch-icewm-values.yaml b/charts/stable/webtop/ci/arch-icewm-values.yaml new file mode 100644 index 00000000000..553fe966944 --- /dev/null +++ b/charts/stable/webtop/ci/arch-icewm-values.yaml @@ -0,0 +1 @@ +imageSelector: archICEWMImage diff --git a/charts/stable/webtop/ci/arch-kde-values.yaml b/charts/stable/webtop/ci/arch-kde-values.yaml new file mode 100644 index 00000000000..ab21302e3a4 --- /dev/null +++ b/charts/stable/webtop/ci/arch-kde-values.yaml @@ -0,0 +1 @@ +imageSelector: archKDEImage diff --git a/charts/stable/webtop/ci/arch-mate-values.yaml b/charts/stable/webtop/ci/arch-mate-values.yaml new file mode 100644 index 00000000000..c3024d58978 --- /dev/null +++ b/charts/stable/webtop/ci/arch-mate-values.yaml @@ -0,0 +1 @@ +imageSelector: archMATEImage diff --git a/charts/stable/webtop/ci/arch-openbox-values.yaml b/charts/stable/webtop/ci/arch-openbox-values.yaml new file mode 100644 index 00000000000..356630baea0 --- /dev/null +++ b/charts/stable/webtop/ci/arch-openbox-values.yaml @@ -0,0 +1 @@ +imageSelector: archOpenBoxImage diff --git a/charts/stable/webtop/ci/arch-xfce-values.yaml b/charts/stable/webtop/ci/arch-xfce-values.yaml new file mode 100644 index 00000000000..356630baea0 --- /dev/null +++ b/charts/stable/webtop/ci/arch-xfce-values.yaml @@ -0,0 +1 @@ +imageSelector: archOpenBoxImage diff --git a/charts/stable/webtop/ci/base-values.yaml b/charts/stable/webtop/ci/base-values.yaml new file mode 100644 index 00000000000..7e36603e844 --- /dev/null +++ b/charts/stable/webtop/ci/base-values.yaml @@ -0,0 +1 @@ +imageSelector: image diff --git a/charts/stable/webtop/ci/fedora-i3-values.yaml b/charts/stable/webtop/ci/fedora-i3-values.yaml new file mode 100644 index 00000000000..13630052fbd --- /dev/null +++ b/charts/stable/webtop/ci/fedora-i3-values.yaml @@ -0,0 +1 @@ +imageSelector: fedoraI3Image diff --git a/charts/stable/webtop/ci/fedora-icewm-values.yaml b/charts/stable/webtop/ci/fedora-icewm-values.yaml new file mode 100644 index 00000000000..2e4a0c0e330 --- /dev/null +++ b/charts/stable/webtop/ci/fedora-icewm-values.yaml @@ -0,0 +1 @@ +imageSelector: fedoraICEWMImage diff --git a/charts/stable/webtop/ci/fedora-kde-values.yaml b/charts/stable/webtop/ci/fedora-kde-values.yaml new file mode 100644 index 00000000000..1b5cb524867 --- /dev/null +++ b/charts/stable/webtop/ci/fedora-kde-values.yaml @@ -0,0 +1 @@ +imageSelector: fedoraKDEImage diff --git a/charts/stable/webtop/ci/fedora-mate-values.yaml b/charts/stable/webtop/ci/fedora-mate-values.yaml new file mode 100644 index 00000000000..bf1377120a0 --- /dev/null +++ b/charts/stable/webtop/ci/fedora-mate-values.yaml @@ -0,0 +1 @@ +imageSelector: fedoraMATEImage diff --git a/charts/stable/webtop/ci/fedora-openbox-values.yaml b/charts/stable/webtop/ci/fedora-openbox-values.yaml new file mode 100644 index 00000000000..bf1377120a0 --- /dev/null +++ b/charts/stable/webtop/ci/fedora-openbox-values.yaml @@ -0,0 +1 @@ +imageSelector: fedoraMATEImage diff --git a/charts/stable/webtop/ci/fedora-xfce-values.yaml b/charts/stable/webtop/ci/fedora-xfce-values.yaml new file mode 100644 index 00000000000..cfe62c37411 --- /dev/null +++ b/charts/stable/webtop/ci/fedora-xfce-values.yaml @@ -0,0 +1 @@ +imageSelector: fedoraXFCEImage diff --git a/charts/stable/webtop/ci/ubuntu-i3-values.yaml b/charts/stable/webtop/ci/ubuntu-i3-values.yaml new file mode 100644 index 00000000000..4ba4a450e85 --- /dev/null +++ b/charts/stable/webtop/ci/ubuntu-i3-values.yaml @@ -0,0 +1 @@ +imageSelector: ubuntuI3Image diff --git a/charts/stable/webtop/ci/ubuntu-icewm-values.yaml b/charts/stable/webtop/ci/ubuntu-icewm-values.yaml new file mode 100644 index 00000000000..ecd6b3b66ce --- /dev/null +++ b/charts/stable/webtop/ci/ubuntu-icewm-values.yaml @@ -0,0 +1 @@ +imageSelector: ubuntuICEWMImage diff --git a/charts/stable/webtop/ci/ubuntu-kde-values.yaml b/charts/stable/webtop/ci/ubuntu-kde-values.yaml new file mode 100644 index 00000000000..fd9458047e0 --- /dev/null +++ b/charts/stable/webtop/ci/ubuntu-kde-values.yaml @@ -0,0 +1 @@ +imageSelector: ubuntuKDEImage diff --git a/charts/stable/webtop/ci/ubuntu-mate-values.yaml b/charts/stable/webtop/ci/ubuntu-mate-values.yaml new file mode 100644 index 00000000000..e9fa74db92d --- /dev/null +++ b/charts/stable/webtop/ci/ubuntu-mate-values.yaml @@ -0,0 +1 @@ +imageSelector: ubuntuMATEImage diff --git a/charts/stable/webtop/ci/ubuntu-openbox-values.yaml b/charts/stable/webtop/ci/ubuntu-openbox-values.yaml new file mode 100644 index 00000000000..31d0a0adb69 --- /dev/null +++ b/charts/stable/webtop/ci/ubuntu-openbox-values.yaml @@ -0,0 +1 @@ +imageSelector: ubuntuOpenBoxImage diff --git a/charts/stable/webtop/ci/ubuntu-xfce-values.yaml b/charts/stable/webtop/ci/ubuntu-xfce-values.yaml new file mode 100644 index 00000000000..d7af7c6d92f --- /dev/null +++ b/charts/stable/webtop/ci/ubuntu-xfce-values.yaml @@ -0,0 +1 @@ +imageSelector: ubuntuXFCEImage diff --git a/charts/stable/webtop/docs/credentials.md b/charts/stable/webtop/docs/credentials.md new file mode 100644 index 00000000000..6bcaeedfd51 --- /dev/null +++ b/charts/stable/webtop/docs/credentials.md @@ -0,0 +1,4 @@ +# Default credentials + +- Username: `abc` +- Password: `abc` diff --git a/charts/stable/webtop/questions.yaml b/charts/stable/webtop/questions.yaml index 9d5fa7c51cd..083897c3c80 100644 --- a/charts/stable/webtop/questions.yaml +++ b/charts/stable/webtop/questions.yaml @@ -4,6 +4,67 @@ portals: # Include{portalLink} questions: # Include{global} + - variable: imageSelector + group: Container Image + label: Select Image + schema: + type: string + default: image + enum: + # XFCE + - value: image + description: XFCE Alpine + - value: ubuntuXFCEImage + description: XFCE Ubuntu + - value: fedoraXFCEImage + description: XFCE Fedora + - value: archXFCEImage + description: XFCE Arch + # KDE + - value: alpineKDEImage + description: KDE Alpine + - value: ubuntuKDEImage + description: KDE Ubuntu + - value: fedoraKDEImage + description: KDE Fedora + - value: archKDEImage + description: KDE Arch + # Mate + - value: alpineMATEImage + description: Mate Alpine + - value: ubuntuMATEImage + description: Mate Ubuntu + - value: fedoraMATEImage + description: Mate Fedora + - value: archMATEImage + description: Mate Arch + # I3 + - value: alpineI3Image + description: I3 Alpine + - value: ubuntuI3Image + description: I3 Ubuntu + - value: fedoraI3Image + description: I3 Fedora + - value: archI3Image + description: I3 Arch + # OpenBox + - value: alpineOpenBoxImage + description: OpenBox Alpine + - value: ubuntuOpenBoxImage + description: OpenBox Ubuntu + - value: fedoraOpenBoxImage + description: OpenBox Fedora + - value: archOpenBoxImage + description: OpenBox Arch + # OpenBox + - value: alpineICEWMImage + description: ICEWM Alpine + - value: ubuntuICEWMImage + description: ICEWM Ubuntu + - value: fedoraICEWMImage + description: ICEWM Fedora + - value: archICEWMImage + description: ICEWM Arch # Include{controller} # Include{replicas} # Include{replica1} @@ -16,17 +77,48 @@ questions: type: dict attrs: - variable: TITLE - label: TITLE + label: Title description: String which will be used as page/tab title in the web browser. schema: type: string default: Webtop + - variable: AUTO_LOGIN + label: Auto Login + description: force login on the '/' path. + schema: + type: boolean + default: false - variable: KEYBOARD - label: KEYBOARD + label: Keyboard Layout description: See the keyboard layouts in https://docs.linuxserver.io/images/docker-webtop#application-setup schema: type: string default: en-us-qwerty + enum: + - value: en-us-qwerty + description: English US Qwerty + - value: es-es-qwerty + description: Spanish Qwerty + - value: en-gb-qwerty + description: English UK Qwerty + - value: da-dk-qwerty + description: Danish Qwerty + - value: de-ch-qwertz + description: German Qwertz + - value: fr-ch-qwertz + description: Swiss French Qwertz + - value: fr-fr-azerty + description: French Azerty + - value: it-it-qwerty + description: Italian Qwerty + - value: ja-jp-qwerty + description: Japanese Qwerty + - value: pt-br-qwerty + description: Portuguese Brazilian Qwerty + - value: sv-se-qwerty + description: Swedish Qwerty + - value: tr-tr-qwerty + description: Turkish-Q Qwerty # Include{containerConfig} # Include{serviceRoot} - variable: main diff --git a/charts/stable/webtop/values.yaml b/charts/stable/webtop/values.yaml index e15e9c74ee9..8b306b33476 100644 --- a/charts/stable/webtop/values.yaml +++ b/charts/stable/webtop/values.yaml @@ -2,9 +2,108 @@ image: pullPolicy: IfNotPresent repository: tccr.io/truecharts/webtop tag: latest@sha256:019ca865fbaf9629a2a767d022f67077544cdbee2aaaa488d7116ca4b5235931 +ubuntuXFCEImage: + repository: tccr.io/truecharts/webtop-ubuntu-xfce + tag: latest@sha256:9b0eda1e9db10385b26fd8d2f43a6e1dcd6183f88719af99a6b95e99648c7df9 + pullPolicy: Always +fedoraXFCEImage: + repository: tccr.io/truecharts/webtop-fedora-xfce + tag: latest@sha256:27b6424c32f6fe3a2bb48b7ffeea248c188e2f881f250fb5a9383f5e6e58ae4c + pullPolicy: Always +archXFCEImage: + repository: tccr.io/truecharts/webtop-arch-xfce + tag: latest@sha256:ee60bce14acf20b499d81a328e7f6518357bd3963fc200f21bd9c82862079057 + pullPolicy: Always + +alpineKDEImage: + repository: tccr.io/truecharts/webtop-alpine-kde + tag: latest@sha256:01b65e42fbe45d5f7c9899f654b4b76bdb9a1102ade40e99d5098b83e3fa4905 + pullPolicy: Always +ubuntuKDEImage: + repository: tccr.io/truecharts/webtop-ubuntu-kde + tag: latest@sha256:5ef627372afeebf1c322bbf87a585d02caf98b33028f4a647453a2d9297de67b + pullPolicy: Always +fedoraKDEImage: + repository: tccr.io/truecharts/webtop-fedora-kde + tag: latest@sha256:25b5f4c4252ede0fb8d8b676a0846d145b76abfef4d856610886025ca043dcf8 + pullPolicy: Always +archKDEImage: + repository: tccr.io/truecharts/webtop-arch-kde + tag: latest@sha256:7919bd3fa8ac64893ba121f05bb43b52b5a36e3f3e15c7cd8b40baccadb8ae8f + pullPolicy: Always + +alpineMATEImage: + repository: tccr.io/truecharts/webtop-alpine-mate + tag: latest@sha256:07e0b43e7d7a87be029c38a066fd1fac6735fdf8c47e58022633049f4062b31d + pullPolicy: Always +ubuntuMATEImage: + repository: tccr.io/truecharts/webtop-ubuntu-mate + tag: latest@sha256:ce8260fcb3b912275236195d3c73b27ea3102f18112eede3923cd2a95fabde61 + pullPolicy: Always +fedoraMATEImage: + repository: tccr.io/truecharts/webtop-fedora-mate + tag: latest@sha256:3342b080f9037a8be6a3a892e52c3640b983487206405a1eae92aada33b09ee7 + pullPolicy: Always +archMATEImage: + repository: tccr.io/truecharts/webtop-arch-mate + tag: latest@sha256:04cb879cc4b4c00f8210e771a7d952522b1cd32984774cd164656f41e69424be + pullPolicy: Always + +alpineI3Image: + repository: tccr.io/truecharts/webtop-alpine-i3 + tag: latest@sha256:666c1d516aa8e6de4c646dfc3e673de7a1eaf8350280d87bbccb8ba3fc2d0ca7 + pullPolicy: Always +ubuntuI3Image: + repository: tccr.io/truecharts/webtop-ubuntu-i3 + tag: latest@sha256:59e69eb8872218e05b52805c038601a9a217fdd1075ff999548d51921e6383c1 + pullPolicy: Always +fedoraI3Image: + repository: tccr.io/truecharts/webtop-fedora-i3 + tag: latest@sha256:162c2681dd035537c19b608e21334576947b113f58428ab25857886ac9ae7364 + pullPolicy: Always +archI3Image: + repository: tccr.io/truecharts/webtop-arch-i3 + tag: latest@sha256:8e1d7334aa9830795056e6c917b7173705147ce6afbdc6ea1e54260dcc56050a + pullPolicy: Always + +alpineOpenBoxImage: + repository: tccr.io/truecharts/webtop-alpine-openbox + tag: latest@sha256:f356142f3cb683c90950ea29c0d145b709784a1eb056ffa0974d9341548ee368 + pullPolicy: Always +ubuntuOpenBoxImage: + repository: tccr.io/truecharts/webtop-ubuntu-openbox + tag: latest@sha256:c8dd02d3d054337000a4bffe09b3e3b6ccedd42a50252cc858b832b99a51f939 + pullPolicy: Always +fedoraOpenBoxImage: + repository: tccr.io/truecharts/webtop-fedora-openbox + tag: latest@sha256:1912cf2a0ff980df834a9c13e15f0b75ee5f6892cd9d029f9d31ba51e297bab5 + pullPolicy: Always +archOpenBoxImage: + repository: tccr.io/truecharts/webtop-arch-openbox + tag: latest@sha256:ae4050d5d2fe5fedd30bf3b2f39b4b5cd2eca64f0d5304bb0cce1b0a3746af3c + pullPolicy: Always + +alpineICEWMImage: + repository: tccr.io/truecharts/webtop-alpine-icewm + tag: latest@sha256:ca4d6c55e04812fad8c7319c7a30d64477fa43f0c16eec357446ff7596b5170f + pullPolicy: Always +ubuntuICEWMImage: + repository: tccr.io/truecharts/webtop-ubuntu-icewm + tag: latest@sha256:0edf108e60d112caacfd244f26fac43eb7778fb67051066ee8020cfa7abe55fe + pullPolicy: Always +fedoraICEWMImage: + repository: tccr.io/truecharts/webtop-fedora-icewm + tag: latest@sha256:fbff8598c738e17e3ba7428a72cf50b3950c2cc77a5fb77fb1a1f6b40e3473f1 + pullPolicy: Always +archICEWMImage: + repository: tccr.io/truecharts/webtop-arch-icewm + tag: latest@sha256:bd6e547036d4aa633fd7c76e0d6500cd6310eda090725f5bef78b53989bd036e + pullPolicy: Always + +imageSelector: image env: - KEYBOARD: "" + KEYBOARD: "en-us-qwerty" CUSTOM_PORT: "{{ .Values.service.main.ports.main.port }}" podSecurityContext: