From 6c21fbf638b123b52d71b0c366b960d02cfa286e Mon Sep 17 00:00:00 2001 From: Alan Nelson <alan.nelson@nebraska.edu> Date: Fri, 17 Mar 2023 11:46:40 -0500 Subject: [PATCH] Update Android build container --- android-build-server/Dockerfile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/android-build-server/Dockerfile b/android-build-server/Dockerfile index ad72627..edd1592 100644 --- a/android-build-server/Dockerfile +++ b/android-build-server/Dockerfile @@ -14,16 +14,17 @@ LABEL org.label-schema.build-date=$BUILD_DATE \ ENV ANDROID_HOME /opt/android-sdk-linux -ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/tools/bin:${ANDROID_HOME}/platform-tools:${ANDROID_HOME}/cmdline-tools/bin +ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/tools/bin:${ANDROID_HOME}/platform-tools:${ANDROID_HOME}/cmdline-tools/latest/bin WORKDIR /opt RUN apk add --no-cache curl bash unzip libstdc++ su-exec -RUN mkdir -p /opt/android-sdk-linux \ +RUN mkdir -p /opt/android-sdk-linux/cmdline-tools \ && curl -q -o commandlinetools.zip -L https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip \ - && unzip -q commandlinetools.zip -d ${ANDROID_HOME} \ - && rm -f commandlinetools.zip \ - && yes | sdkmanager --licenses \ - && sdkmanager "platform-tools" "build-tools:33.0.2" + && unzip -q commandlinetools.zip -d ${ANDROID_HOME}/cmdline-tools \ + && mv ${ANDROID_HOME}/cmdline-tools/cmdline-tools ${ANDROID_HOME}/cmdline-tools/latest \ + && rm -f commandlinetools.zip +RUN sdkmanager "platform-tools" +RUN yes | sdkmanager --licenses COPY entrypoint.sh /usr/local/bin/ RUN chmod +x /usr/local/bin/entrypoint.sh -- GitLab