joshpatra/allstarr
1
0 Fork 0
mirror of https://github.com/SoPat712/allstarr.git synced 2026-10-08 14:05:02 -04:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix: resolve container architecture mismatch in docker-compose builds using uname -m fallback

Browse Source
This commit is contained in:
joshpatra committed 2026-07-08 10:23:28 -04:00
1 parent 088dbff281
commit 0d0349728d
1 file changed
+12 -4
Download Patch File Download Diff File Expand all files Collapse all files
gamdl-aio/Dockerfile
+12 -4
View File
@@ -35,8 +35,12 @@ WORKDIR /app/wrapper-v2
COPY wrapper-v2/ /app/wrapper-v2
# Map TARGETARCH to Android NDK target arch
RUN target_ndk_arch="arm64-v8a"; \
if [[ "$TARGETARCH" == "amd64" ]]; then \
RUN host_arch="${TARGETARCH}"; \
if [[ -z "$host_arch" ]]; then \
host_arch=$(uname -m); \
fi; \
target_ndk_arch="arm64-v8a"; \
if [[ "$host_arch" == "amd64" || "$host_arch" == "x86_64" ]]; then \
target_ndk_arch="x86_64"; \
fi && \
bash tools/stage-system.sh --arch "$target_ndk_arch" && \
@@ -45,10 +49,14 @@ RUN target_ndk_arch="arm64-v8a"; \
# Compile daemon and wrapper launcher
RUN host_cc=(); \
host_arch="${TARGETARCH}"; \
if [[ -z "$host_arch" ]]; then \
host_arch=$(uname -m); \
fi; \
target_ndk_arch="arm64-v8a"; \
if [[ "$TARGETARCH" == "amd64" ]]; then \
if [[ "$host_arch" == "amd64" || "$host_arch" == "x86_64" ]]; then \
target_ndk_arch="x86_64"; \
elif [[ "$TARGETARCH" == "arm64" && "$(uname -m)" != "aarch64" ]]; then \
elif [[ "$host_arch" == "arm64" && "$(uname -m)" != "aarch64" ]]; then \
host_cc=( \
-DCMAKE_C_COMPILER=aarch64-linux-gnu-gcc \
-DCMAKE_CXX_COMPILER=aarch64-linux-gnu-g++ \