From 57fd507915f29cfcc89be2e1ee29e8f2f2a3a690 Mon Sep 17 00:00:00 2001 From: Eros Date: Thu, 24 Mar 2022 13:41:28 +0100 Subject: [PATCH 1/6] [OMA-1383] Update Android to API 32 --- android/Dockerfile | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/android/Dockerfile b/android/Dockerfile index 53aef16..d55f64e 100644 --- a/android/Dockerfile +++ b/android/Dockerfile @@ -17,18 +17,18 @@ RUN yum -y update \ ncurses-devel.i686 \ libX11-devel.i686 \ libXrender.i686 \ - && gem install bundler -v 1.7.3 + && gem install bundler -v 2.3.10 -# Install Java 1.8 in CentOS/RHEL 7.X +# Install Java 1.11 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/otn-pub/java/jdk/11.0.14%2B8/7e5bbbfffe8b45e59d52a96aacab2f04/jdk-11.0.14_linux-x64_bin.rpm > jdk-11.0.14_linux-x64_bin.rpm \ + && yum -y localinstall jdk-11.0.14_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 1.11 +ENV JAVA_HOME /usr/java/jdk-11.0.14 +ENV JRE_HOME /usr/java/jdk-11.0.14/jre +ENV PATH $PATH:/usr/java/jdk-11.0.14/bin:/usr/java/jdk-11.0.14/jre/bin # Install Android SDK RUN mkdir -p /usr/local/android-sdk \ @@ -38,8 +38,8 @@ RUN mkdir -p /usr/local/android-sdk \ # 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 yes | /usr/local/android-sdk/tools/bin/sdkmanager "platforms;android-32" "build-tools;32.0.0" "extras;google;m2repository" "extras;android;m2repository" +#RUN echo yes | /usr/local/android-sdk-linux/tools/android update sdk --filter android-32 --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 @@ -54,4 +54,4 @@ 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/sdk-tools-linux-3859397.zip /usr/local/jdk-11.0.14_linux-x64_bin.rpm /var/cache/yum From 757465c38c9d5f20fef73cf796eba618730adcdd Mon Sep 17 00:00:00 2001 From: Eros Date: Mon, 4 Apr 2022 16:15:38 +0200 Subject: [PATCH 2/6] update command line tools for Android --- android/Dockerfile | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/android/Dockerfile b/android/Dockerfile index d55f64e..05de43e 100644 --- a/android/Dockerfile +++ b/android/Dockerfile @@ -33,12 +33,24 @@ ENV PATH $PATH:/usr/java/jdk-11.0.14/bin:/usr/java/jdk-11.0.14/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-8092744_latest.zip \ + && unzip commandlinetools-linux-8092744_latest.zip + +RUN mv /usr/local/android-sdk/cmdline-tools /usr/local/android-sdk/tools \ + && mkdir /usr/local/android-sdk/cmdline-tools \ + && mv /usr/local/android-sdk/tools /usr/local/android-sdk/cmdline-tools/tools + +# Environment variables +ENV ANDROID_HOME /usr/local/android-sdk +ENV ANDROID_SDK_ROOT /usr/local/android-sdk +ENV PATH $PATH:$ANDROID_HOME/cmdline-tools +ENV PATH $PATH:$ANDROID_HOME/cmdline-tools/tools/bin +ENV PATH $PATH:$ANDROID_HOME/platform-tools +ENV PATH $PATH:$ANT_HOME/bin # Install Android tools -RUN /usr/local/android-sdk/tools/bin/sdkmanager --update <<< 'y' -RUN yes | /usr/local/android-sdk/tools/bin/sdkmanager "platforms;android-32" "build-tools;32.0.0" "extras;google;m2repository" "extras;android;m2repository" +RUN /usr/local/android-sdk/cmdline-tools/tools/bin/sdkmanager --update <<< 'y' +RUN yes | /usr/local/android-sdk/cmdline-tools/tools/bin/sdkmanager "platforms;android-32" "build-tools;32.0.0" "extras;google;m2repository" "extras;android;m2repository" #RUN echo yes | /usr/local/android-sdk-linux/tools/android update sdk --filter android-32 --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 @@ -54,4 +66,4 @@ 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-11.0.14_linux-x64_bin.rpm /var/cache/yum +RUN rm -rf /usr/local/commandlinetools-linux-8092744_latest.zip /usr/local/jdk-11.0.14_linux-x64_bin.rpm /var/cache/yum From ae0148a07c205fb2c8eeb06fc7336728a7230dee Mon Sep 17 00:00:00 2001 From: Cem Bozkurt Date: Mon, 4 Apr 2022 17:09:08 +0200 Subject: [PATCH 3/6] Changed folder names and PATH variables --- android/Dockerfile | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/android/Dockerfile b/android/Dockerfile index 05de43e..3480910 100644 --- a/android/Dockerfile +++ b/android/Dockerfile @@ -36,21 +36,23 @@ RUN mkdir -p /usr/local/android-sdk \ && curl -L -O https://dl.google.com/android/repository/commandlinetools-linux-8092744_latest.zip \ && unzip commandlinetools-linux-8092744_latest.zip -RUN mv /usr/local/android-sdk/cmdline-tools /usr/local/android-sdk/tools \ +RUN mv /usr/local/android-sdk/cmdline-tools /usr/local/android-sdk/initversion \ && mkdir /usr/local/android-sdk/cmdline-tools \ - && mv /usr/local/android-sdk/tools /usr/local/android-sdk/cmdline-tools/tools + && mv /usr/local/android-sdk/initversion /usr/local/android-sdk/cmdline-tools/initversion # Environment variables ENV ANDROID_HOME /usr/local/android-sdk ENV ANDROID_SDK_ROOT /usr/local/android-sdk -ENV PATH $PATH:$ANDROID_HOME/cmdline-tools -ENV PATH $PATH:$ANDROID_HOME/cmdline-tools/tools/bin -ENV PATH $PATH:$ANDROID_HOME/platform-tools +# adding "latest" first to PATH so it will have higher priority +# after "update" we will have latest binaries under "latest" folder +ENV PATH $PATH:$ANDROID_SDK_ROOT/cmdline-tools/latest/bin +ENV PATH $PATH:$ANDROID_SDK_ROOT/cmdline-tools/initversion/bin +ENV PATH $PATH:$ANDROID_SDK_ROOT/platform-tools ENV PATH $PATH:$ANT_HOME/bin # Install Android tools -RUN /usr/local/android-sdk/cmdline-tools/tools/bin/sdkmanager --update <<< 'y' -RUN yes | /usr/local/android-sdk/cmdline-tools/tools/bin/sdkmanager "platforms;android-32" "build-tools;32.0.0" "extras;google;m2repository" "extras;android;m2repository" +RUN sdkmanager --update <<< 'y' +RUN yes | sdkmanager "platforms;android-32" "build-tools;32.0.0" "extras;google;m2repository" "extras;android;m2repository" #RUN echo yes | /usr/local/android-sdk-linux/tools/android update sdk --filter android-32 --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 @@ -58,12 +60,6 @@ RUN yes | /usr/local/android-sdk/cmdline-tools/tools/bin/sdkmanager "platforms;a RUN cd /usr/local/ && ls -la -# Environment variables -ENV ANDROID_HOME /usr/local/android-sdk -ENV PATH $PATH:$ANDROID_HOME/tools -ENV PATH $PATH:$ANDROID_HOME/platform-tools -ENV PATH $PATH:$ANT_HOME/bin - # Clean up RUN yum clean all RUN rm -rf /usr/local/commandlinetools-linux-8092744_latest.zip /usr/local/jdk-11.0.14_linux-x64_bin.rpm /var/cache/yum From efb76bbdc67aceed3272321fa9ef68fcf4ca62ae Mon Sep 17 00:00:00 2001 From: Eros Garcia Ponte Date: Mon, 12 Aug 2024 13:38:05 +0200 Subject: [PATCH 4/6] Create android ubuntu image --- android-ubuntu/Dockerfile | 65 +++++++++++++++++++++++++++++++++++++++ android-ubuntu/Makefile | 16 ++++++++++ android-ubuntu/README.md | 0 3 files changed, 81 insertions(+) create mode 100644 android-ubuntu/Dockerfile create mode 100644 android-ubuntu/Makefile create mode 100644 android-ubuntu/README.md diff --git a/android-ubuntu/Dockerfile b/android-ubuntu/Dockerfile new file mode 100644 index 0000000..3480910 --- /dev/null +++ b/android-ubuntu/Dockerfile @@ -0,0 +1,65 @@ +# Image pubnative/android + +FROM drecom/centos-ruby + +LABEL maintainer="Eros Garcia Ponte " + +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 \ + zlib-devel.i686 \ + ncurses-devel.i686 \ + libX11-devel.i686 \ + libXrender.i686 \ + && gem install bundler -v 2.3.10 + +# Install Java 1.11 in CentOS/RHEL 7.X +RUN cd /usr/local/ \ + && curl -s -j -k -L -H "Cookie: oraclelicense=accept-securebackup-cookie" https://download.oracle.com/otn-pub/java/jdk/11.0.14%2B8/7e5bbbfffe8b45e59d52a96aacab2f04/jdk-11.0.14_linux-x64_bin.rpm > jdk-11.0.14_linux-x64_bin.rpm \ + && yum -y localinstall jdk-11.0.14_linux-x64_bin.rpm + +# Java environment variables +ENV JAVA_VERSION 1.11 +ENV JAVA_HOME /usr/java/jdk-11.0.14 +ENV JRE_HOME /usr/java/jdk-11.0.14/jre +ENV PATH $PATH:/usr/java/jdk-11.0.14/bin:/usr/java/jdk-11.0.14/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/commandlinetools-linux-8092744_latest.zip \ + && unzip commandlinetools-linux-8092744_latest.zip + +RUN mv /usr/local/android-sdk/cmdline-tools /usr/local/android-sdk/initversion \ + && mkdir /usr/local/android-sdk/cmdline-tools \ + && mv /usr/local/android-sdk/initversion /usr/local/android-sdk/cmdline-tools/initversion + +# Environment variables +ENV ANDROID_HOME /usr/local/android-sdk +ENV ANDROID_SDK_ROOT /usr/local/android-sdk +# adding "latest" first to PATH so it will have higher priority +# after "update" we will have latest binaries under "latest" folder +ENV PATH $PATH:$ANDROID_SDK_ROOT/cmdline-tools/latest/bin +ENV PATH $PATH:$ANDROID_SDK_ROOT/cmdline-tools/initversion/bin +ENV PATH $PATH:$ANDROID_SDK_ROOT/platform-tools +ENV PATH $PATH:$ANT_HOME/bin + +# Install Android tools +RUN sdkmanager --update <<< 'y' +RUN yes | sdkmanager "platforms;android-32" "build-tools;32.0.0" "extras;google;m2repository" "extras;android;m2repository" +#RUN echo yes | /usr/local/android-sdk-linux/tools/android update sdk --filter android-32 --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 + +# Clean up +RUN yum clean all +RUN rm -rf /usr/local/commandlinetools-linux-8092744_latest.zip /usr/local/jdk-11.0.14_linux-x64_bin.rpm /var/cache/yum diff --git a/android-ubuntu/Makefile b/android-ubuntu/Makefile new file mode 100644 index 0000000..1178568 --- /dev/null +++ b/android-ubuntu/Makefile @@ -0,0 +1,16 @@ +VERSION=28_20190219 +DOCKER_REPO=pubnative/android +DOCKER_REPO_VERSION=$(DOCKER_REPO):$(VERSION) +DOCKER_REPO_LATEST=$(DOCKER_REPO):latest + +build: + docker build -t $(DOCKER_REPO_VERSION) . + docker tag $(DOCKER_REPO_VERSION) $(DOCKER_REPO_LATEST) + +publish: publish-latest publish-version + +publish-latest: build + docker push $(DOCKER_REPO_LATEST) + +publish-version: build + docker push $(DOCKER_REPO_VERSION) diff --git a/android-ubuntu/README.md b/android-ubuntu/README.md new file mode 100644 index 0000000..e69de29 From 17a65c2587c4b9809617773931fbfab3de6579d3 Mon Sep 17 00:00:00 2001 From: Eros Garcia Ponte Date: Mon, 12 Aug 2024 14:30:48 +0200 Subject: [PATCH 5/6] Change base linux to ubuntu and update Android build tools to 34 --- android-ubuntu/Dockerfile | 66 +++++++++++++++++++-------------------- android-ubuntu/Makefile | 2 +- 2 files changed, 33 insertions(+), 35 deletions(-) diff --git a/android-ubuntu/Dockerfile b/android-ubuntu/Dockerfile index 3480910..3ad3a99 100644 --- a/android-ubuntu/Dockerfile +++ b/android-ubuntu/Dockerfile @@ -1,34 +1,37 @@ # Image pubnative/android -FROM drecom/centos-ruby +FROM ubuntu:22.04 LABEL maintainer="Eros Garcia Ponte " 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 \ - zlib-devel.i686 \ - ncurses-devel.i686 \ - libX11-devel.i686 \ - libXrender.i686 \ - && gem install bundler -v 2.3.10 - -# Install Java 1.11 in CentOS/RHEL 7.X -RUN cd /usr/local/ \ - && curl -s -j -k -L -H "Cookie: oraclelicense=accept-securebackup-cookie" https://download.oracle.com/otn-pub/java/jdk/11.0.14%2B8/7e5bbbfffe8b45e59d52a96aacab2f04/jdk-11.0.14_linux-x64_bin.rpm > jdk-11.0.14_linux-x64_bin.rpm \ - && yum -y localinstall jdk-11.0.14_linux-x64_bin.rpm +RUN apt-get update && apt-get install -y \ + software-properties-common \ + build-essential \ + libgl1-mesa-dev \ + libglu1-mesa-dev \ + libncurses5-dev \ + libx11-dev \ + libxrender-dev \ + zlib1g-dev \ + curl \ + unzip \ + ruby \ + ruby-dev \ + && gem install bundler -v 2.3.10 + +# Add the Oracle JDK 17 PPA and install Oracle JDK 17 +RUN add-apt-repository ppa:linuxuprising/java \ + && apt-get update \ + && echo oracle-java17-installer shared/accepted-oracle-license-v1-3 select true | debconf-set-selections \ + && apt-get install -y oracle-java17-installer \ + && apt-get install -y oracle-java17-set-default # Java environment variables -ENV JAVA_VERSION 1.11 -ENV JAVA_HOME /usr/java/jdk-11.0.14 -ENV JRE_HOME /usr/java/jdk-11.0.14/jre -ENV PATH $PATH:/usr/java/jdk-11.0.14/bin:/usr/java/jdk-11.0.14/jre/bin +ENV JAVA_HOME /usr/lib/jvm/java-17-oracle +ENV PATH $PATH:$JAVA_HOME/bin # Install Android SDK RUN mkdir -p /usr/local/android-sdk \ @@ -43,23 +46,18 @@ RUN mv /usr/local/android-sdk/cmdline-tools /usr/local/android-sdk/initversion \ # Environment variables ENV ANDROID_HOME /usr/local/android-sdk ENV ANDROID_SDK_ROOT /usr/local/android-sdk -# adding "latest" first to PATH so it will have higher priority -# after "update" we will have latest binaries under "latest" folder ENV PATH $PATH:$ANDROID_SDK_ROOT/cmdline-tools/latest/bin ENV PATH $PATH:$ANDROID_SDK_ROOT/cmdline-tools/initversion/bin ENV PATH $PATH:$ANDROID_SDK_ROOT/platform-tools -ENV PATH $PATH:$ANT_HOME/bin # Install Android tools -RUN sdkmanager --update <<< 'y' -RUN yes | sdkmanager "platforms;android-32" "build-tools;32.0.0" "extras;google;m2repository" "extras;android;m2repository" -#RUN echo yes | /usr/local/android-sdk-linux/tools/android update sdk --filter android-32 --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 yes | sdkmanager --update \ + && yes | sdkmanager "platforms;android-34" "build-tools;34.0.0" "extras;google;m2repository" "extras;android;m2repository" # Clean up -RUN yum clean all -RUN rm -rf /usr/local/commandlinetools-linux-8092744_latest.zip /usr/local/jdk-11.0.14_linux-x64_bin.rpm /var/cache/yum +RUN apt-get clean \ + && rm -rf /var/lib/apt/lists/* \ + && rm -rf /usr/local/commandlinetools-linux-8092744_latest.zip + +# List the contents of the work directory +RUN cd /usr/local/ && ls -la \ No newline at end of file diff --git a/android-ubuntu/Makefile b/android-ubuntu/Makefile index 1178568..edf9a3e 100644 --- a/android-ubuntu/Makefile +++ b/android-ubuntu/Makefile @@ -1,4 +1,4 @@ -VERSION=28_20190219 +VERSION=28_20240812 DOCKER_REPO=pubnative/android DOCKER_REPO_VERSION=$(DOCKER_REPO):$(VERSION) DOCKER_REPO_LATEST=$(DOCKER_REPO):latest From 6487c398f9bc2a0deee2d156daeddc06b333b3b9 Mon Sep 17 00:00:00 2001 From: Eros Garcia Ponte Date: Sun, 25 Aug 2024 14:43:18 +0200 Subject: [PATCH 6/6] Fixed image for Java 11 --- android-ubuntu/Dockerfile | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/android-ubuntu/Dockerfile b/android-ubuntu/Dockerfile index 3ad3a99..50d65cd 100644 --- a/android-ubuntu/Dockerfile +++ b/android-ubuntu/Dockerfile @@ -1,6 +1,5 @@ -# Image pubnative/android - -FROM ubuntu:22.04 +# Start from the official OpenJDK 11 image +FROM openjdk:11-jdk LABEL maintainer="Eros Garcia Ponte " @@ -22,15 +21,8 @@ RUN apt-get update && apt-get install -y \ ruby-dev \ && gem install bundler -v 2.3.10 -# Add the Oracle JDK 17 PPA and install Oracle JDK 17 -RUN add-apt-repository ppa:linuxuprising/java \ - && apt-get update \ - && echo oracle-java17-installer shared/accepted-oracle-license-v1-3 select true | debconf-set-selections \ - && apt-get install -y oracle-java17-installer \ - && apt-get install -y oracle-java17-set-default - -# Java environment variables -ENV JAVA_HOME /usr/lib/jvm/java-17-oracle +# Set JAVA_HOME environment variable +ENV JAVA_HOME /usr/local/openjdk-11 ENV PATH $PATH:$JAVA_HOME/bin # Install Android SDK @@ -60,4 +52,4 @@ RUN apt-get clean \ && rm -rf /usr/local/commandlinetools-linux-8092744_latest.zip # List the contents of the work directory -RUN cd /usr/local/ && ls -la \ No newline at end of file +RUN cd /usr/local/ && ls -la