Skip to content

Commit 47d0a3f

Browse files
authored
fix: update sdkmanager path (#38)
* fix: update sdkmanager path * chore: update README
1 parent 33cc54f commit 47d0a3f

2 files changed

Lines changed: 19 additions & 13 deletions

File tree

Dockerfile

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ENV ANDROID_SDK_URL="https://dl.google.com/android/repository/commandlinetools-l
99
ANDROID_SDK_ROOT="/opt/android" \
1010
ANDROID_HOME="/opt/android/sdk"
1111

12-
ENV PATH $PATH:$ANDROID_SDK_ROOT/cmdline-tools/bin:$ANDROID_SDK_ROOT/platform-tools:$ANDROID_SDK_ROOT/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$ANT_HOME/bin:$MAVEN_HOME/bin:$GRADLE_HOME/bin
12+
ENV PATH $PATH:$ANDROID_SDK_ROOT/cmdline-tools/latest/bin:$ANDROID_SDK_ROOT/platform-tools:$ANDROID_SDK_ROOT/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$ANT_HOME/bin:$MAVEN_HOME/bin:$GRADLE_HOME/bin
1313

1414
WORKDIR /opt
1515

@@ -19,14 +19,17 @@ RUN apt-get -qq update && \
1919
# Installs Android SDK
2020
RUN mkdir android && cd android && \
2121
wget -O tools.zip ${ANDROID_SDK_URL} && \
22-
unzip tools.zip && rm tools.zip
22+
unzip tools.zip && rm tools.zip && \
23+
cd cmdline-tools && \
24+
mkdir latest && \
25+
ls | grep -v latest | xargs mv -t latest
2326

2427
RUN mkdir /root/.android && touch /root/.android/repositories.cfg && \
25-
while true; do echo 'y'; sleep 2; done | sdkmanager --sdk_root=${ANDROID_SDK_ROOT} "platform-tools" "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" && \
26-
while true; do echo 'y'; sleep 2; done | sdkmanager --sdk_root=${ANDROID_SDK_ROOT} "platforms;android-28" "platforms;android-29" "platforms;android-30" && \
27-
while true; do echo 'y'; sleep 2; done | sdkmanager --sdk_root=${ANDROID_SDK_ROOT} "platforms;android-31" "platforms;android-32" "platforms;android-33" && \
28-
while true; do echo 'y'; sleep 2; done | sdkmanager --sdk_root=${ANDROID_SDK_ROOT} "extras;android;m2repository" "extras;google;google_play_services" "extras;google;instantapps" "extras;google;m2repository" && \
29-
while true; do echo 'y'; sleep 2; done | sdkmanager --sdk_root=${ANDROID_SDK_ROOT} "add-ons;addon-google_apis-google-22" "add-ons;addon-google_apis-google-23" "add-ons;addon-google_apis-google-24" "skiaparser;1" "skiaparser;2" "skiaparser;3"
28+
while true; do echo 'y'; sleep 2; done | sdkmanager "platform-tools" "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" && \
29+
while true; do echo 'y'; sleep 2; done | sdkmanager "platforms;android-28" "platforms;android-29" "platforms;android-30" && \
30+
while true; do echo 'y'; sleep 2; done | sdkmanager "platforms;android-31" "platforms;android-32" "platforms;android-33" && \
31+
while true; do echo 'y'; sleep 2; done | sdkmanager "extras;android;m2repository" "extras;google;google_play_services" "extras;google;instantapps" "extras;google;m2repository" && \
32+
while true; do echo 'y'; sleep 2; done | sdkmanager "add-ons;addon-google_apis-google-22" "add-ons;addon-google_apis-google-23" "add-ons;addon-google_apis-google-24" "skiaparser;1" "skiaparser;2" "skiaparser;3"
3033

3134
RUN chmod a+x -R $ANDROID_SDK_ROOT && \
3235
chown -R root:root $ANDROID_SDK_ROOT && \

README.md

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
![CalVer](https://img.shields.io/badge/CalVer-YYYY.MM.MICRO-22bfda.svg?style=for-the-badge)
99
[![Beevelop](https://img.shields.io/badge/-%20Made%20with%20%F0%9F%8D%AF%20by%20%F0%9F%90%9Dvelop-blue.svg?style=for-the-badge)](https://beevelop.com)
1010

11-
# Android 12 (API levels 31,32)
11+
# Android 13 (API levels 28 - 33)
1212

1313
## based on [beevelop/java](https://github.com/beevelop/docker-java)
1414

15-
- Java 11.0.17
16-
- Gradle 4.4.1 (Groovy: 2.4.17)
17-
- Apache Maven 3.6.3
18-
- Ant 1.10.7
15+
- Java `11.0.17`
16+
- Gradle `4.4.1` (Groovy: `2.4.17`)
17+
- Apache Maven `3.6.3`
18+
- Ant `1.10.7`
1919

2020
## Pull, build or run this image
2121

@@ -37,9 +37,12 @@ FROM beevelop/android:v2023.01.1
3737

3838
# accepts all the Licenses (please read first)
3939
RUN yes | sdkmanager --licenses --sdk_root=$ANDROID_SDK_ROOT
40-
4140
```
4241

42+
## Licenses
43+
44+
The usage of the Android SDK requires you to accept the licenses
45+
4346
## Maintenance
4447

4548
- [Command Line Tools Download](https://developer.android.com/studio#span-idcommand-toolsa-namecmdline-toolsacommand-line-tools-onlyspan)

0 commit comments

Comments
 (0)