From e9bb18aa0e21fb3483c6e2bbf256dbbaf324deed Mon Sep 17 00:00:00 2001
From: Eros Garcia Ponte <eros902002@googlemail.com>
Date: Wed, 29 Nov 2023 16:46:10 +0100
Subject: [PATCH 1/2] [OMA-2417] Update dockerfile with java 17 and Android 34

---
 android/Dockerfile | 34 +++++++++++++---------------------
 android/Makefile   |  2 +-
 2 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/android/Dockerfile b/android/Dockerfile
index 53aef161..8258b01e 100644
--- a/android/Dockerfile
+++ b/android/Dockerfile
@@ -1,5 +1,4 @@
 # Image pubnative/android
-
 FROM drecom/centos-ruby
 
 LABEL maintainer="Eros Garcia Ponte <eros902002@googlemail.com>"
@@ -9,7 +8,6 @@ WORKDIR /usr/local/
 # Install Development Tools
 RUN yum -y update \
  && yum -y groupinstall "Development Tools" \
- : Install ruby for fastlane and 32bits libs \
  && yum install -y glibc.i686 \
                    libstdc++.i686 \
                    glibc-devel.i686 \
@@ -17,41 +15,35 @@ RUN yum -y update \
                    ncurses-devel.i686 \
                    libX11-devel.i686 \
                    libXrender.i686 \
- && gem install bundler -v 1.7.3
+ && gem install bundler -v 2.4.22
 
 # Install Java 1.8 in CentOS/RHEL 7.X
 RUN cd /usr/local/ \
- && curl -s -j -k -L -H "Cookie: oraclelicense=accept-securebackup-cookie" http://download.oracle.com/otn-pub/java/jdk/8u131-b11/d54c1d3a095b4ff2b6607d096fa80163/jdk-8u131-linux-x64.rpm > jdk-8u131-linux-x64.rpm \
- && yum -y localinstall jdk-8u131-linux-x64.rpm
+ && curl -s -j -k -L -H "Cookie: oraclelicense=accept-securebackup-cookie" https://download.oracle.com/java/17/latest/jdk-17_linux-x64_bin.rpm > jdk-17_linux-x64_bin.rpm \
+ && yum -y localinstall jdk-17_linux-x64_bin.rpm
 
 # Java environment variables
-ENV JAVA_VERSION 1.8
-ENV JAVA_HOME /usr/java/jdk1.8.0_131
-ENV JRE_HOME /usr/java/jdk1.8.0_131/jre
-ENV PATH $PATH:/usr/java/jdk1.8.0_131/bin:/usr/java/jdk1.8.0_131/jre/bin
+ENV JAVA_VERSION 17
+ENV JAVA_HOME /usr/java/jdk-17
+ENV JRE_HOME /usr/java/jdk-17/jre
+ENV PATH $PATH:/usr/java/jdk-17/bin:/usr/java/jdk-17/jre/bin
 
 # Install Android SDK
 RUN mkdir -p /usr/local/android-sdk \
  && cd /usr/local/android-sdk \
- && curl -L -O https://dl.google.com/android/repository/sdk-tools-linux-3859397.zip \
- && unzip sdk-tools-linux-3859397.zip
+ && curl -L -O https://dl.google.com/android/repository/commandlinetools-linux-7302050_latest.zip \
+ && unzip commandlinetools-linux-7302050_latest.zip
 
 # Install Android tools
-RUN /usr/local/android-sdk/tools/bin/sdkmanager --update <<< 'y'
-RUN yes | /usr/local/android-sdk/tools/bin/sdkmanager "platforms;android-28" "build-tools;28.0.3" "extras;google;m2repository" "extras;android;m2repository"
-#RUN echo yes | /usr/local/android-sdk-linux/tools/android update sdk --filter android-28 --no-ui --force -a
-#RUN echo yes | /usr/local/android-sdk-linux/tools/android update sdk --filter platform-tools --no-ui --force -a
-#RUN echo yes | /usr/local/android-sdk-linux/tools/android update sdk --filter tools --no-ui --force -a
-#RUN echo yes | /usr/local/android-sdk-linux/tools/android update sdk --filter extra --no-ui --force -a
-
-RUN cd /usr/local/ && ls -la
+RUN /usr/local/android-sdk/cmdline-tools/bin/sdkmanager --update --sdk_root=/usr/local/android-sdk \
+ && yes | /usr/local/android-sdk/cmdline-tools/bin/sdkmanager --sdk_root=/usr/local/android-sdk "platforms;android-34" "build-tools;34.0.0" "extras;google;m2repository" "extras;android;m2repository"
 
 # Environment variables
 ENV ANDROID_HOME /usr/local/android-sdk
-ENV PATH $PATH:$ANDROID_HOME/tools
+ENV PATH $PATH:$ANDROID_HOME/cmdline-tools/latest/bin
 ENV PATH $PATH:$ANDROID_HOME/platform-tools
 ENV PATH $PATH:$ANT_HOME/bin
 
 # Clean up
 RUN yum clean all
-RUN rm -rf /usr/local/sdk-tools-linux-3859397.zip /usr/local/jdk-8u131-linux-x64.rpm /var/cache/yum
+RUN rm -rf /usr/local/commandlinetools-linux-7302050_latest.zip /usr/local/jdk-17_linux-x64_bin.rpm /var/cache/yum
diff --git a/android/Makefile b/android/Makefile
index 11785688..a41407bc 100644
--- a/android/Makefile
+++ b/android/Makefile
@@ -1,4 +1,4 @@
-VERSION=28_20190219
+VERSION=34_20231122
 DOCKER_REPO=pubnative/android
 DOCKER_REPO_VERSION=$(DOCKER_REPO):$(VERSION)
 DOCKER_REPO_LATEST=$(DOCKER_REPO):latest

From f3ea18d03da651b39fbcb322b7eb437534053fdf Mon Sep 17 00:00:00 2001
From: Eros Garcia Ponte <eros902002@googlemail.com>
Date: Wed, 29 Nov 2023 17:10:31 +0100
Subject: [PATCH 2/2] [OMA-2417] Add fastlane installation

---
 android/Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/android/Dockerfile b/android/Dockerfile
index 8258b01e..326ab4d4 100644
--- a/android/Dockerfile
+++ b/android/Dockerfile
@@ -15,7 +15,8 @@ RUN yum -y update \
                    ncurses-devel.i686 \
                    libX11-devel.i686 \
                    libXrender.i686 \
- && gem install bundler -v 2.4.22
+ && gem install bundler -v 2.4.22 \
+ && gem install fastlane
 
 # Install Java 1.8 in CentOS/RHEL 7.X
 RUN cd /usr/local/ \