From fb09856c119fae93ba8d8447298e47d97cc749c4 Mon Sep 17 00:00:00 2001 From: NissimHadar Date: Mon, 21 Jan 2019 12:56:13 -0800 Subject: [PATCH 1/4] Gabriel Calero's fix. --- android/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/docker/Dockerfile b/android/docker/Dockerfile index 96cc28c99a..9332659ae9 100644 --- a/android/docker/Dockerfile +++ b/android/docker/Dockerfile @@ -27,7 +27,7 @@ RUN mkdir -p "$ANDROID_HOME" "$ANDROID_SDK_HOME" && \ unzip sdk.zip && \ rm sdk.zip && \ yes | $ANDROID_HOME/tools/bin/sdkmanager --licenses - +RUN yes | $ANDROID_HOME/tools/bin/sdkmanager --licenses && yes | $ANDROID_HOME/tools/bin/sdkmanager --update # Install Android Build Tool and Libraries RUN $ANDROID_HOME/tools/bin/sdkmanager --update RUN $ANDROID_HOME/tools/bin/sdkmanager "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" \ From a693e0b6f9cad3a58341ffad62f8df0deaa35584 Mon Sep 17 00:00:00 2001 From: NissimHadar Date: Mon, 21 Jan 2019 13:08:37 -0800 Subject: [PATCH 2/4] Gabriel Calero's fix. --- android/docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/docker/Dockerfile b/android/docker/Dockerfile index 9332659ae9..10d6df4b4a 100644 --- a/android/docker/Dockerfile +++ b/android/docker/Dockerfile @@ -26,8 +26,8 @@ RUN mkdir -p "$ANDROID_HOME" "$ANDROID_SDK_HOME" && \ curl -s -S -o sdk.zip -L "${SDK_URL}" && \ unzip sdk.zip && \ rm sdk.zip && \ - yes | $ANDROID_HOME/tools/bin/sdkmanager --licenses -RUN yes | $ANDROID_HOME/tools/bin/sdkmanager --licenses && yes | $ANDROID_HOME/tools/bin/sdkmanager --update + yes | $ANDROID_HOME/tools/bin/sdkmanager --licenses && yes | $ANDROID_HOME/tools/bin/sdkmanager --update + # Install Android Build Tool and Libraries RUN $ANDROID_HOME/tools/bin/sdkmanager --update RUN $ANDROID_HOME/tools/bin/sdkmanager "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" \ From 084d55a414d8d57ac9310227f4c0b6d3a8e43257 Mon Sep 17 00:00:00 2001 From: NissimHadar Date: Mon, 21 Jan 2019 13:26:44 -0800 Subject: [PATCH 3/4] Gabriel Calero's fix. --- android/docker/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/android/docker/Dockerfile b/android/docker/Dockerfile index 10d6df4b4a..619eb562a4 100644 --- a/android/docker/Dockerfile +++ b/android/docker/Dockerfile @@ -29,7 +29,6 @@ RUN mkdir -p "$ANDROID_HOME" "$ANDROID_SDK_HOME" && \ yes | $ANDROID_HOME/tools/bin/sdkmanager --licenses && yes | $ANDROID_HOME/tools/bin/sdkmanager --update # Install Android Build Tool and Libraries -RUN $ANDROID_HOME/tools/bin/sdkmanager --update RUN $ANDROID_HOME/tools/bin/sdkmanager "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" \ "platforms;android-${ANDROID_VERSION}" \ "platform-tools" From 4edd072b3b020b8846daf699ea05849e8b474ea1 Mon Sep 17 00:00:00 2001 From: NissimHadar Date: Mon, 21 Jan 2019 16:49:54 -0800 Subject: [PATCH 4/4] Removed whitespace --- android/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/docker/Dockerfile b/android/docker/Dockerfile index 619eb562a4..c37f73cb2a 100644 --- a/android/docker/Dockerfile +++ b/android/docker/Dockerfile @@ -27,7 +27,7 @@ RUN mkdir -p "$ANDROID_HOME" "$ANDROID_SDK_HOME" && \ unzip sdk.zip && \ rm sdk.zip && \ yes | $ANDROID_HOME/tools/bin/sdkmanager --licenses && yes | $ANDROID_HOME/tools/bin/sdkmanager --update - + # Install Android Build Tool and Libraries RUN $ANDROID_HOME/tools/bin/sdkmanager "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" \ "platforms;android-${ANDROID_VERSION}" \