Updated docker file

This commit is contained in:
Sylvain Berfini 2021-01-28 10:35:02 +01:00
parent a284a55d8e
commit a29314bc5e
2 changed files with 3 additions and 4 deletions

View file

@ -48,8 +48,7 @@ task getGitVersion() {
} }
configurations { configurations {
customImplementation customImplementation.extendsFrom implementation
implementation.extendsFrom(customImplementation)
} }
task linphoneSdkSource() { task linphoneSdkSource() {

View file

@ -30,7 +30,7 @@ RUN wget https://dl.google.com/android/repository/tools_r$ANDROID_SDK-linux.zip
ENV PATH $ANDROID_HOME/tools:$ANDROID_HOME/tools/bin:$ANDROID_HOME/platform-tools:ANDROID_NDK_HOME:$PATH ENV PATH $ANDROID_HOME/tools:$ANDROID_HOME/tools/bin:$ANDROID_HOME/platform-tools:ANDROID_NDK_HOME:$PATH
# Get the Android SDK # Get the Android SDK
RUN echo "y" | sdkmanager "platforms;android-30" "build-tools;30.0.2" "extras;android;m2repository" "extras;google;m2repository" "platform-tools" "tools" "ndk;21.3.6528147" RUN echo "y" | sdkmanager "platforms;android-30" "build-tools;30.0.3" "extras;android;m2repository" "extras;google;m2repository" "platform-tools" "tools" "ndk;21.3.6528147"
# Accept Android SDK licenses # Accept Android SDK licenses
RUN yes | sdkmanager --licenses RUN yes | sdkmanager --licenses
@ -38,7 +38,7 @@ RUN yes | sdkmanager --licenses
# Update if needed # Update if needed
RUN echo y | android update sdk --no-ui --all --filter platform-tools RUN echo y | android update sdk --no-ui --all --filter platform-tools
RUN echo y | android update sdk --no-ui --all --filter android-30 RUN echo y | android update sdk --no-ui --all --filter android-30
RUN echo y | android update sdk --no-ui --all --filter build-tools-30.0.2 RUN echo y | android update sdk --no-ui --all --filter build-tools-30.0.3
# Configure user bc # Configure user bc
RUN useradd -ms /bin/bash bc && \ RUN useradd -ms /bin/bash bc && \