fix docker for tauri app
This commit is contained in:
@@ -9,6 +9,7 @@ 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 \
|
||||||
@@ -20,15 +21,27 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
|
|||||||
pkg-config \
|
pkg-config \
|
||||||
libssl-dev \
|
libssl-dev \
|
||||||
openjdk-17-jdk \
|
openjdk-17-jdk \
|
||||||
nodejs \
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
npm \
|
|
||||||
|
RUN curl -fsSL https://deb.nodesource.com/setup_24.x | bash - \
|
||||||
|
&& apt-get update \
|
||||||
|
&& 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 mkdir -p ${ANDROID_HOME}/cmdline-tools \
|
||||||
&& curl -fsSL https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip -o /tmp/android-tools.zip \
|
&& set -eux; \
|
||||||
&& unzip -q /tmp/android-tools.zip -d /tmp/android-tools \
|
for version in "${ANDROID_CMDLINE_TOOLS_VERSION}" 13114758 12266719 11076708 10406996; do \
|
||||||
&& mv /tmp/android-tools/cmdline-tools ${ANDROID_HOME}/cmdline-tools/latest \
|
url="https://dl.google.com/android/repository/commandlinetools-linux-${version}_latest.zip"; \
|
||||||
&& rm -rf /tmp/android-tools /tmp/android-tools.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 \
|
RUN yes | sdkmanager --licenses >/dev/null \
|
||||||
&& sdkmanager \
|
&& sdkmanager \
|
||||||
|
|||||||
Reference in New Issue
Block a user