diff --git a/scripts/Dockerfile b/scripts/Dockerfile index 5468931d8..c6e7e3d4c 100644 --- a/scripts/Dockerfile +++ b/scripts/Dockerfile @@ -10,19 +10,24 @@ FROM ubuntu:19.04 ENV LANG C.UTF-8 # Needed for setup: -COPY ./docker-cleanup.sh ./setup-ubuntu.sh ./setup-android-sdk.sh ./properties.sh /tmp/ +COPY ./setup-ubuntu.sh ./setup-android-sdk.sh ./properties.sh /tmp/ # Setup needed packages and the Android SDK and NDK: RUN apt-get update && \ apt-get -yq upgrade && \ - apt-get install -yq --no-install-recommends sudo fdupes && \ + apt-get install -yq sudo && \ adduser --disabled-password --shell /bin/bash --gecos "" builder && \ echo "builder ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/builder && \ chmod 0440 /etc/sudoers.d/builder && \ su - builder -c /tmp/setup-ubuntu.sh && \ su - builder -c /tmp/setup-android-sdk.sh && \ # Removed unused parts to make a smaller Docker image: - su - builder -c /tmp/docker-cleanup.sh + apt-get clean && \ + rm -rf /var/lib/apt/lists/* && \ + cd /home/builder/lib/android-ndk/ && \ + rm -Rf sources/cxx-stl/system && \ + cd /home/builder/lib/android-sdk/tools && \ + rm -Rf emulator* lib* proguard templates # Switch User USER builder:builder diff --git a/scripts/docker-cleanup.sh b/scripts/docker-cleanup.sh deleted file mode 100755 index 1aac581f4..000000000 --- a/scripts/docker-cleanup.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash -set -e -u - -. $(cd "$(dirname "$0")"; pwd)/properties.sh - -echo "Cleaning APT" -sudo apt-get clean -sudo rm -rf /var/lib/apt/lists/* - -echo "Cleaning unneeded NDK modules" -cd /home/builder/lib/android-ndk/sources -rm -Rf cxx-stl/system third_party/shaderc third_party/vulkan -cd /home/builder/lib/android-ndk/platforms -rm -Rf android-16 android-17 android-18 android-19 -cd /home/builder/lib/android-ndk -rm -Rf shader-tools - -echo "Cleaning unneeded SDK modules" -cd /home/builder/lib/android-sdk/tools -mkdir -p lib2 -cp $(grep "CLASSPATH=" bin/sdkmanager | head -n 1 | cut -d '=' -f 2 | tr ':' ' ' | sed 's%\$APP_HOME/%%g') lib2 -rm -Rf emulator* lib proguard template support/*.txt -mv lib2 lib -cd /home/builder/lib/android-sdk/platforms/android-21 -rm -Rf data templates skins -cd /home/builder/lib/android-sdk/platforms/android-28 -rm -Rf data templates skins - -echo "Zipping notices" -cd /home/builder/lib/android-ndk -bzip2 NOTICE NOTICE.toolchain sysroot/NOTICE -cd /home/builder/lib/android-sdk -bzip2 tools/NOTICE.txt build-tools/${TERMUX_ANDROID_BUILD_TOOLS_VERSION}/NOTICE.txt platform-tools/NOTICE.txt -cd /home/builder/lib/android-sdk/platforms - -echo "Removing duplicate files" -fdupes -r -1 /home/builder/lib/android-ndk /home/builder/lib/android-sdk | \ - while read line; do - master="" - for file in ${line[*]}; do - if [ "x${master}" == "x" ]; then - master=$file - else - ln -sf "${master}" "${file}" - fi - done - done - -echo "Cleaning done"