From 89e27d5762808ad4f84c76808b5b238b0dcffd85 Mon Sep 17 00:00:00 2001 From: STAM Date: Tue, 4 Jul 2023 21:47:37 +0300 Subject: [PATCH 1/2] maven --- linux/ecosystem/teamcity/agent/android-sdk/jdk17/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/ecosystem/teamcity/agent/android-sdk/jdk17/Dockerfile b/linux/ecosystem/teamcity/agent/android-sdk/jdk17/Dockerfile index 9aab709a9..e43b47af1 100644 --- a/linux/ecosystem/teamcity/agent/android-sdk/jdk17/Dockerfile +++ b/linux/ecosystem/teamcity/agent/android-sdk/jdk17/Dockerfile @@ -26,7 +26,7 @@ ENV PATH=$PATH:${GRADLE_BIN}:${KTC_BIN} ################################################################## RUN apt update && \ apt install -y --allow-unauthenticated \ - manven \ + maven \ android-sdk \ sdkmanager \ android-sdk-build-tools \ From 655ee0e2b06c1795613d058c2cf882b77e9f39ab Mon Sep 17 00:00:00 2001 From: STAM Date: Tue, 4 Jul 2023 21:47:47 +0300 Subject: [PATCH 2/2] maven --- linux/ecosystem/gitlab/runner/android-sdk/jdk11/Dockerfile | 6 +++--- linux/ecosystem/gitlab/runner/android-sdk/jdk17/Dockerfile | 6 +++--- linux/ecosystem/teamcity/agent/android-sdk/jdk11/Dockerfile | 5 +++-- linux/ecosystem/teamcity/agent/android-sdk/jdk17/Dockerfile | 3 ++- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/linux/ecosystem/gitlab/runner/android-sdk/jdk11/Dockerfile b/linux/ecosystem/gitlab/runner/android-sdk/jdk11/Dockerfile index a14e2c964..77cf030ac 100644 --- a/linux/ecosystem/gitlab/runner/android-sdk/jdk11/Dockerfile +++ b/linux/ecosystem/gitlab/runner/android-sdk/jdk11/Dockerfile @@ -34,13 +34,12 @@ RUN wget -qO - https://packages.adoptium.net/artifactory/api/gpg/key/public | a ln -s /usr/lib/jvm/temurin-11-jdk-amd64/lib/ /usr/lib/jvm/temurin-11-jdk-amd64/jre/lib && \ java -version - ################################################################## # Android SDK ################################################################## RUN apt update && \ apt install -y --allow-unauthenticated \ - manven \ + maven \ android-sdk \ sdkmanager \ android-sdk-build-tools \ @@ -48,7 +47,8 @@ RUN apt update && \ android-sdk-platform-tools \ adb fastboot f2fs-tools e2fsprogs libsqlite3-0 sqlite3 && \ apt remove -y gradle && \ - sdkmanager --version + sdkmanager --version && \ + mnv -v # Install ALL ANDROID SDK RUN sdkmanager --install \ diff --git a/linux/ecosystem/gitlab/runner/android-sdk/jdk17/Dockerfile b/linux/ecosystem/gitlab/runner/android-sdk/jdk17/Dockerfile index 849e935e3..d92ed1ab6 100644 --- a/linux/ecosystem/gitlab/runner/android-sdk/jdk17/Dockerfile +++ b/linux/ecosystem/gitlab/runner/android-sdk/jdk17/Dockerfile @@ -34,13 +34,12 @@ RUN wget -qO - https://packages.adoptium.net/artifactory/api/gpg/key/public | a ln -s /usr/lib/jvm/temurin-17-jdk-amd64/lib/ /usr/lib/jvm/temurin-17-jdk-amd64/jre/lib && \ java -version - ################################################################## # Android SDK ################################################################## RUN apt update && \ apt install -y --allow-unauthenticated \ - manven \ + maven \ android-sdk \ sdkmanager \ android-sdk-build-tools \ @@ -48,7 +47,8 @@ RUN apt update && \ android-sdk-platform-tools \ adb fastboot f2fs-tools e2fsprogs libsqlite3-0 sqlite3 && \ apt remove -y gradle && \ - sdkmanager --version + sdkmanager --version && \ + mnv -v # Install ALL ANDROID SDK RUN sdkmanager --install \ diff --git a/linux/ecosystem/teamcity/agent/android-sdk/jdk11/Dockerfile b/linux/ecosystem/teamcity/agent/android-sdk/jdk11/Dockerfile index e15ab1ee4..9185700fd 100644 --- a/linux/ecosystem/teamcity/agent/android-sdk/jdk11/Dockerfile +++ b/linux/ecosystem/teamcity/agent/android-sdk/jdk11/Dockerfile @@ -26,7 +26,7 @@ ENV PATH=$PATH:${GRADLE_BIN}:${KTC_BIN} ################################################################## RUN apt update && \ apt install -y --allow-unauthenticated \ - manven \ + maven \ android-sdk \ sdkmanager \ android-sdk-build-tools \ @@ -34,7 +34,8 @@ RUN apt update && \ android-sdk-platform-tools \ adb fastboot f2fs-tools e2fsprogs libsqlite3-0 sqlite3 && \ apt remove -y gradle && \ - sdkmanager --version + sdkmanager --version && \ + mnv -v # Install ALL ANDROID SDK RUN sdkmanager --install \ diff --git a/linux/ecosystem/teamcity/agent/android-sdk/jdk17/Dockerfile b/linux/ecosystem/teamcity/agent/android-sdk/jdk17/Dockerfile index e43b47af1..9e8a2cfab 100644 --- a/linux/ecosystem/teamcity/agent/android-sdk/jdk17/Dockerfile +++ b/linux/ecosystem/teamcity/agent/android-sdk/jdk17/Dockerfile @@ -34,7 +34,8 @@ RUN apt update && \ android-sdk-platform-tools \ adb fastboot f2fs-tools e2fsprogs libsqlite3-0 sqlite3 && \ apt remove -y gradle && \ - sdkmanager --version + sdkmanager --version && \ + mnv -v # Install ALL ANDROID SDK RUN sdkmanager --install \