EpicMorg/docker-scripts
2
1
Fork 0
mirror of https://github.com/EpicMorg/docker-scripts.git synced 2025-01-13 15:17:56 +03:00
Code Issues Projects Releases Wiki Activity

moar android improvements

Browse Source
This commit is contained in:
STAM 2023-07-04 22:42:15 +03:00
parent 200052a67c
commit c27520116b
Signed by: stam
GPG Key ID: 4F57E51F9C45F8CD
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
linux/ecosystem/gitlab/runner/android-sdk/jdk11/Dockerfile
View File

@ -19,7 +19,7 @@ ENV KTC_ROOT=/opt/kotlin
ENV KTC_PATH=${KTC_ROOT}/kotlinc ENV KTC_PATH=${KTC_ROOT}/kotlinc
ENV KTC_BIN=$KTC_PATH/bin ENV KTC_BIN=$KTC_PATH/bin
ENV PATH=$PATH:${GRADLE_BIN}:${KTC_BIN} ENV PATH=$PATH:${GRADLE_BIN}:${KTC_BIN}:${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin:${ANDROID_SDK_ROOT}/platform-tools:$ANDROID_SDK_ROOT/tools/bin
################################################################## ##################################################################
# installing java11 # installing java11
@ -566,6 +566,7 @@ RUN sdkmanager --install \
#RUN echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" > /usr/lib/android-sdk/licenses/android-sdk-license #RUN echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" > /usr/lib/android-sdk/licenses/android-sdk-license
RUN rm -rfv /usr/lib/android-sdk/licenses/* RUN rm -rfv /usr/lib/android-sdk/licenses/*
RUN yes | sdkmanager --licenses RUN yes | sdkmanager --licenses
RUN ln -fs $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/screenshot2 $ANDROID_SDK_ROOT/tools/bin/screenshot2
################################################################## ##################################################################
# GRADLE # GRADLE

3
linux/ecosystem/gitlab/runner/android-sdk/jdk17/Dockerfile
View File

@ -19,7 +19,7 @@ ENV KTC_ROOT=/opt/kotlin
ENV KTC_PATH=${KTC_ROOT}/kotlinc ENV KTC_PATH=${KTC_ROOT}/kotlinc
ENV KTC_BIN=$KTC_PATH/bin ENV KTC_BIN=$KTC_PATH/bin
ENV PATH=$PATH:${GRADLE_BIN}:${KTC_BIN} ENV PATH=$PATH:${GRADLE_BIN}:${KTC_BIN}:${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin:${ANDROID_SDK_ROOT}/platform-tools:$ANDROID_SDK_ROOT/tools/bin
################################################################## ##################################################################
# installing java17 # installing java17
@ -566,6 +566,7 @@ RUN sdkmanager --install \
#RUN echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" > /usr/lib/android-sdk/licenses/android-sdk-license #RUN echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" > /usr/lib/android-sdk/licenses/android-sdk-license
RUN rm -rfv /usr/lib/android-sdk/licenses/* RUN rm -rfv /usr/lib/android-sdk/licenses/*
RUN yes | sdkmanager --licenses RUN yes | sdkmanager --licenses
RUN ln -fs $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/screenshot2 $ANDROID_SDK_ROOT/tools/bin/screenshot2
################################################################## ##################################################################
# GRADLE # GRADLE

3
linux/ecosystem/teamcity/agent/android-sdk/jdk11/Dockerfile
View File

@ -19,7 +19,7 @@ ENV KTC_ROOT=/opt/kotlin
ENV KTC_PATH=${KTC_ROOT}/kotlinc ENV KTC_PATH=${KTC_ROOT}/kotlinc
ENV KTC_BIN=$KTC_PATH/bin ENV KTC_BIN=$KTC_PATH/bin
ENV PATH=$PATH:${GRADLE_BIN}:${KTC_BIN} ENV PATH=$PATH:${GRADLE_BIN}:${KTC_BIN}:${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin:${ANDROID_SDK_ROOT}/platform-tools:$ANDROID_SDK_ROOT/tools/bin
################################################################## ##################################################################
# Android SDK # Android SDK
@ -553,6 +553,7 @@ RUN sdkmanager --install \
#RUN echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" > /usr/lib/android-sdk/licenses/android-sdk-license #RUN echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" > /usr/lib/android-sdk/licenses/android-sdk-license
RUN rm -rfv /usr/lib/android-sdk/licenses/* RUN rm -rfv /usr/lib/android-sdk/licenses/*
RUN yes | sdkmanager --licenses RUN yes | sdkmanager --licenses
RUN ln -fs $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/screenshot2 $ANDROID_SDK_ROOT/tools/bin/screenshot2
################################################################## ##################################################################
# GRADLE # GRADLE

3
linux/ecosystem/teamcity/agent/android-sdk/jdk17/Dockerfile
View File

@ -19,7 +19,7 @@ ENV KTC_ROOT=/opt/kotlin
ENV KTC_PATH=${KTC_ROOT}/kotlinc ENV KTC_PATH=${KTC_ROOT}/kotlinc
ENV KTC_BIN=$KTC_PATH/bin ENV KTC_BIN=$KTC_PATH/bin
ENV PATH=$PATH:${GRADLE_BIN}:${KTC_BIN} ENV PATH=$PATH:${GRADLE_BIN}:${KTC_BIN}:${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin:${ANDROID_SDK_ROOT}/platform-tools:$ANDROID_SDK_ROOT/tools/bin
################################################################## ##################################################################
# Android SDK # Android SDK
@ -553,6 +553,7 @@ RUN sdkmanager --install \
#RUN echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" > /usr/lib/android-sdk/licenses/android-sdk-license #RUN echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" > /usr/lib/android-sdk/licenses/android-sdk-license
RUN rm -rfv /usr/lib/android-sdk/licenses/* RUN rm -rfv /usr/lib/android-sdk/licenses/*
RUN yes | sdkmanager --licenses RUN yes | sdkmanager --licenses
RUN ln -fs $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/screenshot2 $ANDROID_SDK_ROOT/tools/bin/screenshot2
################################################################## ##################################################################
# GRADLE # GRADLE