diff --git a/Dockerfile b/Dockerfile index b11e9ca..eb510d3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,29 +9,26 @@ ENV ANDROID_SDK ${ANDROID_HOME} ENV PATH "${PATH}:${ANDROID_HOME}/cmdline-tools/latest/bin" ENV PATH "${PATH}:${ANDROID_HOME}/cmdline-tools/tools/bin" ENV PATH "${PATH}:${ANDROID_HOME}/tools/bin" -ENV PATH "${PATH}:${ANDROID_HOME}/build-tools/33.0.0" +ENV PATH "${PATH}:${ANDROID_HOME}/build-tools/33.0.2" ENV PATH "${PATH}:${ANDROID_HOME}/platform-tools" ENV PATH "${PATH}:${ANDROID_HOME}/emulator" ENV PATH "${PATH}:${ANDROID_HOME}/bin" -RUN dpkg --add-architecture i386 && \ - apt-get update -yqq && \ - apt-get install -y curl expect git libc6:i386 libgcc1:i386 libncurses5:i386 libstdc++6:i386 zlib1g:i386 openjdk-19-jdk-headless wget unzip vim qemu-kvm libvirt-daemon-system libvirt-clients bridge-utils && \ - apt-get clean - -RUN groupadd android && useradd -d /opt/android-sdk-linux -g android android - COPY tools /opt/tools COPY licenses /opt/licenses WORKDIR /opt/android-sdk-linux -RUN /opt/tools/entrypoint.sh built-in - -RUN /opt/android-sdk-linux/cmdline-tools/tools/bin/sdkmanager "cmdline-tools;latest" -RUN /opt/android-sdk-linux/cmdline-tools/tools/bin/sdkmanager "build-tools;33.0.0" -RUN /opt/android-sdk-linux/cmdline-tools/tools/bin/sdkmanager "platform-tools" -RUN /opt/android-sdk-linux/cmdline-tools/tools/bin/sdkmanager "platforms;android-33" -RUN /opt/android-sdk-linux/cmdline-tools/tools/bin/sdkmanager "system-images;android-33;google_apis;x86_64" +RUN dpkg --add-architecture i386 && \ + apt-get update -yqq && \ + apt-get install -y curl expect git libc6:i386 libgcc1:i386 libncurses5:i386 libstdc++6:i386 zlib1g:i386 openjdk-19-jdk-headless wget unzip vim qemu-kvm libvirt-daemon-system libvirt-clients bridge-utils && \ + apt-get clean && \ + groupadd android && useradd -d /opt/android-sdk-linux -g android android && \ + /opt/tools/entrypoint.sh built-in && \ + /opt/android-sdk-linux/cmdline-tools/tools/bin/sdkmanager "cmdline-tools;latest" && \ + /opt/android-sdk-linux/cmdline-tools/tools/bin/sdkmanager "build-tools;33.0.2" && \ + /opt/android-sdk-linux/cmdline-tools/tools/bin/sdkmanager "platform-tools" && \ + /opt/android-sdk-linux/cmdline-tools/tools/bin/sdkmanager "platforms;android-33" && \ + /opt/android-sdk-linux/cmdline-tools/tools/bin/sdkmanager "system-images;android-33;google_apis;x86_64" CMD /opt/tools/entrypoint.sh built-in diff --git a/tools/android-env.sh b/tools/android-env.sh index 7ed5fb0..90a4531 100644 --- a/tools/android-env.sh +++ b/tools/android-env.sh @@ -8,7 +8,7 @@ export ANDROID_SDK=${ANDROID_HOME} export PATH=${PATH}:${ANDROID_HOME}/cmdline-tools/latest/bin export PATH=${PATH}:${ANDROID_HOME}/cmdline-tools/tools/bin export PATH=${PATH}:${ANDROID_HOME}/tools/bin -export PATH=${PATH}:${ANDROID_HOME}/build-tools/33.0.0 +export PATH=${PATH}:${ANDROID_HOME}/build-tools/33.0.2 export PATH=${PATH}:${ANDROID_HOME}/platform-tools export PATH=${PATH}:${ANDROID_HOME}/emulator export PATH=${PATH}:${ANDROID_HOME}/bin @@ -26,7 +26,7 @@ function help() { figlet "usage:" echo "update_sdk: Updates the SDK" echo "andep: Installs one or more android Packets." - echo " -Example: anddep \"platforms;android-26\"" + echo " -Example: anddep \"platforms;android-33\"" echo "help: Shows this help" echo '' echo ''