Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4bbaa74c authored by Romain Hunault's avatar Romain Hunault 💻
Browse files

Fix the path

parent 42046909

Dockerfile

+5 −5
Original line number Diff line number Diff line
@@ -4,11 +4,11 @@ ENV VERSION_SDK_TOOLS "4333796" 
ENV VERSION_GRADLE "gradle-6.6"



ENV ANDROID_SDK_ROOT "/sdk"

ENV ANDROID_CMDLINE_TOOLS_BIN "${ANDROID_SDK_ROOT}/cmdline-tools/tools/bin"

ENV GRADLE_HOME "/gradle"

ENV GRADLE_PATH "${GRADLE_HOME}/${VERSION_GRADLE}/bin"

ENV PATH "$PATH:${ANDROID_SDK_ROOT}/tools:${ANDROID_SDK_ROOT}/ndk-bundle:${GRADLE_PATH}"

ENV DEBIAN_FRONTEND noninteractive

ENV ANDROID_CMDLINE_TOOLS_BIN "${ANDROID_SDK_ROOT}/cmdline-tools/tools/bin"



COPY sha256sum.txt .
@@ -53,17 +53,17 @@ RUN curl -s https://dl.google.com/android/repository/sdk-tools-linux-${VERSION_S 
RUN mkdir -p $ANDROID_SDK_ROOT/licenses/ \

   && echo "8933bad161af4178b1185d1a37fbf41ea5269c55\nd56f5187479451eabf01fb78af6dfcb131a6481e\n24333f8a63b6825ea9c5514f83c2829b004d1fee" > $ANDROID_SDK_ROOT/licenses/android-sdk-license \

   && echo "84831b9409646a918e30573bab4c9c91346d8abd\n504667f4c0de7af1a06de9f4b1727b84351f2910" > $ANDROID_SDK_ROOT/licenses/android-sdk-preview-license \

   && yes | ${ANDROID_SDK_ROOT}/cmdline-tools/tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_ROOT} --licenses >/dev/null

   && yes | ${ANDROID_CMDLINE_TOOLS_BIN}/sdkmanager --sdk_root=${ANDROID_SDK_ROOT} --licenses >/dev/null



ADD packages.txt /sdk

RUN mkdir -p /root/.android && \

  touch /root/.android/repositories.cfg && \

  ${ANDROID_CMDLINE_TOOLS_BIN}/sdkmanager --update

  ${ANDROID_CMDLINE_TOOLS_BIN}/sdkmanager --sdk_root=${ANDROID_SDK_ROOT} --update



RUN ${ANDROID_CMDLINE_TOOLS_BIN}/sdkmanager --update

RUN ${ANDROID_CMDLINE_TOOLS_BIN}/sdkmanager --sdk_root=${ANDROID_SDK_ROOT} --update



RUN while read -r package; do PACKAGES="${PACKAGES}${package} "; done < /sdk/packages.txt && \

    ${ANDROID_CMDLINE_TOOLS_BIN}/sdkmanager ${PACKAGES}

    ${ANDROID_CMDLINE_TOOLS_BIN}/sdkmanager --sdk_root=${ANDROID_SDK_ROOT} ${PACKAGES}



RUN yes | ${ANDROID_CMDLINE_TOOLS_BIN}/sdkmanager --licenses