Update bump script
parent
6aa5c58310
commit
b30acbcc10
|
@ -27,10 +27,10 @@ RUN apt-get -qq update \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
# Install Android SDK
|
# Install Android SDK
|
||||||
RUN wget https://dl.google.com/android/repository/sdk-tools-linux-$ANDROID_SDK_VERSION.zip -q \
|
RUN wget https://dl.google.com/android/repository/commandlinetools-linux-${ANDROID_SDK_VERSION}_latest.zip -q \
|
||||||
&& mkdir /usr/local/android \
|
&& mkdir /usr/local/android \
|
||||||
&& unzip -q sdk-tools-linux-$ANDROID_SDK_VERSION.zip -d /usr/local/android \
|
&& unzip -q commandlinetools-linux-${ANDROID_SDK_VERSION}_latest.zip -d /usr/local/android \
|
||||||
&& rm sdk-tools-linux-$ANDROID_SDK_VERSION.zip
|
&& rm commandlinetools-linux-${ANDROID_SDK_VERSION}_latest.zip
|
||||||
|
|
||||||
# Export JAVA_HOME variable
|
# Export JAVA_HOME variable
|
||||||
ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
|
ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
echo "+ Scraping SDK website for version number"
|
echo "+ Scraping SDK website for version number"
|
||||||
|
|
||||||
ANDROID_SDK_VERSION=$(curl --silent https://developer.android.com/studio/ | grep -m 1 -o 'sdk-tools-linux-\d*' | cut -f 4 -d -)
|
ANDROID_SDK_VERSION=$(curl --silent https://developer.android.com/studio/ | grep -m 1 -oE 'commandlinetools-linux-[0-9]+' | cut -d - -f 3)
|
||||||
if [ -z "$ANDROID_SDK_VERSION" ]; then
|
if [ -z "$ANDROID_SDK_VERSION" ]; then
|
||||||
echo "Version not found"
|
echo "Version not found"
|
||||||
exit 1
|
exit 1
|
||||||
|
@ -11,7 +11,7 @@ echo "+ Found version $ANDROID_SDK_VERSION"
|
||||||
|
|
||||||
echo "+ Scraping Android repository-12.xml for build tools"
|
echo "+ Scraping Android repository-12.xml for build tools"
|
||||||
|
|
||||||
BUILD_TOOLS_VERSION=$(curl --silent https://dl.google.com/android/repository/repository-12.xml | grep -o "build-tools_r\d*\.\d*\.\d*" | cut -f 2 -d r | sort -r | head -n 1)
|
BUILD_TOOLS_VERSION=$(curl --silent https://dl.google.com/android/repository/repository-12.xml | grep -oE "build-tools_r[0-9]+\.[0-9]+\.[0-9]+" | cut -f 2 -d r | sort -r | head -n 1)
|
||||||
if [ -z "$BUILD_TOOLS_VERSION" ]; then
|
if [ -z "$BUILD_TOOLS_VERSION" ]; then
|
||||||
echo "Version not found"
|
echo "Version not found"
|
||||||
exit 1
|
exit 1
|
||||||
|
|
Loading…
Reference in New Issue