feat: solve sdkmanager

HiWay-Media · Nov 28, 2024 · 40463ae · 40463ae
1 parent 06ec136
commit 40463ae
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 24 deletions.
diff --git a/Dockerfile.2023.11.3 b/Dockerfile.2023.11.3
@@ -9,26 +9,16 @@ RUN mkdir -p ~/Android/Sdk/cmdline-tools
 RUN unzip commandlinetools.zip -d ~/Android/Sdk/cmdline-tools
 RUN mv ~/Android/Sdk/cmdline-tools/cmdline-tools ~/Android/Sdk/cmdline-tools/latest
 #
-#RUN export ANDROID_SDK_ROOT=~/Android/Sdk
-#RUN export PATH=$PATH:$ANDROID_SDK_ROOT/cmdline-tools/latest/bin
-#RUN export PATH=$PATH:$ANDROID_SDK_ROOT/platform-tools
-##
 RUN echo $PATH
-#ENV ANDROID_SDK_ROOT=~/Android/Sdk
-#ENV PATH=$PATH:$ANDROID_SDK_ROOT/cmdline-tools/latest/bin
-#ENV PATH=$PATH:$ANDROID_SDK_ROOT/platform-tools
-#RUN echo "export ANDROID_SDK_ROOT=/root/Android/Sdk" >> ~/.bashrc
-#
-RUN echo "export ANDROID_SDK_ROOT=/root/Android/Sdk" >> ~/.bashrc
-RUN echo "export PATH=${PATH}:/root/Android/Sdk/cmdline-tools/latest/bin" >> ~/.bashrc
-RUN echo "export PATH=${PATH}:/root/Android/Sdk/platform-tools" >> ~/.bashrc
+ENV ANDROID_SDK_ROOT=/root/Android/Sdk
+ENV PATH=$PATH:$ANDROID_SDK_ROOT/cmdline-tools/latest/bin
+ENV PATH=$PATH:$ANDROID_SDK_ROOT/platform-tools
 RUN cat ~/.bashrc
 RUN . /root/.bashrc
 RUN echo $PATH
 #RUN . ~/.bashrc
 ##
 RUN ls -l /root/Android/Sdk/cmdline-tools/latest/bin
-#RUN (yes "" 2>/dev/null || true) | /root/Android/Sdk/cmdline-tools/latest/bin/sdkmanager --update
 RUN yes | /root/Android/Sdk/cmdline-tools/latest/bin/sdkmanager --licenses
 #
 #

diff --git a/Dockerfile.latest b/Dockerfile.latest
@@ -11,25 +11,14 @@ RUN mkdir -p ~/Android/Sdk/cmdline-tools
 RUN unzip commandlinetools.zip -d ~/Android/Sdk/cmdline-tools
 RUN mv ~/Android/Sdk/cmdline-tools/cmdline-tools ~/Android/Sdk/cmdline-tools/latest
 #
-#RUN export ANDROID_SDK_ROOT=~/Android/Sdk
-#RUN export PATH=$PATH:$ANDROID_SDK_ROOT/cmdline-tools/latest/bin
-#RUN export PATH=$PATH:$ANDROID_SDK_ROOT/platform-tools
-#
 RUN echo $PATH
 ENV ANDROID_SDK_ROOT=/root/Android/Sdk
 ENV PATH=$PATH:$ANDROID_SDK_ROOT/cmdline-tools/latest/bin
 ENV PATH=$PATH:$ANDROID_SDK_ROOT/platform-tools
-#RUN echo "export ANDROID_SDK_ROOT=/root/Android/Sdk" >> ~/.bashrc
-#
-#RUN echo "export ANDROID_SDK_ROOT=/root/Android/Sdk" >> ~/.bashrc
-#RUN echo "export PATH=${PATH}:/root/Android/Sdk/cmdline-tools/latest/bin" >> ~/.bashrc
-#RUN echo "export PATH=${PATH}:/root/Android/Sdk/platform-tools" >> ~/.bashrc
 RUN cat ~/.bashrc
 RUN . /root/.bashrc
 #
 RUN echo $PATH
-#RUN . ~/.bashrc
-##
 ##
 RUN ls -l /root/Android/Sdk/cmdline-tools/latest/bin
 RUN yes | /root/Android/Sdk/cmdline-tools/latest/bin/sdkmanager --licenses