From 0f101579dfea76ae0ca6e77d69b1ff7f82ed5048 Mon Sep 17 00:00:00 2001 From: javavirys Date: Mon, 28 Mar 2022 12:58:04 +0300 Subject: [PATCH 1/5] Update android to 31 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 300709a..6393179 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ RUN apt-get -y install unzip RUN apt-get -y install curl wget RUN apt-get -y install software-properties-common RUN apt-get -y install libgl1-mesa-glx -RUN apt-get -y install openjdk-8-jdk +RUN apt-get -y install openjdk-11-jdk # Download Android SDK RUN mkdir "$ANDROID_HOME" .android \ From 58ae66968ed6fd1c05f5ee5d062133bd401ab54e Mon Sep 17 00:00:00 2001 From: javavirys Date: Mon, 28 Mar 2022 14:43:50 +0300 Subject: [PATCH 2/5] Update Dockerfile --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 6393179..707a53a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,6 +23,8 @@ RUN apt-get -y install unzip RUN apt-get -y install curl wget RUN apt-get -y install software-properties-common RUN apt-get -y install libgl1-mesa-glx + +RUN apt-get -y install openjdk-8-jdk RUN apt-get -y install openjdk-11-jdk # Download Android SDK From be5479267fea955ded7da970823a62d6dba5a01e Mon Sep 17 00:00:00 2001 From: javavirys Date: Mon, 28 Mar 2022 14:50:10 +0300 Subject: [PATCH 3/5] Update Dockerfile --- Dockerfile | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index 707a53a..c92e137 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,25 +27,27 @@ RUN apt-get -y install libgl1-mesa-glx RUN apt-get -y install openjdk-8-jdk RUN apt-get -y install openjdk-11-jdk +RUN java --version + # Download Android SDK -RUN mkdir "$ANDROID_HOME" .android \ - && cd "$ANDROID_HOME" \ - && curl -o sdk.zip $SDK_URL \ - && unzip sdk.zip \ - && rm sdk.zip \ - && yes | $ANDROID_HOME/tools/bin/sdkmanager --licenses +# RUN mkdir "$ANDROID_HOME" .android \ +# && cd "$ANDROID_HOME" \ +# && curl -o sdk.zip $SDK_URL \ +# && unzip sdk.zip \ +# && rm sdk.zip \ +# && yes | $ANDROID_HOME/tools/bin/sdkmanager --licenses # Install Android Build Tool and Libraries -RUN $ANDROID_HOME/tools/bin/sdkmanager --update | grep -v = || true -RUN $ANDROID_HOME/tools/bin/sdkmanager "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" \ - "platforms;android-${ANDROID_VERSION}" \ - "platform-tools" | grep -v = || true +# RUN $ANDROID_HOME/tools/bin/sdkmanager --update | grep -v = || true +# RUN $ANDROID_HOME/tools/bin/sdkmanager "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" \ +# "platforms;android-${ANDROID_VERSION}" \ +# "platform-tools" | grep -v = || true -RUN $ANDROID_HOME/tools/bin/sdkmanager emulator | grep -v = || true -RUN $ANDROID_HOME/tools/bin/sdkmanager "system-images;android-29;google_apis;x86" | grep -v = || true +# RUN $ANDROID_HOME/tools/bin/sdkmanager emulator | grep -v = || true +# RUN $ANDROID_HOME/tools/bin/sdkmanager "system-images;android-29;google_apis;x86" | grep -v = || true -RUN yes | $ANDROID_HOME/tools/bin/sdkmanager --licenses +# RUN yes | $ANDROID_HOME/tools/bin/sdkmanager --licenses -RUN $ANDROID_HOME/tools/bin/avdmanager create avd -n mynexus -k "system-images;android-29;google_apis;x86" --tag "google_apis" --device "Nexus 5" +# RUN $ANDROID_HOME/tools/bin/avdmanager create avd -n mynexus -k "system-images;android-29;google_apis;x86" --tag "google_apis" --device "Nexus 5" -RUN apt-get update && apt-get -y install android-tools-adb android-tools-fastboot +# RUN apt-get update && apt-get -y install android-tools-adb android-tools-fastboot From 72b7de0ae6be20687f98bd635d04c3ff17a14f33 Mon Sep 17 00:00:00 2001 From: javavirys Date: Mon, 28 Mar 2022 14:56:00 +0300 Subject: [PATCH 4/5] Update Dockerfile --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c92e137..8b30719 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,9 +24,10 @@ RUN apt-get -y install curl wget RUN apt-get -y install software-properties-common RUN apt-get -y install libgl1-mesa-glx -RUN apt-get -y install openjdk-8-jdk RUN apt-get -y install openjdk-11-jdk +RUN apt-get -y install openjdk-8-jdk + RUN java --version # Download Android SDK From 7697ad1c5a46afad53077ad5e8339f5c3b049787 Mon Sep 17 00:00:00 2001 From: javavirys Date: Mon, 28 Mar 2022 15:07:48 +0300 Subject: [PATCH 5/5] Update Dockerfile --- Dockerfile | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8b30719..635ef3a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,31 +24,31 @@ RUN apt-get -y install curl wget RUN apt-get -y install software-properties-common RUN apt-get -y install libgl1-mesa-glx -RUN apt-get -y install openjdk-11-jdk +RUN apt-get -y install git RUN apt-get -y install openjdk-8-jdk -RUN java --version - # Download Android SDK -# RUN mkdir "$ANDROID_HOME" .android \ -# && cd "$ANDROID_HOME" \ -# && curl -o sdk.zip $SDK_URL \ -# && unzip sdk.zip \ -# && rm sdk.zip \ -# && yes | $ANDROID_HOME/tools/bin/sdkmanager --licenses +RUN mkdir "$ANDROID_HOME" .android \ + && cd "$ANDROID_HOME" \ + && curl -o sdk.zip $SDK_URL \ + && unzip sdk.zip \ + && rm sdk.zip \ + && yes | $ANDROID_HOME/tools/bin/sdkmanager --licenses # Install Android Build Tool and Libraries -# RUN $ANDROID_HOME/tools/bin/sdkmanager --update | grep -v = || true -# RUN $ANDROID_HOME/tools/bin/sdkmanager "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" \ -# "platforms;android-${ANDROID_VERSION}" \ -# "platform-tools" | grep -v = || true +RUN $ANDROID_HOME/tools/bin/sdkmanager --update | grep -v = || true +RUN $ANDROID_HOME/tools/bin/sdkmanager "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" \ + "platforms;android-${ANDROID_VERSION}" \ + "platform-tools" | grep -v = || true # RUN $ANDROID_HOME/tools/bin/sdkmanager emulator | grep -v = || true # RUN $ANDROID_HOME/tools/bin/sdkmanager "system-images;android-29;google_apis;x86" | grep -v = || true -# RUN yes | $ANDROID_HOME/tools/bin/sdkmanager --licenses +RUN yes | $ANDROID_HOME/tools/bin/sdkmanager --licenses # RUN $ANDROID_HOME/tools/bin/avdmanager create avd -n mynexus -k "system-images;android-29;google_apis;x86" --tag "google_apis" --device "Nexus 5" -# RUN apt-get update && apt-get -y install android-tools-adb android-tools-fastboot +RUN apt-get update && apt-get -y install android-tools-adb android-tools-fastboot + +RUN apt-get -y install openjdk-11-jdk