Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
ci-image-android
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
briar
ci-image-android
Commits
c1f96a83
Verified
Commit
c1f96a83
authored
5 years ago
by
Torsten Grote
Browse files
Options
Downloads
Patches
Plain Diff
Upgrade to API 29
parent
be2a96c5
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!3
Upgrade to API 29
Pipeline
#3804
passed
5 years ago
Stage: build
Stage: test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Dockerfile
+3
-1
3 additions, 1 deletion
Dockerfile
install.sh
+7
-4
7 additions, 4 deletions
install.sh
with
10 additions
and
5 deletions
Dockerfile
+
3
−
1
View file @
c1f96a83
FROM
debian:stretch
FROM
debian:stretch-slim
# buster brings opendjk-11 which sdkmanager is currently not compatible with
# see https://stackoverflow.com/q/46402772
ENV
LANG=C.UTF-8
ENV
LANG=C.UTF-8
ENV
DEBIAN_FRONTEND=noninteractive
ENV
DEBIAN_FRONTEND=noninteractive
...
...
This diff is collapsed.
Click to expand it.
install.sh
+
7
−
4
View file @
c1f96a83
...
@@ -15,6 +15,9 @@ echo "path-exclude=/usr/share/doc/*" >> /etc/dpkg/dpkg.cfg.d/01_nodoc
...
@@ -15,6 +15,9 @@ echo "path-exclude=/usr/share/doc/*" >> /etc/dpkg/dpkg.cfg.d/01_nodoc
apt-get update
apt-get update
apt-get
-y
upgrade
apt-get
-y
upgrade
# install of default-jdk-headless fails otherwise on *-slim image
mkdir
-p
/usr/share/man/man1
# install Debian packages
# install Debian packages
apt-get
install
-y
--no-install-recommends
\
apt-get
install
-y
--no-install-recommends
\
git
\
git
\
...
@@ -32,8 +35,8 @@ rm -rf /var/lib/apt/lists/*
...
@@ -32,8 +35,8 @@ rm -rf /var/lib/apt/lists/*
# Android Part #
# Android Part #
################
################
# Install Android SDK Manager
(tools 26.1.1)
# Install Android SDK Manager
wget
--no-verbose
-O
tools.zip https://dl.google.com/android/repository/sdk-tools-linux-
3859397
.zip
wget
--no-verbose
-O
tools.zip https://dl.google.com/android/repository/sdk-tools-linux-
4333796
.zip
unzip tools.zip
unzip tools.zip
rm
tools.zip
rm
tools.zip
mkdir
${
ANDROID_HOME
}
mkdir
${
ANDROID_HOME
}
...
@@ -49,5 +52,5 @@ printf "\n79120722343a6f314e0719f863036c702b0e6b2a\n84831b9409646a918e30573bab4c
...
@@ -49,5 +52,5 @@ printf "\n79120722343a6f314e0719f863036c702b0e6b2a\n84831b9409646a918e30573bab4c
mkdir
/root/.android
mkdir
/root/.android
touch
/root/.android/repositories.cfg
touch
/root/.android/repositories.cfg
echo
y |
$ANDROID_HOME
/tools/bin/sdkmanager
"platform-tools"
echo
y |
$ANDROID_HOME
/tools/bin/sdkmanager
"platform-tools"
echo
y |
$ANDROID_HOME
/tools/bin/sdkmanager
"build-tools;2
8
.0.
3
"
echo
y |
$ANDROID_HOME
/tools/bin/sdkmanager
"build-tools;2
9
.0.
2
"
echo
y |
$ANDROID_HOME
/tools/bin/sdkmanager
"platforms;android-2
8
"
echo
y |
$ANDROID_HOME
/tools/bin/sdkmanager
"platforms;android-2
9
"
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment