Skip to content

Commit dd192e8

Browse files
Publish v2021.08.1. [release] (#14)
1 parent 93e2515 commit dd192e8

File tree

3 files changed

+94
-10
lines changed

3 files changed

+94
-10
lines changed

2021.08/Dockerfile

+72
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
# vim:set ft=dockerfile:
2+
3+
FROM cimg/base:2021.07
4+
5+
LABEL maintainer="Community & Partner Engineering Team <[email protected]>"
6+
7+
# Java 11 is default
8+
RUN sudo apt-get update && sudo apt-get install -y \
9+
ant \
10+
openjdk-8-jdk \
11+
openjdk-11-jdk \
12+
&& \
13+
sudo rm -rf /var/lib/apt/lists/*
14+
15+
ENV M2_HOME /usr/local/apache-maven
16+
ENV MAVEN_OPTS -Xmx2048m
17+
ENV PATH $M2_HOME/bin:$PATH
18+
ENV MAVEN_VERSION "3.8.1"
19+
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 && \
20+
sudo tar -xz -C /usr/local -f /tmp/maven.tar.gz && \
21+
sudo ln -sf /usr/local/apache-maven-${MAVEN_VERSION} /usr/local/apache-maven && \
22+
rm -rf /tmp/maven.tar.gz && \
23+
mkdir -p /home/circleci/.m2
24+
25+
ENV PATH $PATH:/usr/local/gradle-${GRADLE_VERSION}/bin
26+
ENV GRADLE_VERSION "7.1.1"
27+
RUN URL=https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip && \
28+
curl -sSL -o /tmp/gradle.zip $URL && \
29+
sudo unzip -d /usr/local /tmp/gradle.zip && \
30+
rm -rf /tmp/gradle.zip
31+
32+
# Install Android SDK Tools
33+
ENV ANDROID_HOME "/home/circleci/android-sdk"
34+
ENV ANDROID_SDK_ROOT $ANDROID_HOME
35+
ENV CMDLINE_TOOLS_ROOT "${ANDROID_HOME}/cmdline-tools/latest/bin"
36+
ENV ADB_INSTALL_TIMEOUT 120
37+
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}"
38+
RUN SDK_TOOLS_URL="https://dl.google.com/android/repository/commandlinetools-linux-7302050_latest.zip" && \
39+
mkdir -p ${ANDROID_HOME}/cmdline-tools && \
40+
mkdir ${ANDROID_HOME}/platforms && \
41+
mkdir ${ANDROID_HOME}/ndk && \
42+
wget -O /tmp/cmdline-tools.zip -t 5 "${SDK_TOOLS_URL}" && \
43+
unzip -q /tmp/cmdline-tools.zip -d ${ANDROID_HOME}/cmdline-tools && \
44+
rm /tmp/cmdline-tools.zip && \
45+
mv ${ANDROID_HOME}/cmdline-tools/cmdline-tools ${ANDROID_HOME}/cmdline-tools/latest
46+
47+
RUN echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "tools" && \
48+
echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "platform-tools" && \
49+
echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "build-tools;30.0.3"
50+
51+
RUN echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "platforms;android-31" && \
52+
echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "platforms;android-30" && \
53+
echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "platforms;android-29" && \
54+
echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "platforms;android-28" && \
55+
echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "platforms;android-27" && \
56+
echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "platforms;android-26" && \
57+
echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "platforms;android-25" && \
58+
echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "platforms;android-24" && \
59+
echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "platforms;android-23"
60+
61+
# Install some useful packages
62+
RUN echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "extras;android;m2repository" && \
63+
echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "extras;google;m2repository" && \
64+
echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "extras;google;google_play_services"
65+
66+
# Install Google Cloud CLI
67+
RUN VERSION=350.0.0-0 && \
68+
curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key add - && \
69+
sudo add-apt-repository "deb https://packages.cloud.google.com/apt cloud-sdk main" && \
70+
sudo apt-get update && sudo apt-get install -y google-cloud-sdk=${VERSION} && \
71+
sudo gcloud config set --installation component_manager/disable_update_check true && \
72+
sudo gcloud config set disable_usage_reporting false

2021.08/ndk/Dockerfile

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# vim:set ft=dockerfile:
2+
3+
FROM cimg/android:2021.08.1
4+
5+
LABEL maintainer="Community & Partner Engineering Team <[email protected]>"
6+
7+
RUN echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "cmake;3.6.4111459" && \
8+
echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "cmake;3.10.2.4988404"
9+
10+
# Setup LTS release
11+
ENV NDK_LTS_VERSION "21.4.7075529"
12+
ENV ANDROID_NDK_HOME "/home/circleci/android-sdk/ndk/${NDK_LTS_VERSION}"
13+
RUN echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "ndk;${NDK_LTS_VERSION}"
14+
15+
ENV ANDROID_NDK_ROOT "${ANDROID_NDK_HOME}"
16+
ENV PATH "${ANDROID_NDK_HOME}:${PATH}"
17+
18+
# Setup Stable release
19+
ENV NDK_STABLE_VERSION "21.4.7075529"
20+
RUN echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "ndk;${NDK_STABLE_VERSION}"

build-images.sh

+2-10
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,4 @@
11
#!/usr/bin/env bash
22

3-
docker build --file 27.0/Dockerfile -t cimg/android:27.0 .
4-
docker build --file 27.0/ndk/Dockerfile -t cimg/android:27.0-ndk .
5-
docker build --file 28.0/Dockerfile -t cimg/android:28.0 .
6-
docker build --file 28.0/ndk/Dockerfile -t cimg/android:28.0-ndk .
7-
docker build --file 29.0/Dockerfile -t cimg/android:29.0 .
8-
docker build --file 29.0/ndk/Dockerfile -t cimg/android:29.0-ndk .
9-
docker build --file 30.0/Dockerfile -t cimg/android:30.0 .
10-
docker build --file 30.0/ndk/Dockerfile -t cimg/android:30.0-ndk .
11-
docker build --file 31.0/Dockerfile -t cimg/android:31.0 .
12-
docker build --file 31.0/ndk/Dockerfile -t cimg/android:31.0-ndk .
3+
docker build --file 2021.08/Dockerfile -t cimg/android:2021.08.1 -t cimg/android:2021.08 .
4+
docker build --file 2021.08/ndk/Dockerfile -t cimg/android:2021.08.1-ndk -t cimg/android:2021.08-ndk .

0 commit comments

Comments
 (0)