Skip to content

Commit beef182

Browse files
cpe-image-botcpe-image-bot
authored
Publish v2023.12.1. [release] (#126)
1 parent 52e5c85 commit beef182

File tree

8 files changed

+228
-26
lines changed

8 files changed

+228
-26
lines changed

Diff for: ‎2023.12/Dockerfile

+95
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
# vim:set ft=dockerfile:
2+
3+
# Do not edit individual Dockerfiles manually. Instead, please make changes to the Dockerfile.template, which will be used by the build script to generate Dockerfiles.
4+
5+
# By policy, the base image tag should be a quarterly tag unless there's a
6+
# specific reason to use a different one. This means January, April, July, or
7+
# October.
8+
9+
FROM cimg/base:2023.10
10+
11+
LABEL maintainer="CircleCI Execution Team <[email protected]>"
12+
13+
# Java 17 is default
14+
RUN sudo apt-get update && sudo apt-get install -y \
15+
ant \
16+
openjdk-8-jdk \
17+
openjdk-17-jdk \
18+
ruby-full \
19+
&& \
20+
sudo rm -rf /var/lib/apt/lists/* && \
21+
ruby -v && \
22+
sudo gem install bundler && \
23+
bundle version
24+
25+
#fixes issue with bundle install highlighted in https://github.com/CircleCI-Public/cimg-android/issues/82
26+
RUN sudo chmod -R a+w /var/lib/gems/ /usr/local/bin
27+
28+
ENV M2_HOME /usr/local/apache-maven
29+
ENV MAVEN_OPTS -Xmx2048m
30+
ENV PATH $M2_HOME/bin:$PATH
31+
# Set JAVA_HOME (and related) environment variable. This will be set to our
32+
# default Java version of 17 but the user would need to reset it when changing
33+
# JAVA versions.
34+
ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
35+
ENV JDK_HOME=${JAVA_HOME}
36+
ENV JRE_HOME=${JDK_HOME}
37+
ENV MAVEN_VERSION=3.9.5
38+
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 && \
39+
sudo tar -xz -C /usr/local -f /tmp/maven.tar.gz && \
40+
sudo ln -sf /usr/local/apache-maven-${MAVEN_VERSION} /usr/local/apache-maven && \
41+
rm -rf /tmp/maven.tar.gz && \
42+
mkdir -p /home/circleci/.m2
43+
44+
ENV GRADLE_VERSION=8.5
45+
ENV PATH $PATH:/usr/local/gradle-${GRADLE_VERSION}/bin
46+
RUN URL=https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip && \
47+
curl -sSL -o /tmp/gradle.zip $URL && \
48+
sudo unzip -d /usr/local /tmp/gradle.zip && \
49+
rm -rf /tmp/gradle.zip
50+
51+
# Install Android SDK Tools
52+
ENV ANDROID_HOME "/home/circleci/android-sdk"
53+
ENV ANDROID_SDK_ROOT $ANDROID_HOME
54+
ENV CMDLINE_TOOLS_ROOT "${ANDROID_HOME}/cmdline-tools/latest/bin"
55+
ENV ADB_INSTALL_TIMEOUT 120
56+
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}"
57+
# You can find the latest command line tools here: https://developer.android.com/studio#command-line-tools-only
58+
RUN SDK_TOOLS_URL="https://dl.google.com/android/repository/commandlinetools-linux-10406996_latest.zip" && \
59+
mkdir -p ${ANDROID_HOME}/cmdline-tools && \
60+
mkdir ${ANDROID_HOME}/platforms && \
61+
mkdir ${ANDROID_HOME}/ndk && \
62+
wget -O /tmp/cmdline-tools.zip -t 5 "${SDK_TOOLS_URL}" && \
63+
unzip -q /tmp/cmdline-tools.zip -d ${ANDROID_HOME}/cmdline-tools && \
64+
rm /tmp/cmdline-tools.zip && \
65+
mv ${ANDROID_HOME}/cmdline-tools/cmdline-tools ${ANDROID_HOME}/cmdline-tools/latest
66+
67+
RUN echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "tools" && \
68+
echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "platform-tools" && \
69+
echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "build-tools;34.0.0-rc3" && \
70+
echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "build-tools;33.0.2" && \
71+
echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "build-tools;32.1.0-rc1"
72+
73+
RUN echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "platforms;android-28" && \
74+
echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "platforms;android-29" && \
75+
echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "platforms;android-30" && \
76+
echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "platforms;android-31" && \
77+
echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "platforms;android-32" && \
78+
echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "platforms;android-33" && \
79+
echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "platforms;android-34"
80+
81+
# Install some useful packages
82+
RUN echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "extras;android;m2repository" && \
83+
echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "extras;google;m2repository" && \
84+
echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "extras;google;google_play_services" && \
85+
sudo gem install fastlane --version 2.217.0 --no-document && \
86+
curl -sL https://firebase.tools | bash
87+
88+
# Install Google Cloud CLI
89+
# Latest gcloud version can be found here: https://cloud.google.com/sdk/docs/release-notes
90+
ENV GCLOUD_VERSION=453.0.0-0
91+
RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key add - && \
92+
sudo add-apt-repository "deb https://packages.cloud.google.com/apt cloud-sdk main" && \
93+
sudo apt-get update && sudo apt-get install -y google-cloud-sdk=${GCLOUD_VERSION} && \
94+
sudo gcloud config set --installation component_manager/disable_update_check true && \
95+
sudo gcloud config set disable_usage_reporting false

Diff for: ‎2023.12/browsers/Dockerfile

+63
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
# vim:set ft=dockerfile:
2+
3+
FROM cimg/android:2023.12.1-node
4+
5+
LABEL maintainer="CircleCI Community & Partner Engineering Team <[email protected]>"
6+
7+
# Install Selenium
8+
ENV SELENIUM_VER=3.141.59
9+
RUN curl -sSL -o selenium-server-standalone-${SELENIUM_VER}.jar "https://selenium-release.storage.googleapis.com/${SELENIUM_VER%.*}/selenium-server-standalone-${SELENIUM_VER}.jar" && \
10+
sudo cp selenium-server-standalone-${SELENIUM_VER}.jar /usr/local/bin/selenium.jar && \
11+
rm selenium-server-standalone-${SELENIUM_VER}.jar
12+
13+
RUN sudo apt-get update && \
14+
sudo apt-get install --yes --no-install-recommends \
15+
xvfb \
16+
&& \
17+
18+
# Install Java only if it's not already available
19+
# Java is installed for Selenium
20+
if ! command -v java > /dev/null; then \
21+
echo "Java not found in parent image, installing..." && \
22+
sudo apt-get install -y --no-install-recommends --no-upgrade openjdk-11-jre; \
23+
fi && \
24+
sudo rm -rf /var/lib/apt/lists/*
25+
26+
# Below is setup to allow xvfb to start when the container starts up.
27+
# The label in particular allows this image to override what CircleCI does
28+
# when booting the image.
29+
LABEL com.circleci.preserve-entrypoint=true
30+
ENV DISPLAY=":99"
31+
#RUN printf '#!/bin/sh\nXvfb :99 -screen 0 1280x1024x24 &\nexec "$@"\n' > /tmp/entrypoint && \
32+
# chmod +x /tmp/entrypoint && \
33+
# sudo mv /tmp/entrypoint /docker-entrypoint.sh
34+
RUN printf '#!/bin/sh\nXvfb :99 -screen 0 1280x1024x24 &\nexec "$@"\n' | sudo tee /docker-entrypoint.sh && \
35+
sudo chmod +x /docker-entrypoint.sh
36+
37+
# Install a single version of Firefox. This isn't intended to be a regularly
38+
# updated thing. Instead, if this version of Firefox isn't what the end user
39+
# wants they should install a different version via the Browser Tools Orb.
40+
#
41+
# Canonical made a major technology change in how Firefox is installed from
42+
# Ubuntu 21.10 and up. The general CI space doesn't seem to be ready for a snap
43+
# based Firefox right now so we are installing it from the Mozilla PPA.
44+
RUN echo 'Package: *' | sudo tee -a /etc/apt/preferences.d/firefox.pref && \
45+
echo 'Pin: release o=LP-PPA-mozillateam' | sudo tee -a /etc/apt/preferences.d/firefox.pref && \
46+
echo 'Pin-Priority: 1001' | sudo tee -a /etc/apt/preferences.d/firefox.pref && \
47+
sudo add-apt-repository --yes ppa:mozillateam/ppa && \
48+
sudo apt-get install --no-install-recommends --yes firefox && \
49+
sudo rm -rf /var/lib/apt/lists/* && \
50+
firefox --version
51+
52+
# Install a single version of Google Chrome Stable. This isn't intended to be a
53+
# regularly updated thing. Instead, if this version of Chrome isn't what the
54+
# end user wants they should install a different version via the Browser Tools
55+
# Orb.
56+
RUN wget -q -O - "https://dl.google.com/linux/linux_signing_key.pub" | sudo apt-key add - && \
57+
echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" | sudo tee /etc/apt/sources.list.d/google-chrome.list && \
58+
sudo apt-get update && \
59+
sudo apt-get install google-chrome-stable && \
60+
sudo rm -rf /var/lib/apt/lists/*
61+
62+
ENTRYPOINT ["/docker-entrypoint.sh"]
63+
CMD ["/bin/sh"]

Diff for: ‎2023.12/ndk/Dockerfile

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

Diff for: ‎2023.12/node/Dockerfile

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# vim:set ft=dockerfile:
2+
3+
FROM cimg/android:2023.12.1
4+
5+
LABEL maintainer="Community & Partner Engineering Team <[email protected]>"
6+
7+
# Dockerfile will pull the latest LTS release from cimg-node.
8+
RUN curl -sSL "https://raw.githubusercontent.com/CircleCI-Public/cimg-node/main/ALIASES" -o nodeAliases.txt && \
9+
NODE_VERSION=$(grep "lts" ./nodeAliases.txt | cut -d "=" -f 2-) && \
10+
[[ $(uname -m) == "x86_64" ]] && ARCH="x64" || ARCH="arm64" && \
11+
curl -L -o node.tar.xz "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-${ARCH}.tar.xz" && \
12+
sudo tar -xJf node.tar.xz -C /usr/local --strip-components=1 && \
13+
rm node.tar.xz nodeAliases.txt && \
14+
sudo ln -s /usr/local/bin/node /usr/local/bin/nodejs
15+
16+
ENV YARN_VERSION 1.22.19
17+
RUN curl -L -o yarn.tar.gz "https://yarnpkg.com/downloads/${YARN_VERSION}/yarn-v${YARN_VERSION}.tar.gz" && \
18+
sudo tar -xzf yarn.tar.gz -C /opt/ && \
19+
rm yarn.tar.gz && \
20+
sudo ln -s /opt/yarn-v${YARN_VERSION}/bin/yarn /usr/local/bin/yarn && \
21+
sudo ln -s /opt/yarn-v${YARN_VERSION}/bin/yarnpkg /usr/local/bin/yarnpkg

Diff for: ‎Dockerfile.template

+13-13
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ RUN curl -sSL -o /tmp/maven.tar.gz http://apache.osuosl.org/maven/maven-3/${MAVE
4141
rm -rf /tmp/maven.tar.gz && \
4242
mkdir -p /home/circleci/.m2
4343

44-
ENV GRADLE_VERSION=8.4
44+
ENV GRADLE_VERSION=8.5
4545
ENV PATH $PATH:/usr/local/gradle-${GRADLE_VERSION}/bin
4646
RUN URL=https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip && \
4747
curl -sSL -o /tmp/gradle.zip $URL && \
@@ -55,7 +55,7 @@ ENV CMDLINE_TOOLS_ROOT "${ANDROID_HOME}/cmdline-tools/latest/bin"
5555
ENV ADB_INSTALL_TIMEOUT 120
5656
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}"
5757
# You can find the latest command line tools here: https://developer.android.com/studio#command-line-tools-only
58-
RUN SDK_TOOLS_URL="https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip" && \
58+
RUN SDK_TOOLS_URL="https://dl.google.com/android/repository/commandlinetools-linux-10406996_latest.zip" && \
5959
mkdir -p ${ANDROID_HOME}/cmdline-tools && \
6060
mkdir ${ANDROID_HOME}/platforms && \
6161
mkdir ${ANDROID_HOME}/ndk && \
@@ -66,23 +66,23 @@ RUN SDK_TOOLS_URL="https://dl.google.com/android/repository/commandlinetools-lin
6666

6767
RUN echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "tools" && \
6868
echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "platform-tools" && \
69-
echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "build-tools;34.0.0-rc3" && \
70-
echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "build-tools;33.0.2" && \
71-
echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "build-tools;30.0.3"
69+
echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "build-tools;34.0.0-rc3" && \
70+
echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "build-tools;33.0.2" && \
71+
echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "build-tools;32.1.0-rc1"
7272

73-
RUN echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "platforms;android-34" && \
74-
echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "platforms;android-33" && \
75-
echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "platforms;android-32" && \
76-
echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "platforms;android-31" && \
77-
echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "platforms;android-30" && \
78-
echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "platforms;android-29" && \
79-
echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "platforms;android-28"
73+
RUN echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "platforms;android-28" && \
74+
echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "platforms;android-29" && \
75+
echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "platforms;android-30" && \
76+
echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "platforms;android-31" && \
77+
echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "platforms;android-32" && \
78+
echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "platforms;android-33" && \
79+
echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "platforms;android-34"
8080

8181
# Install some useful packages
8282
RUN echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "extras;android;m2repository" && \
8383
echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "extras;google;m2repository" && \
8484
echo y | ${CMDLINE_TOOLS_ROOT}/sdkmanager "extras;google;google_play_services" && \
85-
sudo gem install fastlane --version 2.216.0 --no-document && \
85+
sudo gem install fastlane --version 2.217.0 --no-document && \
8686
curl -sL https://firebase.tools | bash
8787

8888
# Install Google Cloud CLI

Diff for: ‎GEN-CHECK

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
GEN_CHECK=(2023.11.1)
1+
GEN_CHECK=(2023.12.1)

Diff for: ‎build-images.sh

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
#!/usr/bin/env bash
22
# Do not edit by hand; please use build scripts/templates to make changes
3+
set -eo pipefail
34

4-
docker build --file 2023.11/Dockerfile -t cimg/android:2023.11.1 -t cimg/android:2023.11 --platform linux/amd64 .
5-
docker build --file 2023.11/ndk/Dockerfile -t cimg/android:2023.11.1-ndk -t cimg/android:2023.11-ndk --platform linux/amd64 .
6-
docker build --file 2023.11/node/Dockerfile -t cimg/android:2023.11.1-node -t cimg/android:2023.11-node --platform linux/amd64 .
7-
docker build --file 2023.11/browsers/Dockerfile -t cimg/android:2023.11.1-browsers -t cimg/android:2023.11-browsers --platform linux/amd64 .
5+
docker build --file 2023.12/Dockerfile -t cimg/android:2023.12.1 -t cimg/android:2023.12 --platform linux/amd64 .
6+
docker build --file 2023.12/ndk/Dockerfile -t cimg/android:2023.12.1-ndk -t cimg/android:2023.12-ndk --platform linux/amd64 .
7+
docker build --file 2023.12/node/Dockerfile -t cimg/android:2023.12.1-node -t cimg/android:2023.12-node --platform linux/amd64 .
8+
docker build --file 2023.12/browsers/Dockerfile -t cimg/android:2023.12.1-browsers -t cimg/android:2023.12-browsers --platform linux/amd64 .

Diff for: ‎push-images.sh

+9-8
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
#!/usr/bin/env bash
22
# Do not edit by hand; please use build scripts/templates to make changes
3-
docker push cimg/android:2023.11
4-
docker push cimg/android:2023.11.1
5-
docker push cimg/android:2023.11-ndk
6-
docker push cimg/android:2023.11.1-ndk
7-
docker push cimg/android:2023.11-node
8-
docker push cimg/android:2023.11.1-node
9-
docker push cimg/android:2023.11-browsers
10-
docker push cimg/android:2023.11.1-browsers
3+
set -eo pipefail
4+
docker push cimg/android:2023.12
5+
docker push cimg/android:2023.12.1
6+
docker push cimg/android:2023.12-ndk
7+
docker push cimg/android:2023.12.1-ndk
8+
docker push cimg/android:2023.12-node
9+
docker push cimg/android:2023.12.1-node
10+
docker push cimg/android:2023.12-browsers
11+
docker push cimg/android:2023.12.1-browsers

0 commit comments

Comments
 (0)