Skip to content

Commit 2e7c001

Browse files
author
Simon Chopin
committed
Remove a massive amount of things we don't need
1 parent e3c8c4f commit 2e7c001

File tree

6 files changed

+5
-404
lines changed

6 files changed

+5
-404
lines changed

Dockerfile

Lines changed: 5 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/bitriseio/bitrise-base:alpha
1+
FROM debian:stretch
22

33
ENV ANDROID_HOME /opt/android-sdk-linux
44

@@ -14,7 +14,7 @@ RUN apt-get update -qq
1414
# Dependencies to execute Android builds
1515
RUN dpkg --add-architecture i386
1616
RUN apt-get update -qq
17-
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y openjdk-8-jdk libc6:i386 libstdc++6:i386 libgcc1:i386 libncurses5:i386 libz1:i386
17+
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y wget unzip openjdk-8-jdk libc6:i386 libstdc++6:i386 libgcc1:i386 libncurses5:i386 libz1:i386
1818

1919

2020
# ------------------------------------------------------
@@ -41,7 +41,7 @@ ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/tools/bin:${ANDROID_HOME}
4141
RUN yes | sdkmanager --licenses
4242

4343
# Platform tools
44-
RUN sdkmanager "emulator" "tools" "platform-tools"
44+
RUN sdkmanager "tools" "platform-tools"
4545

4646
# SDKs
4747
# Please keep these in descending order!
@@ -53,13 +53,6 @@ RUN yes | sdkmanager \
5353
"platforms;android-27" \
5454
"platforms;android-26" \
5555
"platforms;android-25" \
56-
"platforms;android-24" \
57-
"platforms;android-23" \
58-
"platforms;android-22" \
59-
"platforms;android-21" \
60-
"platforms;android-19" \
61-
"platforms;android-17" \
62-
"platforms;android-15" \
6356
"build-tools;28.0.1" \
6457
"build-tools;28.0.0" \
6558
"build-tools;27.0.3" \
@@ -69,26 +62,11 @@ RUN yes | sdkmanager \
6962
"build-tools;26.0.2" \
7063
"build-tools;26.0.1" \
7164
"build-tools;25.0.3" \
72-
"build-tools;24.0.3" \
73-
"build-tools;23.0.3" \
74-
"build-tools;22.0.1" \
75-
"build-tools;21.1.2" \
76-
"build-tools;19.1.0" \
77-
"build-tools;17.0.0" \
78-
"system-images;android-28;google_apis;x86" \
79-
"system-images;android-26;google_apis;x86" \
80-
"system-images;android-25;google_apis;armeabi-v7a" \
81-
"system-images;android-24;default;armeabi-v7a" \
82-
"system-images;android-22;default;armeabi-v7a" \
83-
"system-images;android-19;default;armeabi-v7a" \
8465
"extras;android;m2repository" \
8566
"extras;google;m2repository" \
8667
"extras;google;google_play_services" \
8768
"extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2" \
88-
"extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1" \
89-
"add-ons;addon-google_apis-google-23" \
90-
"add-ons;addon-google_apis-google-22" \
91-
"add-ons;addon-google_apis-google-21"
69+
"extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1"
9270

9371
# ------------------------------------------------------
9472
# --- Install Gradle from PPA
@@ -98,65 +76,7 @@ RUN apt-get update \
9876
&& apt-get -y install gradle \
9977
&& gradle -v
10078

101-
# ------------------------------------------------------
102-
# --- Install Maven 3 from PPA
103-
104-
RUN apt-get purge maven maven2 \
105-
&& apt-get update \
106-
&& apt-get -y install maven \
107-
&& mvn --version
108-
109-
110-
# ------------------------------------------------------
111-
# --- Pre-install Ionic and Cordova CLIs
112-
113-
RUN npm install -g ionic cordova
114-
115-
116-
# ------------------------------------------------------
117-
# --- Install Fastlane
118-
119-
RUN gem install fastlane --no-document \
120-
&& fastlane --version
121-
122-
# ------------------------------------------------------
123-
# --- Install Google Cloud SDK
124-
# https://cloud.google.com/sdk/downloads
125-
# Section: apt-get (Debian and Ubuntu only)
126-
#
127-
# E.g. for "Using Firebase Test Lab for Android from the gcloud Command Line":
128-
# https://firebase.google.com/docs/test-lab/command-line
129-
#
130-
131-
RUN echo "deb https://packages.cloud.google.com/apt cloud-sdk-`lsb_release -c -s` main" | sudo tee -a /etc/apt/sources.list.d/google-cloud-sdk.list
132-
RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key add -
133-
RUN sudo apt-get update -qq \
134-
&& sudo apt-get install -y -qq google-cloud-sdk
135-
136-
ENV GCLOUD_SDK_CONFIG /usr/lib/google-cloud-sdk/lib/googlecloudsdk/core/config.json
137-
138-
# gcloud config doesn't update config.json. See the official Dockerfile for details:
139-
# https://github.com/GoogleCloudPlatform/cloud-sdk-docker/blob/master/Dockerfile
140-
RUN /usr/bin/gcloud config set --installation component_manager/disable_update_check true \
141-
&& sed -i -- 's/\"disable_updater\": false/\"disable_updater\": true/g' $GCLOUD_SDK_CONFIG \
142-
&& /usr/bin/gcloud config set --installation core/disable_usage_reporting true \
143-
&& sed -i -- 's/\"disable_usage_reporting\": false/\"disable_usage_reporting\": true/g' $GCLOUD_SDK_CONFIG
144-
145-
146-
# ------------------------------------------------------
147-
# --- Install additional packages
148-
149-
# Required for Android ARM Emulator
150-
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y libqt5widgets5
151-
ENV QT_QPA_PLATFORM offscreen
152-
ENV LD_LIBRARY_PATH ${ANDROID_HOME}/tools/lib64:${ANDROID_HOME}/emulator/lib64:${ANDROID_HOME}/emulator/lib64/qt/lib
153-
154-
155-
# ------------------------------------------------------
156-
# --- Cleanup and rev num
157-
15879
# Cleaning
15980
RUN apt-get clean
16081

161-
ENV BITRISE_DOCKER_REV_NUMBER_ANDROID v2018_07_15_1
162-
CMD bitrise -version
82+
CMD bash

Dockerfile-pinned

Lines changed: 0 additions & 8 deletions
This file was deleted.

_tmp/.gitkeep

Whitespace-only changes.

bitrise.yml

Lines changed: 0 additions & 194 deletions
This file was deleted.

docker-compose.yml

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)