Merge pull request #38 from WindSekirun/bug/add-sdk-root-variable

1.1.4

.gitignore

@@ -0,0 +1 @@
+internal/

Dockerfile

@@ -1,18 +1,19 @@
 ## Based Image
-FROM jenkins/jenkins:2.259
+FROM jenkins/jenkins:2.266
 
 ## Define Environment
 LABEL maintainer="[email protected]"
 
-ENV ANDROID_SDK_ZIP sdk-tools-linux-4333796.zip
+ENV ANDROID_SDK_ZIP commandlinetools-linux-6609375_latest.zip
 ENV ANDROID_SDK_ZIP_URL https://dl.google.com/android/repository/$ANDROID_SDK_ZIP
 ENV ANDROID_HOME /opt/android-sdk-linux
+ENV ANDROID_SDK_ROOT /opt/android-sdk-linux
 
 ENV GRADLE_ZIP gradle-5.6.4-bin.zip
 ENV GRADLE_ZIP_URL https://services.gradle.org/distributions/$GRADLE_ZIP
 
-ENV PATH $PATH:$ANDROID_HOME/tools/bin
-ENV PATH $PATH:$ANDROID_HOME/platform-tools
+ENV PATH $PATH:$ANDROID_SDK_ROOT/tools/bin
+ENV PATH $PATH:$ANDROID_SDK_ROOT/platform-tools
 ENV PATH $PATH:/opt/gradle-5.6.4/bin
 
 # Build-time metadata as defined at http://label-schema.org
@@ -32,7 +33,7 @@ USER root
 
 ## Install requirements
 RUN dpkg --add-architecture i386
-RUN rm -rf /var/lib/apt/list/* && apt-get update && apt-get install ca-certificates curl gnupg2 software-properties-common git unzip file apt-utils lxc apt-transport-https -y
+RUN rm -rf /var/lib/apt/list/* && apt-get update && apt-get install ca-certificates curl gnupg2 software-properties-common git unzip file apt-utils lxc apt-transport-https libc6:i386 libncurses5:i386 libstdc++6:i386 zlib1g:i386 -y
 
 ## Install Docker-ce into Image
 RUN curl -fsSL https://download.docker.com/linux/$(. /etc/os-release; echo "$ID")/gpg > /tmp/dkey;
@@ -46,26 +47,20 @@ ADD $GRADLE_ZIP_URL /opt/
 RUN unzip /opt/$GRADLE_ZIP -d /opt/ && rm /opt/$GRADLE_ZIP
 
 ADD $ANDROID_SDK_ZIP_URL /opt/
-RUN unzip -q /opt/$ANDROID_SDK_ZIP -d $ANDROID_HOME && rm /opt/$ANDROID_SDK_ZIP
+RUN unzip -q /opt/$ANDROID_SDK_ZIP -d $ANDROID_SDK_ROOT && rm /opt/$ANDROID_SDK_ZIP
 
-RUN echo y | sdkmanager platform-tools "build-tools;30.0.2"
-RUN echo y | sdkmanager platform-tools "platforms;android-30"
-RUN echo y | sdkmanager platform-tools "build-tools;29.0.2"
-RUN echo y | sdkmanager platform-tools "platforms;android-29"
-RUN echo y | sdkmanager platform-tools "build-tools;28.0.3"
-RUN echo y | sdkmanager platform-tools "platforms;android-28"
-RUN echo y | sdkmanager platform-tools "build-tools;27.0.3"
-RUN echo y | sdkmanager platform-tools "platforms;android-27"
-RUN echo y | sdkmanager platform-tools "build-tools;26.0.3"
-RUN echo y | sdkmanager platform-tools "platforms;android-26"
-RUN echo y | sdkmanager platform-tools "build-tools;25.0.3"
-RUN echo y | sdkmanager platform-tools "platforms;android-25"
-RUN echo y | sdkmanager platform-tools "build-tools;23.0.3"
-RUN echo y | sdkmanager platform-tools "platforms;android-23"
-RUN echo y | sdkmanager platform-tools "extras;android;m2repository"
-RUN chown -R jenkins $ANDROID_HOME
+RUN echo yes | sdkmanager --sdk_root=${ANDROID_SDK_ROOT} "platform-tools" "build-tools;30.0.2"
+RUN echo yes | sdkmanager --sdk_root=${ANDROID_SDK_ROOT} "platform-tools" "platforms;android-30"
+RUN echo yes | sdkmanager --sdk_root=${ANDROID_SDK_ROOT} "platform-tools" "build-tools;29.0.2"
+RUN echo yes | sdkmanager --sdk_root=${ANDROID_SDK_ROOT} "platform-tools" "platforms;android-29"
+RUN echo yes | sdkmanager --sdk_root=${ANDROID_SDK_ROOT} "platform-tools" "build-tools;28.0.3"
+RUN echo yes | sdkmanager --sdk_root=${ANDROID_SDK_ROOT} "platform-tools" "platforms;android-28"
+RUN echo yes | sdkmanager --sdk_root=${ANDROID_SDK_ROOT} "platform-tools" "build-tools;27.0.3"
+RUN echo yes | sdkmanager --sdk_root=${ANDROID_SDK_ROOT} "platform-tools" "platforms;android-27"
+RUN echo yes | sdkmanager --sdk_root=${ANDROID_SDK_ROOT} "platform-tools" "build-tools;26.0.3"
+RUN echo yes | sdkmanager --sdk_root=${ANDROID_SDK_ROOT} "platform-tools" "platforms;android-26"
 
-RUN apt-get install libc6:i386 libncurses5:i386 libstdc++6:i386 zlib1g:i386 -y --no-install-recommends
+RUN chown -R jenkins $ANDROID_SDK_ROOT
 
 RUN apt-get clean
 RUN rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

README.md

@@ -6,7 +6,7 @@ Docker image for Jenkins with Android, [View on DockerHub](https://hub.docker.co
 Fork base code at [futurice/android-jenkins-docker](https://github.com/futurice/android-jenkins-docker), Revised to the latest development environment.
 
 ## Pre-installed packages
- * Jenkins Version: 2.259
+ * Jenkins Version: 2.266
  * Docker-CE 
 
 ### Android SDK
@@ -15,9 +15,6 @@ Fork base code at [futurice/android-jenkins-docker](https://github.com/futurice/
  * Android API 28 - build tools 28.0.3
  * Android API 27 - build tools 27.0.3
  * Android API 26 - build tools 26.0.3
- * Android API 25 - build tools 25.0.3 (1.0.2)
- * Android API 23 - build tools 23.0.3 (1.0.2)
- * extra-android-m2repository
 
 ### Jenkins Plugin
  * git
@@ -62,7 +59,7 @@ If you want use nginx for reverse-proxy, you can add this statement in conf file
 ```proxy_pass http://jenkins:8080;```
 
 ## Modification
- From Line 33 ~ 41, you can modify version info using `sdkmanager`. Feel free to change these value.
+ From Line 52, you can modify version info using `sdkmanager`. Feel free to change these value.
 
 ## ~License~
  ~Do we really need license?~

VERSION

@@ -1 +1 @@
-1.1.3
+1.1.4