Added Android Extra Repos / git

README.md

@@ -1,3 +1,3 @@
-Docker Images
+Webratio-Docker Images
 =================
-[Docker](https://www.docker.com/) images mantained by [WebRatio] (https://www.webratio.com)
+All rights by https://www.webratio.com,  just a clone of https://github.com/webratio/docker for personal adjustments.

android-sdk/README.md

@@ -1,4 +1,4 @@
-## Gitblit Dockerfile
+## Dockerfile
 
 This repository contains **Dockerfile** of [Android SDK](https://developer.android.com/sdk/) for [Docker](https://www.docker.com/)'s [build](https://registry.hub.docker.com/u/webratio/android-sdk/) published to the public [Docker Hub](https://hub.docker.com/).
 
@@ -7,4 +7,14 @@ This repository contains **Dockerfile** of [Android SDK](https://developer.andro
 1. Install [Docker](https://www.docker.com/).
 
 2. Pull the image
-  * `docker pull webratio/android-sdk`
+  * `docker pull nmaas87/webratio-android-sdk:r26.1.1`
+
+### Infos
+#### SDK Tools Link
+https://developer.android.com/studio/releases/sdk-tools.html
+https://androidsdkoffline.blogspot.de/p/android-sdk-tools.html
+#### SDK Build Tools Link
+https://developer.android.com/studio/releases/build-tools.html
+https://androidsdkoffline.blogspot.de/p/android-sdk-build-tools.html
+#### node.js Releases
+https://nodejs.org/dist/

android-sdk/Dockerfile → android-sdk/r23.0.2/Dockerfile

@@ -1,22 +1,34 @@
-FROM webratio/ant
-
-# Installs i386 architecture required for running 32 bit Android tools
-RUN dpkg --add-architecture i386 && \
-    apt-get update -y && \
-    apt-get install -y libc6:i386 libncurses5:i386 libstdc++6:i386 lib32z1 && \
-    rm -rf /var/lib/apt/lists/* && \
-    apt-get autoremove -y && \
-    apt-get clean
-
-# Installs Android SDK
-ENV ANDROID_SDK_FILENAME android-sdk_r23.0.2-linux.tgz
-ENV ANDROID_SDK_URL http://dl.google.com/android/${ANDROID_SDK_FILENAME}
-ENV ANDROID_API_LEVELS android-15,android-16,android-17,android-18,android-19,android-20,android-21 
-ENV ANDROID_BUILD_TOOLS_VERSION 21.1.0
-ENV ANDROID_HOME /opt/android-sdk-linux
-ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
-RUN cd /opt && \
-    wget -q ${ANDROID_SDK_URL} && \
-    tar -xzf ${ANDROID_SDK_FILENAME} && \
-    rm ${ANDROID_SDK_FILENAME} && \
-    echo y | android update sdk --no-ui -a --filter tools,platform-tools,${ANDROID_API_LEVELS},build-tools-${ANDROID_BUILD_TOOLS_VERSION}
+FROM nmaas87/webratio-ant
+
+# Installs i386 architecture required for running 32 bit Android tools
+RUN dpkg --add-architecture i386 && \
+    apt-get update -y && \
+    apt-get install -y git-core libc6:i386 libncurses5:i386 libstdc++6:i386 lib32z1 && \
+    rm -rf /var/lib/apt/lists/* && \
+    apt-get autoremove -y && \
+    apt-get clean
+
+# Installs Android SDK
+ENV ANDROID_SDK_FILENAME android-sdk_r23.0.2-linux.tgz
+ENV ANDROID_SDK_URL http://dl.google.com/android/${ANDROID_SDK_FILENAME}
+ENV ANDROID_API_LEVELS android-15,android-16,android-17,android-18,android-19,android-20,android-21
+ENV ANDROID_BUILD_TOOLS_VERSION 21.1.0
+ENV ANDROID_HOME /opt/android-sdk-linux
+ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
+RUN cd /opt && \
+    wget -q ${ANDROID_SDK_URL} && \
+    tar -xzf ${ANDROID_SDK_FILENAME} && \
+    rm ${ANDROID_SDK_FILENAME} && \
+    echo y | android update sdk --no-ui -a --filter tools,platform-tools,${ANDROID_API_LEVELS},build-tools-${ANDROID_BUILD_TOOLS_VERSION} && \
+    echo y | android update sdk --no-ui --all --filter "extra-android-support" && \
+    echo y | android update sdk --no-ui --all --filter "extra-android-m2repository" && \
+    echo y | android update sdk --no-ui --all --filter "extra-google-m2repository"
+
+# Installs Node.js
+ENV NODE_VERSION 4.4.4
+RUN cd && \
+    wget -q http://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.gz && \
+    tar -xzf node-v${NODE_VERSION}-linux-x64.tar.gz && \
+    mv node-v${NODE_VERSION}-linux-x64 /opt/node && \
+    rm node-v${NODE_VERSION}-linux-x64.tar.gz
+ENV PATH ${PATH}:/opt/node/bin

android-sdk/r24.4.1/Dockerfile

@@ -1,24 +1,36 @@
-FROM webratio/ant
+FROM nmaas87/webratio-ant
 
 ENV ANDROID_SDK_VERSION r24.4.1
 ENV ANDROID_BUILD_TOOLS_VERSION 23.0.3
 
 # Installs i386 architecture required for running 32 bit Android tools
 RUN dpkg --add-architecture i386 && \
     apt-get update -y && \
-    apt-get install -y libc6:i386 libncurses5:i386 libstdc++6:i386 lib32z1 && \
+    apt-get install -y git-core libc6:i386 libncurses5:i386 libstdc++6:i386 lib32z1 && \
     rm -rf /var/lib/apt/lists/* && \
     apt-get autoremove -y && \
     apt-get clean
 
 # Installs Android SDK
 ENV ANDROID_SDK_FILENAME android-sdk_${ANDROID_SDK_VERSION}-linux.tgz
 ENV ANDROID_SDK_URL http://dl.google.com/android/${ANDROID_SDK_FILENAME}
-ENV ANDROID_API_LEVELS android-15,android-16,android-17,android-18,android-19,android-20,android-21,android-22,android-23 
+ENV ANDROID_API_LEVELS android-15,android-16,android-17,android-18,android-19,android-20,android-21,android-22,android-23
 ENV ANDROID_HOME /opt/android-sdk-linux
 ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
 RUN cd /opt && \
     wget -q ${ANDROID_SDK_URL} && \
     tar -xzf ${ANDROID_SDK_FILENAME} && \
     rm ${ANDROID_SDK_FILENAME} && \
-    echo y | android update sdk --no-ui -a --filter tools,platform-tools,${ANDROID_API_LEVELS},build-tools-${ANDROID_BUILD_TOOLS_VERSION}
+    echo y | android update sdk --no-ui -a --filter tools,platform-tools,${ANDROID_API_LEVELS},build-tools-${ANDROID_BUILD_TOOLS_VERSION} && \
+    echo y | android update sdk --no-ui --all --filter "extra-android-support" && \
+    echo y | android update sdk --no-ui --all --filter "extra-android-m2repository" && \
+    echo y | android update sdk --no-ui --all --filter "extra-google-m2repository"
+
+# Installs Node.js
+ENV NODE_VERSION 4.4.4
+RUN cd && \
+    wget -q http://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.gz && \
+    tar -xzf node-v${NODE_VERSION}-linux-x64.tar.gz && \
+    mv node-v${NODE_VERSION}-linux-x64 /opt/node && \
+    rm node-v${NODE_VERSION}-linux-x64.tar.gz
+ENV PATH ${PATH}:/opt/node/bin

android-sdk/r25.2.4/Dockerfile

@@ -0,0 +1,37 @@
+FROM nmaas87/webratio-ant
+
+ENV ANDROID_SDK_VERSION r25.2.4
+ENV ANDROID_BUILD_TOOLS_VERSION 25.0.2
+
+# everything after build tools 23.0.1 is 64bit only: http://stackoverflow.com/questions/38096225/automatically-accept-all-sdk-licences 
+RUN apt-get update -y && \
+    apt-get install -y git-core libc6 libncurses5 libstdc++6 lib32z1 unzip && \
+    rm -rf /var/lib/apt/lists/* && \
+    apt-get autoremove -y && \
+    apt-get clean
+
+# Installs Android SDK
+ENV ANDROID_SDK_FILENAME tools_${ANDROID_SDK_VERSION}-linux.zip
+ENV ANDROID_SDK_URL http://dl.google.com/android/repository/${ANDROID_SDK_FILENAME}
+ENV ANDROID_API_LEVELS android-15,android-16,android-17,android-18,android-19,android-20,android-21,android-22,android-23,android-24,android-25
+ENV ANDROID_HOME /opt/android-sdk-linux
+ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
+RUN cd /opt && \
+    mkdir android-sdk-linux && \
+    cd /opt/android-sdk-linux && \
+    wget -q ${ANDROID_SDK_URL} && \
+    unzip ${ANDROID_SDK_FILENAME} && \
+    rm ${ANDROID_SDK_FILENAME} && \
+    echo y | android update sdk --no-ui -a --filter tools,platform-tools,${ANDROID_API_LEVELS},build-tools-${ANDROID_BUILD_TOOLS_VERSION} && \
+    echo y | android update sdk --no-ui --all --filter "extra-android-support" && \
+    echo y | android update sdk --no-ui --all --filter "extra-android-m2repository" && \
+    echo y | android update sdk --no-ui --all --filter "extra-google-m2repository"
+
+# Installs Node.js
+ENV NODE_VERSION 6.9.2
+RUN cd && \
+    wget -q http://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.gz && \
+    tar -xzf node-v${NODE_VERSION}-linux-x64.tar.gz && \
+    mv node-v${NODE_VERSION}-linux-x64 /opt/node && \
+    rm node-v${NODE_VERSION}-linux-x64.tar.gz
+ENV PATH ${PATH}:/opt/node/bin

android-sdk/r25.2.5/Dockerfile

@@ -0,0 +1,37 @@
+FROM nmaas87/webratio-ant
+
+ENV ANDROID_SDK_VERSION r25.2.5
+ENV ANDROID_BUILD_TOOLS_VERSION 25.0.2
+
+# everything after build tools 23.0.1 is 64bit only: http://stackoverflow.com/questions/38096225/automatically-accept-all-sdk-licences 
+RUN apt-get update -y && \
+    apt-get install -y git-core libc6 libncurses5 libstdc++6 lib32z1 unzip && \
+    rm -rf /var/lib/apt/lists/* && \
+    apt-get autoremove -y && \
+    apt-get clean
+
+# Installs Android SDK
+ENV ANDROID_SDK_FILENAME tools_${ANDROID_SDK_VERSION}-linux.zip
+ENV ANDROID_SDK_URL http://dl.google.com/android/repository/${ANDROID_SDK_FILENAME}
+ENV ANDROID_API_LEVELS android-15,android-16,android-17,android-18,android-19,android-20,android-21,android-22,android-23,android-24,android-25
+ENV ANDROID_HOME /opt/android-sdk-linux
+ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
+RUN cd /opt && \
+    mkdir android-sdk-linux && \
+    cd /opt/android-sdk-linux && \
+    wget -q ${ANDROID_SDK_URL} && \
+    unzip ${ANDROID_SDK_FILENAME} && \
+    rm ${ANDROID_SDK_FILENAME} && \
+    echo y | android update sdk --no-ui -a --filter tools,platform-tools,${ANDROID_API_LEVELS},build-tools-${ANDROID_BUILD_TOOLS_VERSION} && \
+    echo y | android update sdk --no-ui --all --filter "extra-android-support" && \
+    echo y | android update sdk --no-ui --all --filter "extra-android-m2repository" && \
+    echo y | android update sdk --no-ui --all --filter "extra-google-m2repository"
+
+# Installs Node.js
+ENV NODE_VERSION 6.9.5
+RUN cd && \
+    wget -q http://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.gz && \
+    tar -xzf node-v${NODE_VERSION}-linux-x64.tar.gz && \
+    mv node-v${NODE_VERSION}-linux-x64 /opt/node && \
+    rm node-v${NODE_VERSION}-linux-x64.tar.gz
+ENV PATH ${PATH}:/opt/node/bin

android-sdk/r26.1.1/Dockerfile

@@ -0,0 +1,47 @@
+FROM nmaas87/webratio-ant
+
+ENV ANDROID_SDK_VERSION r26.1.1
+ENV ANDROID_SDK_BUILD 4333796
+ENV ANDROID_BUILD_TOOLS_VERSION 27.0.3
+
+# everything after build tools 23.0.1 is 64bit only: http://stackoverflow.com/questions/38096225/automatically-accept-all-sdk-licences 
+RUN apt-get update -y && \
+    apt-get install -y git-core libc6 libncurses5 libstdc++6 lib32z1 unzip && \
+    rm -rf /var/lib/apt/lists/* && \
+    apt-get autoremove -y && \
+    apt-get clean
+
+# Installs Android SDK
+ENV ANDROID_SDK_FILENAME sdk-tools-linux-${ANDROID_SDK_BUILD}.zip
+ENV ANDROID_SDK_URL http://dl.google.com/android/repository/${ANDROID_SDK_FILENAME}
+ENV ANDROID_API_LEVELS android-15,android-16,android-17,android-18,android-19,android-20,android-21,android-22,android-23,android-24,android-25,android-26,android-27
+ENV ANDROID_HOME /opt/android-sdk-linux
+ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
+RUN cd /opt && \
+    mkdir android-sdk-linux && \
+    cd /opt/android-sdk-linux && \
+    wget -q ${ANDROID_SDK_URL} && \
+    unzip ${ANDROID_SDK_FILENAME} && \
+    rm ${ANDROID_SDK_FILENAME} && \
+    yes | tools/bin/sdkmanager --licenses && \
+    tools/bin/sdkmanager tools platform-tools "platforms;android-15" "platforms;android-16" "platforms;android-17" "platforms;android-18" "platforms;android-19" "platforms;android-20" "platforms;android-21" "platforms;android-22" "platforms;android-23" "platforms;android-24" "platforms;android-25" "platforms;android-26" "platforms;android-27" "extras;android;m2repository" "extras;google;m2repository" "build-tools;27.0.3"
+
+# Installs Node.js
+ENV NODE_VERSION 9.8.0
+RUN cd && \
+    wget -q http://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.gz && \
+    tar -xzf node-v${NODE_VERSION}-linux-x64.tar.gz && \
+    mv node-v${NODE_VERSION}-linux-x64 /opt/node && \
+    rm node-v${NODE_VERSION}-linux-x64.tar.gz
+ENV PATH ${PATH}:/opt/node/bin
+
+# Install Gradle
+ENV GRADLE_VERSION 4.6
+RUN mkdir /opt/gradle && \
+    cd /opt/gradle && \
+    wget -q http://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip && \
+    unzip gradle-*-bin.zip && \
+    mv gradle-*/* . && \
+    rm gradle-*-bin.zip && \
+    rm -rf gradle-*
+ENV PATH ${PATH}:/opt/gradle/bin

ant/1.9.5/Dockerfile → ant/Dockerfile

@@ -1,11 +1,11 @@
-FROM webratio/java:7
-
-# Installs Ant
-ENV ANT_VERSION 1.9.5
-RUN cd && \
-    wget -q http://www.us.apache.org/dist//ant/binaries/apache-ant-${ANT_VERSION}-bin.tar.gz && \
-    tar -xzf apache-ant-${ANT_VERSION}-bin.tar.gz && \
-    mv apache-ant-${ANT_VERSION} /opt/ant && \
-    rm apache-ant-${ANT_VERSION}-bin.tar.gz
-ENV ANT_HOME /opt/ant
-ENV PATH ${PATH}:/opt/ant/bin
+FROM openjdk:8-jdk
+
+# Installs Ant
+ENV ANT_VERSION 1.10.2
+RUN cd && \
+    wget -q http://www.us.apache.org/dist//ant/binaries/apache-ant-${ANT_VERSION}-bin.tar.gz && \
+    tar -xzf apache-ant-${ANT_VERSION}-bin.tar.gz && \
+    mv apache-ant-${ANT_VERSION} /opt/ant && \
+    rm apache-ant-${ANT_VERSION}-bin.tar.gz
+ENV ANT_HOME /opt/ant
+ENV PATH ${PATH}:/opt/ant/bin

ant/1.9.6/README.md → ant/README.md

@@ -1,13 +1,17 @@
-## Gitblit Dockerfile
-
-This repository contains **Dockerfile** of [Apache Ant](http://ant.apache.org/) for [Docker](https://www.docker.com/)'s [build](https://registry.hub.docker.com/u/webratio/ant/) published to the public [Docker Hub](https://hub.docker.com/).
-
-### Installation
-
-1. Install [Docker](https://www.docker.com/).
-
-2. Pull the image
-  * `docker pull webratio/ant`
-  * `docker pull webratio/ant:1.9.4`
-  * `docker pull webratio/ant:1.9.5`
-  * `docker pull webratio/ant:1.9.6`
+## Dockerfile
+
+This repository contains **Dockerfile** of [Apache Ant](http://ant.apache.org/) for [Docker](https://www.docker.com/)'s [build](https://registry.hub.docker.com/u/webratio/ant/) published to the public [Docker Hub](https://hub.docker.com/).
+
+### Installation
+
+1. Install [Docker](https://www.docker.com/).
+
+2. Pull the image
+  * `docker pull nmaas87/webratio-ant`
+
+### Info
+#### Platform
+Currently using OpenJDK 8 from Docker Hub and Ant 1.10.2
+
+#### Link for Apache Ant files
+http://www.us.apache.org/dist//ant/binaries/