From 5bf4d8a2f802f72750a20bfb605e8b5bf54b28d0 Mon Sep 17 00:00:00 2001 From: Kirill Romanenko Date: Thu, 19 Jun 2025 13:37:45 +0300 Subject: [PATCH 1/3] =?UTF-8?q?LDAND-42898=20-=20=D0=9E=D0=B1=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2=D0=B8=D0=BB=20jdk=20=D0=B4=D0=BE=2021?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- java-jdk/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java-jdk/Dockerfile b/java-jdk/Dockerfile index 2344132..df5334d 100644 --- a/java-jdk/Dockerfile +++ b/java-jdk/Dockerfile @@ -8,7 +8,7 @@ RUN apt update && \ apt purge -y wget && \ add-apt-repository 'deb https://apt.corretto.aws stable main' && \ apt update && \ - apt install --no-install-recommends -y java-17-amazon-corretto-jdk && \ + apt install --no-install-recommends -y java-21-amazon-corretto-jdk && \ apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* -ENV JAVA_HOME /usr/lib/jvm/java-17-amazon-corretto +ENV JAVA_HOME /usr/lib/jvm/java-21-amazon-corretto From 55ead1168a1bec03a09a4e90cc7dd0a7a68a107f Mon Sep 17 00:00:00 2001 From: Kirill Romanenko Date: Wed, 2 Jul 2025 21:20:48 +0300 Subject: [PATCH 2/3] =?UTF-8?q?LDAND-42898=20-=20=D0=9E=D1=82=D0=BA=D0=B0?= =?UTF-8?q?=D1=82=D0=B8=D0=BB=20cmake=20=D0=B8=20ndk?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- project-mybook-android-build/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project-mybook-android-build/Dockerfile b/project-mybook-android-build/Dockerfile index b4e07b2..d3f0092 100644 --- a/project-mybook-android-build/Dockerfile +++ b/project-mybook-android-build/Dockerfile @@ -16,6 +16,6 @@ RUN sdkmanager "extras;google;m2repository" 1>/dev/null RUN sdkmanager "platforms;android-36" 1>/dev/null -RUN sdkmanager "cmake;3.31.5" 1>/dev/null -RUN sdkmanager "ndk;28.0.13004108" 1>/dev/null +RUN sdkmanager "cmake;3.10.2.4988404" 1>/dev/null +RUN sdkmanager "ndk;21.3.6528147" 1>/dev/null ENV ANDROID_NDK $ANDROID_HOME/ndk-bundle From 41675bf009987b9e3e9b7f25403529d730baf62e Mon Sep 17 00:00:00 2001 From: Kirill Romanenko Date: Thu, 3 Jul 2025 01:08:22 +0300 Subject: [PATCH 3/3] =?UTF-8?q?LDAND-42898=20-=20=D0=92=D0=B5=D1=80=D0=BD?= =?UTF-8?q?=D1=83=D0=BB=20cmake=20=D0=B8=20ndk?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- project-mybook-android-build/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project-mybook-android-build/Dockerfile b/project-mybook-android-build/Dockerfile index d3f0092..b4e07b2 100644 --- a/project-mybook-android-build/Dockerfile +++ b/project-mybook-android-build/Dockerfile @@ -16,6 +16,6 @@ RUN sdkmanager "extras;google;m2repository" 1>/dev/null RUN sdkmanager "platforms;android-36" 1>/dev/null -RUN sdkmanager "cmake;3.10.2.4988404" 1>/dev/null -RUN sdkmanager "ndk;21.3.6528147" 1>/dev/null +RUN sdkmanager "cmake;3.31.5" 1>/dev/null +RUN sdkmanager "ndk;28.0.13004108" 1>/dev/null ENV ANDROID_NDK $ANDROID_HOME/ndk-bundle