diff --git a/.gitlab-ci/container/debian/arm64_test-gl.sh b/.gitlab-ci/container/debian/arm64_test-gl.sh index ad650371a26..9c596e245d6 100644 --- a/.gitlab-ci/container/debian/arm64_test-gl.sh +++ b/.gitlab-ci/container/debian/arm64_test-gl.sh @@ -1,3 +1,5 @@ #!/usr/bin/env bash . .gitlab-ci/container/debian/test-gl.sh + +. .gitlab-ci/container/strip-rootfs.sh diff --git a/.gitlab-ci/container/debian/arm64_test-vk.sh b/.gitlab-ci/container/debian/arm64_test-vk.sh index 58b04fd5268..70e28c56905 100644 --- a/.gitlab-ci/container/debian/arm64_test-vk.sh +++ b/.gitlab-ci/container/debian/arm64_test-vk.sh @@ -1,3 +1,5 @@ #!/usr/bin/env bash . .gitlab-ci/container/debian/test-vk.sh + +. .gitlab-ci/container/strip-rootfs.sh diff --git a/.gitlab-ci/container/debian/x86_64_test-android.sh b/.gitlab-ci/container/debian/x86_64_test-android.sh index 262c771ddbb..e0f5d0b56dd 100644 --- a/.gitlab-ci/container/debian/x86_64_test-android.sh +++ b/.gitlab-ci/container/debian/x86_64_test-android.sh @@ -108,3 +108,5 @@ rm -rf "/${ndk:?}" apt-get purge -y "${EPHEMERAL[@]}" . .gitlab-ci/container/container_post_build.sh + +. .gitlab-ci/container/strip-rootfs.sh diff --git a/.gitlab-ci/container/debian/x86_64_test-gl.sh b/.gitlab-ci/container/debian/x86_64_test-gl.sh index ad650371a26..9c596e245d6 100644 --- a/.gitlab-ci/container/debian/x86_64_test-gl.sh +++ b/.gitlab-ci/container/debian/x86_64_test-gl.sh @@ -1,3 +1,5 @@ #!/usr/bin/env bash . .gitlab-ci/container/debian/test-gl.sh + +. .gitlab-ci/container/strip-rootfs.sh diff --git a/.gitlab-ci/container/debian/x86_64_test-vk.sh b/.gitlab-ci/container/debian/x86_64_test-vk.sh index 58b04fd5268..70e28c56905 100644 --- a/.gitlab-ci/container/debian/x86_64_test-vk.sh +++ b/.gitlab-ci/container/debian/x86_64_test-vk.sh @@ -1,3 +1,5 @@ #!/usr/bin/env bash . .gitlab-ci/container/debian/test-vk.sh + +. .gitlab-ci/container/strip-rootfs.sh diff --git a/.gitlab-ci/container/strip-rootfs.sh b/.gitlab-ci/container/strip-rootfs.sh index cb6bec9d857..c88fcab5856 100644 --- a/.gitlab-ci/container/strip-rootfs.sh +++ b/.gitlab-ci/container/strip-rootfs.sh @@ -131,3 +131,24 @@ files=( for files in "${files[@]}"; do find /usr /etc -name "$files" -prune -exec rm -r {} \; done + +# We purge apt and dpkg to save on space, which is great for runtime and +# bandwidth use etc, but less great for cbuild which wants to run apt-get clean +# when we're done. Install a stub which works for that and is apologetic for +# anyone else. +cat >/usr/bin/apt-get <