From 6f3c7b0259b81c0c8c86e98dfdb3b3ff968e2602 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 2 Jun 2025 20:09:36 +0000 Subject: [PATCH 1/8] Update version in config.json and build.json --- addons/adb_server/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/adb_server/config.json b/addons/adb_server/config.json index da1a861..b82aff9 100644 --- a/addons/adb_server/config.json +++ b/addons/adb_server/config.json @@ -1,6 +1,6 @@ { "name": "ADB Server", - "version": "2.0.2", + "version": "dev-2.0.2", "slug": "adb_server", "description": "A Home Assistant add-on for ADB Server with restricted shell access.", "arch": [ From be132f1791e4ccd9662fc8eb61c566c17be3e118 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 2 Jun 2025 20:10:54 +0000 Subject: [PATCH 2/8] Update config.json with new image URL and build.json with build date --- addons/adb_server/build.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/adb_server/build.json b/addons/adb_server/build.json index f24372c..ae876ff 100644 --- a/addons/adb_server/build.json +++ b/addons/adb_server/build.json @@ -14,6 +14,6 @@ "BUILD_REF": "main", "BUILD_REPOSITORY": "github.com/Amateur-God/Hassio-Addons", "BUILD_VERSION": "2.0.2", - "DEV_BUILD_DATE": "2024-09-27T17:03:33Z" + "DEV_BUILD_DATE": "2025-06-02T20:10:54Z" } } From cff32146dffa7236cd1aacae484251c99c471185 Mon Sep 17 00:00:00 2001 From: Amateur-God Date: Mon, 28 Jul 2025 13:29:01 +0100 Subject: [PATCH 3/8] update to build latest from google for amd64 --- addons/adb_server/Dockerfile | 31 +++++++++++++++++++++++++++---- addons/adb_server/build.json | 2 +- addons/adb_server/config.json | 2 +- 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/addons/adb_server/Dockerfile b/addons/adb_server/Dockerfile index 08c5bb1..6f84879 100644 --- a/addons/adb_server/Dockerfile +++ b/addons/adb_server/Dockerfile @@ -4,10 +4,10 @@ FROM ${BUILD_FROM} # Install necessary packages and wget for downloading tini RUN apt-get update && \ - apt-get install -y android-sdk-platform-tools wget bash build-essential cmake git libjson-c-dev libwebsockets-dev dos2unix && \ - rm -rf /var/lib/apt/lists/* && \ - git clone https://github.com/tsl0922/ttyd.git + apt-get install -y --no-install-recommends wget unzip bash build-essential cmake git libjson-c-dev libwebsockets-dev dos2unix && \ + rm -rf /var/lib/apt/lists/* +RUN git clone https://github.com/tsl0922/ttyd.git WORKDIR /ttyd RUN mkdir build @@ -15,8 +15,31 @@ WORKDIR /ttyd/build RUN cmake .. && \ make && make install -# Download and install tini based on the target architecture + ARG TARGETARCH +RUN case "$TARGETARCH" in \ + "amd64") \ + echo "Fetching latest amd64 platform-tools from Google" && \ + wget -q https://dl.google.com/android/repository/platform-tools-latest-linux.zip -O /tmp/platform-tools.zip && \ + unzip -q /tmp/platform-tools.zip -d /opt && \ + rm /tmp/platform-tools.zip \ + ;; \ + "arm64" | "arm" | "386") \ + echo "Fetching platform-tools for $TARGETARCH from apt" && \ + apt-get update && \ + apt-get install -y --no-install-recommends android-sdk-platform-tools && \ + rm -rf /var/lib/apt/lists/* \ + ;; \ + *) \ + echo "Unsupported architecture for adb installation: $TARGETARCH" && \ + exit 1 \ + ;; \ + esac + + +ENV PATH="/opt/platform-tools:${PATH}" + +# Download and install tini based on the target architecture RUN case "$TARGETARCH" in \ "amd64") TINI_URL="https://github.com/krallin/tini/releases/download/v0.19.0/tini";; \ "arm64") TINI_URL="https://github.com/krallin/tini/releases/download/v0.19.0/tini-arm64";; \ diff --git a/addons/adb_server/build.json b/addons/adb_server/build.json index ae876ff..1088618 100644 --- a/addons/adb_server/build.json +++ b/addons/adb_server/build.json @@ -13,7 +13,7 @@ "BUILD_NAME": "ADB Server", "BUILD_REF": "main", "BUILD_REPOSITORY": "github.com/Amateur-God/Hassio-Addons", - "BUILD_VERSION": "2.0.2", + "BUILD_VERSION": "3.0.0", "DEV_BUILD_DATE": "2025-06-02T20:10:54Z" } } diff --git a/addons/adb_server/config.json b/addons/adb_server/config.json index b82aff9..aba2a38 100644 --- a/addons/adb_server/config.json +++ b/addons/adb_server/config.json @@ -1,6 +1,6 @@ { "name": "ADB Server", - "version": "dev-2.0.2", + "version": "dev-3.0.0", "slug": "adb_server", "description": "A Home Assistant add-on for ADB Server with restricted shell access.", "arch": [ From 3d46610f6e5b281f50ca377561a72fccfac9f2cd Mon Sep 17 00:00:00 2001 From: Amateur-God Date: Mon, 28 Jul 2025 13:32:21 +0100 Subject: [PATCH 4/8] update previous verison --- addons/adb_server/previous_version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/adb_server/previous_version.txt b/addons/adb_server/previous_version.txt index 45a1b3f..e9307ca 100644 --- a/addons/adb_server/previous_version.txt +++ b/addons/adb_server/previous_version.txt @@ -1 +1 @@ -1.1.2 +2.0.2 From b6176b4f9fa4285b6281e2e0748d7737236484d4 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 28 Jul 2025 12:32:47 +0000 Subject: [PATCH 5/8] Update version in config.json and build.json --- addons/adb_server/build.json | 2 +- addons/adb_server/config.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/adb_server/build.json b/addons/adb_server/build.json index 1088618..ae876ff 100644 --- a/addons/adb_server/build.json +++ b/addons/adb_server/build.json @@ -13,7 +13,7 @@ "BUILD_NAME": "ADB Server", "BUILD_REF": "main", "BUILD_REPOSITORY": "github.com/Amateur-God/Hassio-Addons", - "BUILD_VERSION": "3.0.0", + "BUILD_VERSION": "2.0.2", "DEV_BUILD_DATE": "2025-06-02T20:10:54Z" } } diff --git a/addons/adb_server/config.json b/addons/adb_server/config.json index aba2a38..b82aff9 100644 --- a/addons/adb_server/config.json +++ b/addons/adb_server/config.json @@ -1,6 +1,6 @@ { "name": "ADB Server", - "version": "dev-3.0.0", + "version": "dev-2.0.2", "slug": "adb_server", "description": "A Home Assistant add-on for ADB Server with restricted shell access.", "arch": [ From 39ca0493cf1aad9f672532be69fdf52b12c4a6b8 Mon Sep 17 00:00:00 2001 From: Amateur-God Date: Mon, 28 Jul 2025 13:36:04 +0100 Subject: [PATCH 6/8] update version.txt --- addons/adb_server/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/adb_server/version.txt b/addons/adb_server/version.txt index e9307ca..4a36342 100644 --- a/addons/adb_server/version.txt +++ b/addons/adb_server/version.txt @@ -1 +1 @@ -2.0.2 +3.0.0 From 930b44ecbebfb5d533ea3d28762d9905c05e9a79 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 28 Jul 2025 12:36:28 +0000 Subject: [PATCH 7/8] Update version in config.json and build.json --- addons/adb_server/build.json | 2 +- addons/adb_server/config.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/adb_server/build.json b/addons/adb_server/build.json index ae876ff..1088618 100644 --- a/addons/adb_server/build.json +++ b/addons/adb_server/build.json @@ -13,7 +13,7 @@ "BUILD_NAME": "ADB Server", "BUILD_REF": "main", "BUILD_REPOSITORY": "github.com/Amateur-God/Hassio-Addons", - "BUILD_VERSION": "2.0.2", + "BUILD_VERSION": "3.0.0", "DEV_BUILD_DATE": "2025-06-02T20:10:54Z" } } diff --git a/addons/adb_server/config.json b/addons/adb_server/config.json index b82aff9..aba2a38 100644 --- a/addons/adb_server/config.json +++ b/addons/adb_server/config.json @@ -1,6 +1,6 @@ { "name": "ADB Server", - "version": "dev-2.0.2", + "version": "dev-3.0.0", "slug": "adb_server", "description": "A Home Assistant add-on for ADB Server with restricted shell access.", "arch": [ From 83d3f15ea1a9ccee2557299b43b9675ce3a73cc2 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 28 Jul 2025 12:37:28 +0000 Subject: [PATCH 8/8] Update config.json with new image URL and build.json with build date --- addons/adb_server/build.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/adb_server/build.json b/addons/adb_server/build.json index 1088618..71179d0 100644 --- a/addons/adb_server/build.json +++ b/addons/adb_server/build.json @@ -14,6 +14,6 @@ "BUILD_REF": "main", "BUILD_REPOSITORY": "github.com/Amateur-God/Hassio-Addons", "BUILD_VERSION": "3.0.0", - "DEV_BUILD_DATE": "2025-06-02T20:10:54Z" + "DEV_BUILD_DATE": "2025-07-28T12:37:28Z" } }