Skip to content

Commit 0b0d423

Browse files
Amateur-Godgithub-actions
andauthored
Build latest adb instead of apt version (#13)
* Update version in config.json and build.json * Update config.json with new image URL and build.json with build date * update to build latest from google for amd64 * update previous verison * Update version in config.json and build.json * update version.txt * Update version in config.json and build.json * Update config.json with new image URL and build.json with build date --------- Co-authored-by: github-actions <github-actions@github.com>
1 parent 1a317f9 commit 0b0d423

File tree

5 files changed

+32
-9
lines changed

5 files changed

+32
-9
lines changed

addons/adb_server/Dockerfile

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,42 @@ FROM ${BUILD_FROM}
44

55
# Install necessary packages and wget for downloading tini
66
RUN apt-get update && \
7-
apt-get install -y android-sdk-platform-tools wget bash build-essential cmake git libjson-c-dev libwebsockets-dev dos2unix && \
8-
rm -rf /var/lib/apt/lists/* && \
9-
git clone https://github.com/tsl0922/ttyd.git
7+
apt-get install -y --no-install-recommends wget unzip bash build-essential cmake git libjson-c-dev libwebsockets-dev dos2unix && \
8+
rm -rf /var/lib/apt/lists/*
109

10+
RUN git clone https://github.com/tsl0922/ttyd.git
1111

1212
WORKDIR /ttyd
1313
RUN mkdir build
1414
WORKDIR /ttyd/build
1515
RUN cmake .. && \
1616
make && make install
1717

18-
# Download and install tini based on the target architecture
18+
1919
ARG TARGETARCH
20+
RUN case "$TARGETARCH" in \
21+
"amd64") \
22+
echo "Fetching latest amd64 platform-tools from Google" && \
23+
wget -q https://dl.google.com/android/repository/platform-tools-latest-linux.zip -O /tmp/platform-tools.zip && \
24+
unzip -q /tmp/platform-tools.zip -d /opt && \
25+
rm /tmp/platform-tools.zip \
26+
;; \
27+
"arm64" | "arm" | "386") \
28+
echo "Fetching platform-tools for $TARGETARCH from apt" && \
29+
apt-get update && \
30+
apt-get install -y --no-install-recommends android-sdk-platform-tools && \
31+
rm -rf /var/lib/apt/lists/* \
32+
;; \
33+
*) \
34+
echo "Unsupported architecture for adb installation: $TARGETARCH" && \
35+
exit 1 \
36+
;; \
37+
esac
38+
39+
40+
ENV PATH="/opt/platform-tools:${PATH}"
41+
42+
# Download and install tini based on the target architecture
2043
RUN case "$TARGETARCH" in \
2144
"amd64") TINI_URL="https://github.com/krallin/tini/releases/download/v0.19.0/tini";; \
2245
"arm64") TINI_URL="https://github.com/krallin/tini/releases/download/v0.19.0/tini-arm64";; \

addons/adb_server/build.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"BUILD_NAME": "ADB Server",
1414
"BUILD_REF": "main",
1515
"BUILD_REPOSITORY": "github.com/Amateur-God/Hassio-Addons",
16-
"BUILD_VERSION": "2.0.2",
17-
"DEV_BUILD_DATE": "2024-09-27T17:03:33Z"
16+
"BUILD_VERSION": "3.0.0",
17+
"DEV_BUILD_DATE": "2025-07-28T12:37:28Z"
1818
}
1919
}

addons/adb_server/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ADB Server",
3-
"version": "2.0.2",
3+
"version": "dev-3.0.0",
44
"slug": "adb_server",
55
"description": "A Home Assistant add-on for ADB Server with restricted shell access.",
66
"arch": [
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.1.2
1+
2.0.2

addons/adb_server/version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.0.2
1+
3.0.0

0 commit comments

Comments
 (0)