Skip to content

Enhance adb installation process and ensure platform-tools are available at runtime #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Amateur-God merged 1 commit into from
Oct 17, 2025
Merged

Enhance adb installation process and ensure platform-tools are available at runtime #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 20 additions & 7 deletions addons/adb_server/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,37 @@ RUN cmake .. && \


ARG TARGETARCH
# Install adb / platform-tools in a robust manner:
# - Prefer the Debian package if available for the target architecture
# - For amd64, prefer Google's platform-tools zip (gives latest tools)
# - If packages are not available, try the platform-tools zip as a fallback
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 \
rm /tmp/platform-tools.zip || true ;\
;; \
"arm64" | "arm" | "386") \
echo "Fetching platform-tools for $TARGETARCH from apt" && \
echo "Attempting to install platform-tools from apt for $TARGETARCH" && \
apt-get update && \
apt-get install -y --no-install-recommends android-sdk-platform-tools && \
rm -rf /var/lib/apt/lists/* \
apt-get install -y --no-install-recommends android-sdk-platform-tools android-tools-adb adb || true && \
rm -rf /var/lib/apt/lists/* ;\
;; \
*) \
echo "Unsupported architecture for adb installation: $TARGETARCH" && \
exit 1 \
echo "Unsupported architecture for adb installation: $TARGETARCH - attempting apt install fallback" && \
apt-get update && \
apt-get install -y --no-install-recommends android-sdk-platform-tools android-tools-adb adb || true && \
rm -rf /var/lib/apt/lists/* ;\
;; \
esac
esac && \
# Verify adb is available; if not present try fetching Google's platform-tools as a fallback
if ! command -v adb >/dev/null 2>&1 ; then \
echo "adb not found after package install, attempting platform-tools zip fallback" && \
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 -f /tmp/platform-tools.zip || true ; \
fi


ENV PATH="/opt/platform-tools:${PATH}"
Expand Down
3 changes: 3 additions & 0 deletions addons/adb_server/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ ln -sf /config/.android /root/.android
# Get the configured ADB port
ADB_PORT=${ADB_PORT:-5037}

# Ensure platform-tools are on PATH at runtime (in case ENV didn't propagate)
export PATH="/opt/platform-tools:${PATH}"

# Start ADB server
adb -a -P "${ADB_PORT}" start-server
echo "ADB server started on port ${ADB_PORT}"
Expand Down
Loading