diff options
| author | Andreas Fankhauser hiddenalpha.ch | 2022-09-11 02:47:30 +0200 |
|---|---|---|
| committer | Andreas Fankhauser hiddenalpha.ch | 2022-09-11 02:47:30 +0200 |
| commit | c4915b3e04a4acb424eafd3d815ee8bd848badd8 (patch) | |
| tree | af0db9d807603e0cf84e859a15c37bc7174d427d /src | |
| parent | d6b507118d12d020ae66ded96e311f2c0f4c1fb6 (diff) | |
| download | dotfiles-c4915b3e04a4acb424eafd3d815ee8bd848badd8.zip dotfiles-c4915b3e04a4acb424eafd3d815ee8bd848badd8.tar.gz | |
Fix more broken android tools in Dockerimage
Diffstat (limited to 'src')
| -rw-r--r-- | src/dockerfiles/android-dev.Dockerfile | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/dockerfiles/android-dev.Dockerfile b/src/dockerfiles/android-dev.Dockerfile index 708d642..4cab831 100644 --- a/src/dockerfiles/android-dev.Dockerfile +++ b/src/dockerfiles/android-dev.Dockerfile @@ -12,13 +12,12 @@ ARG PARENT_IMAGE=debian:buster-20220622-slim FROM $PARENT_IMAGE -# TODO maybe needed? -ARG PKGS_TO_ADD="curl unzip openjdk-11-jdk-headless aapt apksigner" +ARG PKGS_TO_ADD="curl unzip openjdk-11-jdk-headless aapt apksigner zipalign" ARG PKGS_TO_DEL="curl unzip" -ARG PKGINIT="apt update" -ARG PKGADD="apt install -y --no-install-recommends" -ARG PKGDEL="apt purge -y" -ARG PKGCLEAN="apt clean" +ARG PKGINIT="apt-get update" +ARG PKGADD="apt-get install -y --no-install-recommends" +ARG PKGDEL="apt-get purge -y" +ARG PKGCLEAN="apt-get clean" ARG PLATFORM_VERSION="22" ARG BUILD_TOOLS_VERSION="22.0.1" ARG CMDLINETOOLS_URL="https://dl.google.com/android/repository/commandlinetools-linux-8512546_latest.zip" @@ -38,8 +37,8 @@ RUN true \ && mkdir /usr/lib/android-sdk/cmdline-tools/latest \ && mv /tmp/cmdline-tools/* /usr/lib/android-sdk/cmdline-tools/latest/. \ && yes | sdkmanager --install "platforms;android-$PLATFORM_VERSION" "build-tools;$BUILD_TOOLS_VERSION" \ - # This aapt for some reason is broken (wrong linker) so use the debian one. - && rm "/usr/lib/android-sdk/build-tools/${BUILD_TOOLS_VERSION:?}/aapt" \ + # Those for some reason are broken (wrong linker) so use the debian variant. + && (cd "/usr/lib/android-sdk/build-tools/${BUILD_TOOLS_VERSION:?}" && rm aapt zipalign) \ && chown 1000:1000 /work \ && $PKGDEL $PKGS_TO_DEL \ && $PKGCLEAN \ |