[Merge] ~mwhudson/livecd-rootfs/+git/livecd-rootfs:clean-docker-harder into livecd-rootfs:ubuntu/master

Michael Hudson-Doyle mwhudsonlp at fastmail.fm
Tue May 7 22:34:54 UTC 2019



Diff comments:

> diff --git a/live-build/functions b/live-build/functions
> index 7908900..72fdb05 100644
> --- a/live-build/functions
> +++ b/live-build/functions
> @@ -717,7 +717,18 @@ subtract_package_lists() {
>  clean_debian_chroot() {
>      # remove crufty files that shouldn't be left in an image
>      rm -f chroot/var/cache/debconf/*-old chroot/var/lib/dpkg/*-old
> -	Chroot chroot apt clean
> +    Chroot chroot apt clean
> +    # For the docker images we remove even more stuff.
> +    if [ "${PROJECT}:${SUBPROJECT:-}" = "ubuntu-base:minimized" ]; then
> +        # Remove apt lists (that are currently removed downstream
> +        # anyway)
> +        rm -rf chroot/var/lib/apt/lists/*
> +        # Having device nodes in the docker image can cause problems
> +        # (https://github.com/tianon/docker-brew-ubuntu-core/issues/62)
> +        # so remove them.  We only do this for docker out of an
> +        # abundance of caution.
> +        rm -rf chroot/dev/*

Eh, maybe. I don't think the exact details of the problem are very relevant to anyone reading this tbh.

> +    fi
>  }
>  
>  configure_universe() {


-- 
https://code.launchpad.net/~mwhudson/livecd-rootfs/+git/livecd-rootfs/+merge/367076
Your team Ubuntu Core Development Team is subscribed to branch livecd-rootfs:ubuntu/master.



More information about the Ubuntu-reviews mailing list