Skip to content
This repository was archived by the owner on May 21, 2026. It is now read-only.

deb: keep '/var/lib/apt/lists/' to allow building for Debian unstable #219

Merged
tiborvass merged 1 commit into from
Feb 22, 2021
Merged

deb: keep '/var/lib/apt/lists/' to allow building for Debian unstable #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 32 additions & 1 deletion dockerfiles/deb.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,41 @@ COPY --from=go-md2man /go/bin/go-md2man /go/bin/go-md2man
COPY debian/ debian/
# NOTE: not using a cache-mount for apt, to prevent issues when building multiple
# distros on the same machine / build-cache
#
# NOTE: DO NOT REMOVE '/var/lib/apt/lists/', to allow building for Debian unstable.
#
# Debian "unstable" releases use apt caching information to get the codename
# see discussion on https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=845651:
#
# > That's all to say that this bug is (to my belief) actually expected behaviour;
# > and fixing it through forcing the codename to be interpreted as "stretch" when
# > apt-cache information is unavailable would be wrong. When /etc/debian_version
# > contains "potato/sid", the codename is either potato xor sid, and only apt-
# > cache can discriminate a testing host from a sid host. Therefore, in such a
# > situation, the correct answer is actually "I can't tell", aka "n/a".
#
# From testing on https://github.com/docker/containerd-packaging/pull/213#issuecomment-782172567,
# it reads the information from these files:
#
# - /var/lib/apt/lists/deb.debian.org_debian_dists_bullseye_InRelease
# - /var/lib/apt/lists/deb.debian.org_debian_dists_bullseye_main_binary-amd64_Packages.lz4
#
# Removing these files (`rm -rf /var/lib/apt/lists/*`) causes 'lsb_release -sc`
# to print 'n/a'. While we could use '/etc/debian_version' as a fallback for our
# own scripts (stripping everything after '/' (e.g. bullseye/sid -> bullseye),
# dpkg-buildpackage will still depend on this information to be present, and
# if not present, renames packages to use 'n/a' in their path:
#
# dpkg-buildpackage: info: full upload; Debian-native package (full source is included)
# renamed '../containerd.io-dbgsym_0.20210219.014044~e58be59-1_amd64.deb' -> '/build/debian/n/a/amd64/containerd.io-dbgsym_0.20210219.014044~e58be59-1_amd64.deb'
# renamed '../containerd.io_0.20210219.014044~e58be59-1_amd64.deb' -> '/build/debian/n/a/amd64/containerd.io_0.20210219.014044~e58be59-1_amd64.deb'
#
# Given that we don't need the final image (as we only use it as a build environment
# and copy the artifacts out), keeping some of the cache files should not be a problem.
RUN apt-get update -q \
&& mk-build-deps -t "apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends -y" -i debian/control \
&& apt-get clean \
Copy link
Copy Markdown
Contributor

@tianon tianon Feb 19, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👀 this is a no-op for sure:

https://github.com/debuerreotype/debuerreotype/blob/5cf7949ecf1cec1afece267688bda64cd34a6817/scripts/debuerreotype-minimizing-config#L85-L109

Suggested change
&& apt-get clean \

&& rm -rf /var/cache/apt /var/lib/apt/lists/*
&& rm -rf /var/cache/apt
Copy link
Copy Markdown
Contributor

@tianon tianon Feb 19, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

... which means this is a no-op too (and redundant with apt-get clean in a normal install anyhow)

COPY scripts/build-deb /root/
COPY scripts/.helpers /root/

Expand Down
8 changes: 8 additions & 0 deletions scripts/build-deb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,14 @@ DEST_DIR="/build/${DIST_ID}/${DIST_VERSION}/${ARCH}/"
mkdir -p "${DEST_DIR}"
mv -v ../*.deb "${DEST_DIR}"

if [ "${DIST_VERSION}" = 'n/a' ]; then
# Give a more useful error message if we failed to get the "codename",
# which can be the case on Debian "unstable" releases. For more background:
# https://github.com/docker/containerd-packaging/pull/213#issuecomment-782172567
echo "Failed to get release codename"
exit 1
fi

# Only create an archive if env variable is specified
if [ -n "${CREATE_ARCHIVE}" ]; then
tar -C /build -cvzf "/archive/${DIST_ID}-${DIST_VERSION}-${ARCH}.tar.gz" "${DIST_ID}/${DIST_VERSION}/${ARCH}"
Expand Down