From da2b8d5dc112ad292fae9542e1f3291504b45240 Mon Sep 17 00:00:00 2001 From: Zafir Sk Heerah Date: Fri, 31 May 2024 17:55:13 +0400 Subject: [PATCH 01/15] Better image for local --- Dockerfile | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 78 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7b1e880..5925fc1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,81 @@ -FROM cimg/android:2022.12.1-node +FROM ubuntu:24.04 + +RUN sudo apt-get update && sudo apt-get install -y \ + ant \ + openjdk-8-jdk \ + openjdk-11-jdk \ + ruby-full \ + && \ + sudo rm -rf /var/lib/apt/lists/* && \ + ruby -v && \ + sudo gem install bundler && \ + bundle version + +ENV M2_HOME /usr/local/apache-maven +ENV MAVEN_OPTS -Xmx2048m +ENV PATH $M2_HOME/bin:$PATH +# Set JAVA_HOME (and related) environment variable. This will be set to our +# default Java version of 11 but the user would need to reset it when changing +# JAVA versions. +ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 +ENV JDK_HOME=${JAVA_HOME} +ENV JRE_HOME=${JDK_HOME} +ENV MAVEN_VERSION "3.8.6" +RUN curl -sSL -o /tmp/maven.tar.gz http://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \ + sudo tar -xz -C /usr/local -f /tmp/maven.tar.gz && \ + sudo ln -sf /usr/local/apache-maven-${MAVEN_VERSION} /usr/local/apache-maven && \ + rm -rf /tmp/maven.tar.gz && \ + mkdir -p /home/circleci/.m2 + +ENV GRADLE_VERSION "7.6" +ENV PATH $PATH:/usr/local/gradle-${GRADLE_VERSION}/bin +RUN URL=https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip && \ + curl -sSL -o /tmp/gradle.zip $URL && \ + sudo unzip -d /usr/local /tmp/gradle.zip && \ + rm -rf /tmp/gradle.zip + +# Install Android SDK Tools +ENV ANDROID_HOME "/home/circleci/android-sdk" +ENV ANDROID_SDK_ROOT $ANDROID_HOME +ENV CMDLINE_TOOLS_ROOT "${ANDROID_HOME}/cmdline-tools/latest/bin" +ENV ADB_INSTALL_TIMEOUT 120 +ENV PATH "${ANDROID_HOME}/emulator:${ANDROID_HOME}/cmdline-tools/latest/bin:${ANDROID_HOME}/tools:${ANDROID_HOME}/tools/bin:${ANDROID_HOME}/platform-tools:${ANDROID_HOME}/platform-tools/bin:${PATH}" +# You can find the latest command line tools here: https://developer.android.com/studio#command-line-tools-only +RUN SDK_TOOLS_URL="https://dl.google.com/android/repository/commandlinetools-linux-9123335_latest.zip" && \ + mkdir -p ${ANDROID_HOME}/cmdline-tools && \ + mkdir ${ANDROID_HOME}/platforms && \ + mkdir ${ANDROID_HOME}/ndk && \ + wget -O /tmp/cmdline-tools.zip -t 5 "${SDK_TOOLS_URL}" && \ + unzip -q /tmp/cmdline-tools.zip -d ${ANDROID_HOME}/cmdline-tools && \ + rm /tmp/cmdline-tools.zip && \ + mv ${ANDROID_HOME}/cmdline-tools/cmdline-tools ${ANDROID_HOME}/cmdline-tools/latest + +RUN echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "tools" && \ + echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "platform-tools" && \ + echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "build-tools;33.0.1" + +RUN echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "platforms;android-33" && \ + echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "platforms;android-32" && \ + echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "platforms;android-31" && \ + echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "platforms;android-30" && \ + echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "platforms;android-29" && \ + echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "platforms;android-28" && \ + echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "platforms;android-27" + +# Install some useful packages +RUN echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "extras;android;m2repository" && \ + echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "extras;google;m2repository" && \ + echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "extras;google;google_play_services" && \ + sudo gem install fastlane --version 2.208.0 --no-document + +# Install Google Cloud CLI +# Latest gcloud version can be found here: https://cloud.google.com/sdk/docs/release-notes +ENV GCLOUD_VERSION "412.0.0-0" +RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key add - && \ + sudo add-apt-repository "deb https://packages.cloud.google.com/apt cloud-sdk main" && \ + sudo apt-get update && sudo apt-get install -y google-cloud-sdk=${GCLOUD_VERSION} && \ + sudo gcloud config set --installation component_manager/disable_update_check true && \ + sudo gcloud config set disable_usage_reporting false RUN echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "cmake;3.6.4111459" && \ echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "cmake;3.10.2.4988404" From 567bbaea4afef595547b6f51e7dfe850718eec46 Mon Sep 17 00:00:00 2001 From: Zafir Sk Heerah Date: Fri, 31 May 2024 18:20:56 +0400 Subject: [PATCH 02/15] Simpler --- Dockerfile | 164 +++++++---------------------------------------------- 1 file changed, 21 insertions(+), 143 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5925fc1..d61efc7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,155 +1,33 @@ FROM ubuntu:24.04 -RUN sudo apt-get update && sudo apt-get install -y \ - ant \ - openjdk-8-jdk \ - openjdk-11-jdk \ - ruby-full \ - && \ - sudo rm -rf /var/lib/apt/lists/* && \ - ruby -v && \ - sudo gem install bundler && \ - bundle version +USER root + +# update image and install required packages +RUN apt update && apt install -y \ + openjdk-8-jdk \ + openjdk-11-jdk \ -ENV M2_HOME /usr/local/apache-maven -ENV MAVEN_OPTS -Xmx2048m -ENV PATH $M2_HOME/bin:$PATH -# Set JAVA_HOME (and related) environment variable. This will be set to our -# default Java version of 11 but the user would need to reset it when changing -# JAVA versions. ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 ENV JDK_HOME=${JAVA_HOME} ENV JRE_HOME=${JDK_HOME} -ENV MAVEN_VERSION "3.8.6" -RUN curl -sSL -o /tmp/maven.tar.gz http://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \ - sudo tar -xz -C /usr/local -f /tmp/maven.tar.gz && \ - sudo ln -sf /usr/local/apache-maven-${MAVEN_VERSION} /usr/local/apache-maven && \ - rm -rf /tmp/maven.tar.gz && \ - mkdir -p /home/circleci/.m2 - -ENV GRADLE_VERSION "7.6" -ENV PATH $PATH:/usr/local/gradle-${GRADLE_VERSION}/bin -RUN URL=https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip && \ - curl -sSL -o /tmp/gradle.zip $URL && \ - sudo unzip -d /usr/local /tmp/gradle.zip && \ - rm -rf /tmp/gradle.zip - -# Install Android SDK Tools -ENV ANDROID_HOME "/home/circleci/android-sdk" -ENV ANDROID_SDK_ROOT $ANDROID_HOME -ENV CMDLINE_TOOLS_ROOT "${ANDROID_HOME}/cmdline-tools/latest/bin" -ENV ADB_INSTALL_TIMEOUT 120 -ENV PATH "${ANDROID_HOME}/emulator:${ANDROID_HOME}/cmdline-tools/latest/bin:${ANDROID_HOME}/tools:${ANDROID_HOME}/tools/bin:${ANDROID_HOME}/platform-tools:${ANDROID_HOME}/platform-tools/bin:${PATH}" -# You can find the latest command line tools here: https://developer.android.com/studio#command-line-tools-only -RUN SDK_TOOLS_URL="https://dl.google.com/android/repository/commandlinetools-linux-9123335_latest.zip" && \ - mkdir -p ${ANDROID_HOME}/cmdline-tools && \ - mkdir ${ANDROID_HOME}/platforms && \ - mkdir ${ANDROID_HOME}/ndk && \ - wget -O /tmp/cmdline-tools.zip -t 5 "${SDK_TOOLS_URL}" && \ - unzip -q /tmp/cmdline-tools.zip -d ${ANDROID_HOME}/cmdline-tools && \ - rm /tmp/cmdline-tools.zip && \ - mv ${ANDROID_HOME}/cmdline-tools/cmdline-tools ${ANDROID_HOME}/cmdline-tools/latest - -RUN echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "tools" && \ - echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "platform-tools" && \ - echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "build-tools;33.0.1" - -RUN echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "platforms;android-33" && \ - echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "platforms;android-32" && \ - echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "platforms;android-31" && \ - echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "platforms;android-30" && \ - echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "platforms;android-29" && \ - echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "platforms;android-28" && \ - echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "platforms;android-27" -# Install some useful packages -RUN echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "extras;android;m2repository" && \ - echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "extras;google;m2repository" && \ - echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "extras;google;google_play_services" && \ - sudo gem install fastlane --version 2.208.0 --no-document +# Install Gradle 7.6 +RUN wget https://services.gradle.org/distributions/gradle-7.6-bin.zip -P /tmp && \ + unzip -d /opt/gradle /tmp/gradle-7.6-bin.zip && \ + ln -s /opt/gradle/gradle-7.6/bin/gradle /usr/bin/gradle && \ + rm /tmp/gradle-7.6-bin.zip -# Install Google Cloud CLI -# Latest gcloud version can be found here: https://cloud.google.com/sdk/docs/release-notes -ENV GCLOUD_VERSION "412.0.0-0" -RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key add - && \ - sudo add-apt-repository "deb https://packages.cloud.google.com/apt cloud-sdk main" && \ - sudo apt-get update && sudo apt-get install -y google-cloud-sdk=${GCLOUD_VERSION} && \ - sudo gcloud config set --installation component_manager/disable_update_check true && \ - sudo gcloud config set disable_usage_reporting false - -RUN echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "cmake;3.6.4111459" && \ - echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "cmake;3.10.2.4988404" - -# Setup LTS release -ENV NDK_LTS_VERSION "21.4.7075529" -ENV ANDROID_NDK_HOME "/home/circleci/android-sdk/ndk/${NDK_LTS_VERSION}" -RUN echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "ndk;${NDK_LTS_VERSION}" - -# Setup build tools -ENV BUILD_TOOLS_VERSION "30.0.3" -RUN echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "build-tools;${BUILD_TOOLS_VERSION}" - -ENV ANDROID_NDK_ROOT "${ANDROID_NDK_HOME}" -ENV PATH "${ANDROID_NDK_HOME}:${PATH}" - -USER root -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node \ - && echo 'node ALL=NOPASSWD: ALL' >> /etc/sudoers.d/50-circleci \ - && echo 'Defaults env_keep += "DEBIAN_FRONTEND"' >> /etc/sudoers.d/env_keep -USER node -ENV PATH /home/node/.local/bin:/home/node/bin:${PATH} - -CMD ["/bin/sh"] - -# Switching user can confuse Docker's idea of $HOME, so we set it explicitly -ENV HOME /home/node - -RUN sudo npm install --unsafe-perm=true --allow-root -g cordova@12.0.0 @ionic/cli@6.20.3 - -RUN sudo apt-get update -qq && \ - DEBIAN_FRONTEND=noninteractive sudo apt-get install -y -qq --no-install-recommends \ - # for ruby-dev - build-essential\ - git \ - vim \ - # for rbenv - libssl-dev libreadline-dev zlib1g-dev \ - # for postgres - libpq-dev \ - && sudo apt-get clean \ - && sudo rm -rf /var/cache/apt/archives/* \ - && sudo rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \ - && sudo truncate -s 0 /var/log/*log - -ENV PATH="/home/node/.rbenv/bin:/home/node/.rbenv/shims:$PATH" - -ENV NVM_DIR="$HOME/.nvm" -ENV NODE_VERSION="16.17.0" - -RUN curl https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash \ - && source $NVM_DIR/nvm.sh \ - && nvm install $NODE_VERSION \ - && nvm alias default $NODE_VERSION \ - && nvm use default - -ENV NODE_PATH="$NVM_DIR/v$NODE_VERSION/lib/node_modules" -ENV PATH="$NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH" - -RUN sudo apt-get update && \ - sudo apt-get install git curl libssl-dev libreadline-dev bison zlib1g-dev autoconf build-essential libyaml-dev libreadline-dev libncurses5-dev libffi-dev libgdbm-dev && \ - bash -c "curl -fsSL https://github.com/rbenv/rbenv-installer/raw/HEAD/bin/rbenv-installer | bash" && \ - bash -c "rbenv install 3.1.4" && \ - echo 'eval "$(rbenv init -)"' >> /home/node/.bashrc && \ - bash -c "rbenv global 3.1.4" && \ - bash -c "/home/node/.rbenv/shims/gem install bundler" - -RUN sudo apt-get update && sudo apt-get install python3-pip - -ENV JAVA_HOME="/usr/lib/jvm/java-11-openjdk-amd64" +# Install Android SDK Tools +RUN apt-get install -y wget unzip && \ + wget https://dl.google.com/android/repository/commandlinetools-linux-9123335_latest.zip -P /tmp && \ + unzip -d /opt/android-sdk /tmp/commandlinetools-linux-9123335_latest.zip && \ + rm /tmp/commandlinetools-linux-9123335_latest.zip -RUN java -version && gradle -v && ruby -v && node -v && pip -V +ENV ANDROID_HOME=/opt/android-sdk +ENV PATH=${PATH}:${ANDROID_HOME}/cmdline-tools/bin -WORKDIR /home/node +# Install Android SDK +RUN yes | sdkmanager --licenses && \ + sdkmanager "platform-tools" "platforms;android-30" "build-tools;30.0.3" "extras;google;m2repository" "extras;android;m2repository" From 425adb86608160ff1f14f9d8a6aba9707baf903c Mon Sep 17 00:00:00 2001 From: Zafir Sk Heerah Date: Fri, 31 May 2024 18:23:00 +0400 Subject: [PATCH 03/15] Test this one --- Dockerfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index d61efc7..a78b509 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,11 +3,9 @@ FROM ubuntu:24.04 USER root # update image and install required packages -RUN apt update && apt install -y \ - openjdk-8-jdk \ - openjdk-11-jdk \ +RUN apt update && apt install -y default-jdk -ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 +ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64/ ENV JDK_HOME=${JAVA_HOME} ENV JRE_HOME=${JDK_HOME} From 620c2419ac077778c06cda240a64504490afe8a3 Mon Sep 17 00:00:00 2001 From: Zafir Sk Heerah Date: Fri, 31 May 2024 18:30:19 +0400 Subject: [PATCH 04/15] Install wget and unzip --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index a78b509..79a859c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,6 +9,9 @@ ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64/ ENV JDK_HOME=${JAVA_HOME} ENV JRE_HOME=${JDK_HOME} +# Install wget and unzip +RUN apt-get install -y wget unzip + # Install Gradle 7.6 RUN wget https://services.gradle.org/distributions/gradle-7.6-bin.zip -P /tmp && \ unzip -d /opt/gradle /tmp/gradle-7.6-bin.zip && \ From 955adccafd6dd0eafda8a724c1cb564112ee2056 Mon Sep 17 00:00:00 2001 From: Zafir Sk Heerah Date: Fri, 31 May 2024 18:42:05 +0400 Subject: [PATCH 05/15] Test --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 79a859c..6b02e5c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ USER root # update image and install required packages RUN apt update && apt install -y default-jdk -ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64/ +ENV JAVA_HOME=$(dirname $( readlink -f $(which java) )) ENV JDK_HOME=${JAVA_HOME} ENV JRE_HOME=${JDK_HOME} From 7216f2320f408f3b74d5bc9cc432161fc3a6adb4 Mon Sep 17 00:00:00 2001 From: Zafir Sk Heerah Date: Fri, 31 May 2024 18:43:32 +0400 Subject: [PATCH 06/15] Test --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6b02e5c..5f0057a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ USER root # update image and install required packages RUN apt update && apt install -y default-jdk -ENV JAVA_HOME=$(dirname $( readlink -f $(which java) )) +ENV JAVA_HOME=/usr/lib/jvm/default-java ENV JDK_HOME=${JAVA_HOME} ENV JRE_HOME=${JDK_HOME} From d1abdb6bb344c39a9340873f6c73b70c4e5c19ca Mon Sep 17 00:00:00 2001 From: Zafir Sk Heerah Date: Fri, 31 May 2024 18:46:29 +0400 Subject: [PATCH 07/15] Test --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 5f0057a..ff3203b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,6 +27,7 @@ RUN apt-get install -y wget unzip && \ rm /tmp/commandlinetools-linux-9123335_latest.zip ENV ANDROID_HOME=/opt/android-sdk +ENV ANDROID_SDK_ROOT=${ANDROID_HOME} ENV PATH=${PATH}:${ANDROID_HOME}/cmdline-tools/bin # Install Android SDK From f65d23919fa247fa46df5f4290f39ebd816fca3f Mon Sep 17 00:00:00 2001 From: Zafir Sk Heerah Date: Fri, 31 May 2024 18:50:41 +0400 Subject: [PATCH 08/15] Test --- Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index ff3203b..140b657 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,8 +18,6 @@ RUN wget https://services.gradle.org/distributions/gradle-7.6-bin.zip -P /tmp && ln -s /opt/gradle/gradle-7.6/bin/gradle /usr/bin/gradle && \ rm /tmp/gradle-7.6-bin.zip - - # Install Android SDK Tools RUN apt-get install -y wget unzip && \ wget https://dl.google.com/android/repository/commandlinetools-linux-9123335_latest.zip -P /tmp && \ @@ -27,7 +25,7 @@ RUN apt-get install -y wget unzip && \ rm /tmp/commandlinetools-linux-9123335_latest.zip ENV ANDROID_HOME=/opt/android-sdk -ENV ANDROID_SDK_ROOT=${ANDROID_HOME} +ENV ANDROID_SDK_ROOT=${ANDROID_HOME}/cmdline-tools/bin/sdkmanager ENV PATH=${PATH}:${ANDROID_HOME}/cmdline-tools/bin # Install Android SDK From 0ea2ef0b0807efaa85daef2d4d568962e28b24ae Mon Sep 17 00:00:00 2001 From: Zafir Sk Heerah Date: Fri, 31 May 2024 18:58:58 +0400 Subject: [PATCH 09/15] Test --- Dockerfile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 140b657..3107167 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,16 +18,17 @@ RUN wget https://services.gradle.org/distributions/gradle-7.6-bin.zip -P /tmp && ln -s /opt/gradle/gradle-7.6/bin/gradle /usr/bin/gradle && \ rm /tmp/gradle-7.6-bin.zip +ENV ANDROID_HOME=/opt/android-sdk +ENV PATH=${PATH}:${ANDROID_HOME}/cmdline-tools/bin + # Install Android SDK Tools -RUN apt-get install -y wget unzip && \ - wget https://dl.google.com/android/repository/commandlinetools-linux-9123335_latest.zip -P /tmp && \ +RUN wget https://dl.google.com/android/repository/commandlinetools-linux-9123335_latest.zip -P /tmp && \ + mkdir -p ${ANDROID_HOME}/cmdline-tools && \ + mkdir ${ANDROID_HOME}/platforms && \ + mkdir ${ANDROID_HOME}/ndk && \ unzip -d /opt/android-sdk /tmp/commandlinetools-linux-9123335_latest.zip && \ rm /tmp/commandlinetools-linux-9123335_latest.zip -ENV ANDROID_HOME=/opt/android-sdk -ENV ANDROID_SDK_ROOT=${ANDROID_HOME}/cmdline-tools/bin/sdkmanager -ENV PATH=${PATH}:${ANDROID_HOME}/cmdline-tools/bin - # Install Android SDK RUN yes | sdkmanager --licenses && \ sdkmanager "platform-tools" "platforms;android-30" "build-tools;30.0.3" "extras;google;m2repository" "extras;android;m2repository" From f1508ee6491a4878af2864e468f354d1828d7cfc Mon Sep 17 00:00:00 2001 From: Zafir Sk Heerah Date: Fri, 31 May 2024 19:04:49 +0400 Subject: [PATCH 10/15] test --- Dockerfile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3107167..073dbe7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,16 +19,18 @@ RUN wget https://services.gradle.org/distributions/gradle-7.6-bin.zip -P /tmp && rm /tmp/gradle-7.6-bin.zip ENV ANDROID_HOME=/opt/android-sdk -ENV PATH=${PATH}:${ANDROID_HOME}/cmdline-tools/bin # Install Android SDK Tools RUN wget https://dl.google.com/android/repository/commandlinetools-linux-9123335_latest.zip -P /tmp && \ - mkdir -p ${ANDROID_HOME}/cmdline-tools && \ - mkdir ${ANDROID_HOME}/platforms && \ - mkdir ${ANDROID_HOME}/ndk && \ - unzip -d /opt/android-sdk /tmp/commandlinetools-linux-9123335_latest.zip && \ + mkdir -p ${ANDROID_HOME}/cmdline-tools/latest && \ + mkdir ${ANDROID_HOME}/platforms && \ + mkdir ${ANDROID_HOME}/ndk && \ + unzip -d ${ANDROID_HOME}/cmdline-tools/latest /tmp/commandlinetools-linux-9123335_latest.zip && \ rm /tmp/commandlinetools-linux-9123335_latest.zip +# Set PATH to include the bin directory of the cmdline-tools +ENV PATH=${PATH}:${ANDROID_HOME}/cmdline-tools/latest/bin + # Install Android SDK RUN yes | sdkmanager --licenses && \ sdkmanager "platform-tools" "platforms;android-30" "build-tools;30.0.3" "extras;google;m2repository" "extras;android;m2repository" From 862e0cf7319fc1f75a58b81095d1d88006d0606b Mon Sep 17 00:00:00 2001 From: Zafir Sk Heerah Date: Fri, 31 May 2024 19:07:17 +0400 Subject: [PATCH 11/15] Test --- Dockerfile | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 073dbe7..7a0b4cb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,15 +22,14 @@ ENV ANDROID_HOME=/opt/android-sdk # Install Android SDK Tools RUN wget https://dl.google.com/android/repository/commandlinetools-linux-9123335_latest.zip -P /tmp && \ - mkdir -p ${ANDROID_HOME}/cmdline-tools/latest && \ - mkdir ${ANDROID_HOME}/platforms && \ - mkdir ${ANDROID_HOME}/ndk && \ - unzip -d ${ANDROID_HOME}/cmdline-tools/latest /tmp/commandlinetools-linux-9123335_latest.zip && \ + mkdir -p ${ANDROID_HOME}/cmdline-tools && \ + unzip -d ${ANDROID_HOME}/cmdline-tools /tmp/commandlinetools-linux-9123335_latest.zip && \ + mv ${ANDROID_HOME}/cmdline-tools/cmdline-tools ${ANDROID-WORK_DIR}/cmdline-tools/latest && \ rm /tmp/commandlinetools-linux-9123335_latest.zip # Set PATH to include the bin directory of the cmdline-tools ENV PATH=${PATH}:${ANDROID_HOME}/cmdline-tools/latest/bin -# Install Android SDK -RUN yes | sdkmanager --licenses && \ - sdkmanager "platform-tools" "platforms;android-30" "build-tools;30.0.3" "extras;google;m2repository" "extras;android;m2repository" +# Accept licenses and install SDK components +RUN yes | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --licenses && \ + ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager "platform-tools" "platforms;android-30" "build-tools;30.0.3" "extras;google;m2repository" "extras;android;m2repository" \ No newline at end of file From 6b899490387ca64d3815fe310e47f361d8f8da75 Mon Sep 17 00:00:00 2001 From: Zafir Sk Heerah Date: Fri, 31 May 2024 19:09:21 +0400 Subject: [PATCH 12/15] Test --- Dockerfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7a0b4cb..284640b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,9 +22,10 @@ ENV ANDROID_HOME=/opt/android-sdk # Install Android SDK Tools RUN wget https://dl.google.com/android/repository/commandlinetools-linux-9123335_latest.zip -P /tmp && \ - mkdir -p ${ANDROID_HOME}/cmdline-tools && \ - unzip -d ${ANDROID_HOME}/cmdline-tools /tmp/commandlinetools-linux-9123335_latest.zip && \ - mv ${ANDROID_HOME}/cmdline-tools/cmdline-tools ${ANDROID-WORK_DIR}/cmdline-tools/latest && \ + mkdir -p ${ANDROID_HOME}/cmdline-tools/latest && \ + mkdir ${ANDROID_HOME}/platforms && \ + mkdir ${ANDROID_HOME}/ndk && \ + unzip -d ${ANDROID_HOME}/cmdline-tools/latest /tmp/commandlinetools-linux-9123335_latest.zip && \ rm /tmp/commandlinetools-linux-9123335_latest.zip # Set PATH to include the bin directory of the cmdline-tools @@ -32,4 +33,4 @@ ENV PATH=${PATH}:${ANDROID_HOME}/cmdline-tools/latest/bin # Accept licenses and install SDK components RUN yes | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --licenses && \ - ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager "platform-tools" "platforms;android-30" "build-tools;30.0.3" "extras;google;m2repository" "extras;android;m2repository" \ No newline at end of file + ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager "platform-tools" "platforms;android-30" "build-tools;30.0.3" "extras;google;m2repository" "extras;android;m2repository" From 16fad1eb0826d901d6d713d2593577abb83fad0a Mon Sep 17 00:00:00 2001 From: Zafir Sk Heerah Date: Fri, 31 May 2024 19:15:09 +0400 Subject: [PATCH 13/15] Test --- Dockerfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 284640b..8c0ce4d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,11 +22,14 @@ ENV ANDROID_HOME=/opt/android-sdk # Install Android SDK Tools RUN wget https://dl.google.com/android/repository/commandlinetools-linux-9123335_latest.zip -P /tmp && \ - mkdir -p ${ANDROID_HOME}/cmdline-tools/latest && \ + mkdir ${ANDROID_HOME} && \ + mkdir ${ANDROID_HOME}/cmdline-tools && \ + mkdir ${ANDROID_HOME}/cmdline-tools/latest && \ mkdir ${ANDROID_HOME}/platforms && \ mkdir ${ANDROID_HOME}/ndk && \ unzip -d ${ANDROID_HOME}/cmdline-tools/latest /tmp/commandlinetools-linux-9123335_latest.zip && \ - rm /tmp/commandlinetools-linux-9123335_latest.zip + rm /tmp/commandlinetools-linux-9123335_latest.zip && \ + ls -la ${ANDROID_HOME}/cmdline-tools/latest/bin/ # Set PATH to include the bin directory of the cmdline-tools ENV PATH=${PATH}:${ANDROID_HOME}/cmdline-tools/latest/bin From 462903c6522c378d142ae87812c6de332f6528d7 Mon Sep 17 00:00:00 2001 From: Zafir Sk Heerah Date: Fri, 31 May 2024 19:17:52 +0400 Subject: [PATCH 14/15] Test --- Dockerfile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8c0ce4d..d39dc99 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,18 +22,18 @@ ENV ANDROID_HOME=/opt/android-sdk # Install Android SDK Tools RUN wget https://dl.google.com/android/repository/commandlinetools-linux-9123335_latest.zip -P /tmp && \ - mkdir ${ANDROID_HOME} && \ - mkdir ${ANDROID_HOME}/cmdline-tools && \ - mkdir ${ANDROID_HOME}/cmdline-tools/latest && \ - mkdir ${ANDROID_HOME}/platforms && \ - mkdir ${ANDROID_HOME}/ndk && \ - unzip -d ${ANDROID_HOME}/cmdline-tools/latest /tmp/commandlinetools-linux-9123335_latest.zip && \ + mkdir -p ${ANDROID_HOME}/cmdline-tools && \ + unzip -d ${ANDROID_HOME}/cmdline-tools/temp /tmp/commandlinetools-linux-9123335_latest.zip && \ rm /tmp/commandlinetools-linux-9123335_latest.zip && \ - ls -la ${ANDROID_HOME}/cmdline-tools/latest/bin/ + ls -la ${ANDROID_HOME}/cmdline-tools/temp/ && \ + mv ${ANDROID_HOME}/cmdline-tools/temp/cmdline-tools ${ANDROID_HOME}/cmdline-tools/latest && \ + ls -la ${ANDROID_HOME}/cmdline-tools/latest/bin/ && \ + rm -rf ${ANDROID_HOME}/cmdline-tools/temp # Set PATH to include the bin directory of the cmdline-tools ENV PATH=${PATH}:${ANDROID_HOME}/cmdline-tools/latest/bin # Accept licenses and install SDK components RUN yes | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --licenses && \ - ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager "platform-tools" "platforms;android-30" "build-tools;30.0.3" "extras;google;m2repository" "extras;android;m2repository" + ${ANDROID_HAND-WORK_DIR}/cmdline-tools/latest/bin/sdkmanager "platform-tools" "platforms;android-30" "build-tools;30.0.3" "extras;google;m2repository" "extras;android;m2repository" + From 91cbc56b3816f8f9a1c4e698a4353129d1eb5192 Mon Sep 17 00:00:00 2001 From: Zafir Sk Heerah Date: Fri, 31 May 2024 19:31:03 +0400 Subject: [PATCH 15/15] Fix --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d39dc99..1e763c8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,5 +35,5 @@ ENV PATH=${PATH}:${ANDROID_HOME}/cmdline-tools/latest/bin # Accept licenses and install SDK components RUN yes | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --licenses && \ - ${ANDROID_HAND-WORK_DIR}/cmdline-tools/latest/bin/sdkmanager "platform-tools" "platforms;android-30" "build-tools;30.0.3" "extras;google;m2repository" "extras;android;m2repository" + ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager "platform-tools" "platforms;android-30" "build-tools;30.0.3" "extras;google;m2repository" "extras;android;m2repository"