fix docker for tauri app
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
FROM ubuntu:24.04
|
FROM ghcr.io/cirruslabs/android-sdk:35
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
ENV DEBIAN_FRONTEND=noninteractive
|
||||||
ENV ANDROID_HOME=/opt/android-sdk
|
ENV ANDROID_HOME=/opt/android-sdk
|
||||||
@@ -9,7 +9,6 @@ ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
|
|||||||
ENV PATH=/root/.cargo/bin:/opt/android-sdk/cmdline-tools/latest/bin:/opt/android-sdk/platform-tools:/usr/local/bin:$PATH
|
ENV PATH=/root/.cargo/bin:/opt/android-sdk/cmdline-tools/latest/bin:/opt/android-sdk/platform-tools:/usr/local/bin:$PATH
|
||||||
|
|
||||||
ARG NPM_REGISTRY=https://registry.npmjs.org
|
ARG NPM_REGISTRY=https://registry.npmjs.org
|
||||||
ARG ANDROID_CMDLINE_TOOLS_VERSION=13114758
|
|
||||||
|
|
||||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
@@ -23,27 +22,15 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
|
|||||||
openjdk-17-jdk \
|
openjdk-17-jdk \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
RUN if [ ! -d "${ANDROID_HOME}" ] && [ -d /opt/android-sdk-linux ]; then ln -s /opt/android-sdk-linux "${ANDROID_HOME}"; fi \
|
||||||
|
&& sdkmanager --version
|
||||||
|
|
||||||
RUN curl -fsSL https://deb.nodesource.com/setup_24.x | bash - \
|
RUN curl -fsSL https://deb.nodesource.com/setup_24.x | bash - \
|
||||||
&& apt-get update \
|
&& apt-get update \
|
||||||
&& apt-get install -y --no-install-recommends nodejs \
|
&& apt-get install -y --no-install-recommends nodejs \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
RUN mkdir -p ${ANDROID_HOME}/cmdline-tools \
|
RUN yes | sdkmanager --licenses >/dev/null || true \
|
||||||
&& set -eux; \
|
|
||||||
for version in "${ANDROID_CMDLINE_TOOLS_VERSION}" 13114758 12266719 11076708 10406996; do \
|
|
||||||
url="https://dl.google.com/android/repository/commandlinetools-linux-${version}_latest.zip"; \
|
|
||||||
echo "Пробуем скачать Android command line tools: ${url}"; \
|
|
||||||
if curl -fsSL "${url}" -o /tmp/android-tools.zip; then \
|
|
||||||
break; \
|
|
||||||
fi; \
|
|
||||||
rm -f /tmp/android-tools.zip; \
|
|
||||||
done; \
|
|
||||||
test -s /tmp/android-tools.zip; \
|
|
||||||
unzip -q /tmp/android-tools.zip -d /tmp/android-tools; \
|
|
||||||
mv /tmp/android-tools/cmdline-tools ${ANDROID_HOME}/cmdline-tools/latest; \
|
|
||||||
rm -rf /tmp/android-tools /tmp/android-tools.zip
|
|
||||||
|
|
||||||
RUN yes | sdkmanager --licenses >/dev/null \
|
|
||||||
&& sdkmanager \
|
&& sdkmanager \
|
||||||
"platform-tools" \
|
"platform-tools" \
|
||||||
"platforms;android-35" \
|
"platforms;android-35" \
|
||||||
|
|||||||
Reference in New Issue
Block a user