From 2bceb04fec008b971f5afaf096403e8c0ff09b2c Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Sat, 4 Dec 2021 01:56:04 +0100 Subject: [PATCH 01/11] Update to 15.9.10 --- cloudcommander/CHANGELOG.md | 3 +++ cloudcommander/config.json | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cloudcommander/CHANGELOG.md b/cloudcommander/CHANGELOG.md index fa5030fa3..d6f77ce1e 100644 --- a/cloudcommander/CHANGELOG.md +++ b/cloudcommander/CHANGELOG.md @@ -1,4 +1,7 @@ +## 15.9.10 (04-12-2021) +- Update to latest version from coderaiser/cloudcmd + ## 15.9.9 (22-11-2021) - Update to latest version from coderaiser/cloudcmd - Allow mounting local drives by label. Just pust the label instead of sda1 for example diff --git a/cloudcommander/config.json b/cloudcommander/config.json index b99e31a5e..0aae4c962 100644 --- a/cloudcommander/config.json +++ b/cloudcommander/config.json @@ -59,8 +59,8 @@ "DROPBOX_TOKEN": "str?" }, "slug": "cloudcommander", - "upstream": "15.9.9", + "upstream": "15.9.10", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/cloudcommander#readme", - "version": "15.9.9", + "version": "15.9.10", "webui": "http://[HOST]:[PORT:8000]" } From ba4867e7995ec269ea00012c76d13708e006bcb6 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sat, 4 Dec 2021 07:05:13 +0100 Subject: [PATCH 02/11] "/dev/nvme0" --- scrutiny/config.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scrutiny/config.json b/scrutiny/config.json index ae8a5c0ad..12c26dab4 100644 --- a/scrutiny/config.json +++ b/scrutiny/config.json @@ -42,7 +42,8 @@ "/dev/sdd2", "/dev/sde2", "/dev/sdf2", - "/dev/sdg2" + "/dev/sdg2", + "/dev/nvme0" ], "privileged": [ "SYS_ADMIN", From a8f1aaa76a8ad70dc79d3a1141471bdb271295bf Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sat, 4 Dec 2021 07:05:33 +0100 Subject: [PATCH 03/11] Update CHANGELOG.md --- scrutiny/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/scrutiny/CHANGELOG.md b/scrutiny/CHANGELOG.md index e1c73398f..48a50a9be 100644 --- a/scrutiny/CHANGELOG.md +++ b/scrutiny/CHANGELOG.md @@ -1,3 +1,4 @@ +- Added : "/dev/nvme0" ## 0.3.13 (26-10-2021) - Update to latest version from analogj/scrutiny From cb68b70de4483aa09b41560934d6440cb0a22dc8 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sat, 4 Dec 2021 07:06:13 +0100 Subject: [PATCH 04/11] "/dev/nvme0" --- scrutiny/apparmor.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/scrutiny/apparmor.txt b/scrutiny/apparmor.txt index 3499d984a..38392ea55 100644 --- a/scrutiny/apparmor.txt +++ b/scrutiny/apparmor.txt @@ -42,6 +42,7 @@ profile db21ed7f_scrutiny flags=(attach_disconnected,mediate_deleted) { /dev/sde mrwkl, /dev/sdf mrwkl, /dev/sdg mrwkl, + /dev/nvme0 mrwkl, # Data access /data/** rw, From 94f0b5c5b06a3ff744f748e6b0229302881e3f1f Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sat, 4 Dec 2021 07:06:29 +0100 Subject: [PATCH 05/11] /dev/nvme0 --- scrutiny/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scrutiny/config.json b/scrutiny/config.json index 12c26dab4..294996299 100644 --- a/scrutiny/config.json +++ b/scrutiny/config.json @@ -1,6 +1,6 @@ { "name": "Scrutiny", - "version": "0.3.13-2", + "version": "0.3.13-3", "upstream": "0.3.13", "slug": "scrutiny", "description": "Scrutiny WebUI for smartd S.M.A.R.T monitoring", From 2f7498e76ad4a9059fe62f8e5d0fae2a38a8bc76 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sat, 4 Dec 2021 07:09:42 +0100 Subject: [PATCH 06/11] Update Dockerfile --- scrutiny/Dockerfile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/scrutiny/Dockerfile b/scrutiny/Dockerfile index 9a2626492..71854386c 100644 --- a/scrutiny/Dockerfile +++ b/scrutiny/Dockerfile @@ -11,11 +11,8 @@ ARG TEMPIO_VERSION=2021.01.0 ARG BUILD_ARCH RUN \ - # Install script - chmod a+x /run.sh \ - \ # Add apps - && apk add --no-cache \ + apk add --no-cache \ jq \ curl \ cifs-utils \ @@ -34,7 +31,11 @@ RUN \ | tar -xzf - --strip 1 -C /tmp/bashio \ && mv /tmp/bashio/lib /usr/lib/bashio \ && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \ - && rm -rf /tmp/bashio \ + && rm -rf /tmp/bashio || true + +RUN \ + # Install script + chmod a+x /run.sh \ \ # Allow UID and GID setting && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ From bf3b7b621cc5825b65023c926004138b949231e0 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sat, 4 Dec 2021 07:12:32 +0100 Subject: [PATCH 07/11] Create 00-aaa_dockerfile_backup.sh --- .../cont-init.d/00-aaa_dockerfile_backup.sh | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 scrutiny/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh diff --git a/scrutiny/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/scrutiny/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh new file mode 100644 index 000000000..363810554 --- /dev/null +++ b/scrutiny/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh @@ -0,0 +1,35 @@ +#!/bin/bash +# If dockerfile failed install manually +if [ ! -f "/usr/bin/bashio" ]; then + echo "Bashio does not exist, executing script" + ( + ################ + # Install apps # + ################ + apk add --no-cache \ + jq \ + curl \ + cifs-utils \ + nginx + + ################### + # Install bashio # + ################## + BASHIO_VERSION=0.14.3 + mkdir -p /tmp/bashio + curl -L -f -s "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" | + tar -xzf - --strip 1 -C /tmp/bashio + mv /tmp/bashio/lib /usr/lib/bashio + ln -s /usr/lib/bashio/bashio /usr/bin/bashio + rm -rf /tmp/bashio + + ################### + # Install tempio # + ################## + curl -L -f -s -o /usr/bin/tempio \ + "https://github.com/home-assistant/tempio/releases/download/${TEMPIO_VERSION}/tempio_${BUILD_ARCH}" \ + && chmod a+x /usr/bin/tempio + + ) >/dev/null + +fi From 76b88d4fe5c51ffa97f7ade681dbe05c9f5891b8 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sat, 4 Dec 2021 07:14:46 +0100 Subject: [PATCH 08/11] Update config.json --- scrutiny/config.json | 1 + 1 file changed, 1 insertion(+) diff --git a/scrutiny/config.json b/scrutiny/config.json index 294996299..96e8923f5 100644 --- a/scrutiny/config.json +++ b/scrutiny/config.json @@ -29,6 +29,7 @@ "/dev/sde", "/dev/sdf", "/dev/sdg", + "/dev/nvme", "/dev/sda1", "/dev/sdb1", "/dev/sdc1", From 63db09512d171b4c856d977e8d05ac97991a753e Mon Sep 17 00:00:00 2001 From: alexbelgium Date: Sat, 4 Dec 2021 07:46:54 +0100 Subject: [PATCH 09/11] Update to debian --- teamspeak/CHANGELOG.md | 3 +++ teamspeak/config.json | 15 +++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/teamspeak/CHANGELOG.md b/teamspeak/CHANGELOG.md index 66f7e8b76..8372cb6c5 100644 --- a/teamspeak/CHANGELOG.md +++ b/teamspeak/CHANGELOG.md @@ -1 +1,4 @@ + +## debian (04-12-2021) +- Update to latest version from mbentley/teamspeak - Initial release diff --git a/teamspeak/config.json b/teamspeak/config.json index 6c0bf563f..9d3292e8b 100644 --- a/teamspeak/config.json +++ b/teamspeak/config.json @@ -1,5 +1,10 @@ { - "arch": ["aarch64", "amd64", "armhf", "armv7"], + "arch": [ + "aarch64", + "amd64", + "armhf", + "armv7" + ], "description": "voice communication for online gaming, education and training", "environment": { "TS3SERVER_LICENSE": "accept", @@ -9,7 +14,9 @@ "DIST_UPDATE": "1", "TS_UPDATE": "1" }, - "map": ["share:rw"], + "map": [ + "share:rw" + ], "name": "Teamspeak server", "ports": { "9987/udp": "9987", @@ -24,7 +31,7 @@ "41144/tcp": "TSDNS" }, "slug": "teamspeak", - "upstream": "3.13.6", + "upstream": "debian", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "3.13.6" + "version": "debian" } From 351b66f4c5d332065bec64e07c37a982311e7150 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sat, 4 Dec 2021 08:09:06 +0100 Subject: [PATCH 10/11] 3.13.6 --- teamspeak/config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/teamspeak/config.json b/teamspeak/config.json index 9d3292e8b..0fc51f0d1 100644 --- a/teamspeak/config.json +++ b/teamspeak/config.json @@ -31,7 +31,7 @@ "41144/tcp": "TSDNS" }, "slug": "teamspeak", - "upstream": "debian", + "upstream": "3.13.6", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "debian" + "version": "3.13.6" } From 580f949c9fa876a21f094ae89ff57914148d060b Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sat, 4 Dec 2021 08:29:53 +0100 Subject: [PATCH 11/11] "/dev/mmcblk0p1" --- scrutiny/config.json | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scrutiny/config.json b/scrutiny/config.json index 96e8923f5..0a92f17a6 100644 --- a/scrutiny/config.json +++ b/scrutiny/config.json @@ -29,7 +29,8 @@ "/dev/sde", "/dev/sdf", "/dev/sdg", - "/dev/nvme", + "/dev/nvme", + "/dev/mmcblk", "/dev/sda1", "/dev/sdb1", "/dev/sdc1", @@ -44,7 +45,11 @@ "/dev/sde2", "/dev/sdf2", "/dev/sdg2", - "/dev/nvme0" + "/dev/nvme0", + "/dev/nvme1", + "/dev/nvme2", + "/dev/mmcblk0", + "/dev/mmcblk0p1" ], "privileged": [ "SYS_ADMIN",