mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-07 13:06:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

build_library: remove two Docker files not used on Flatcar

Browse Source 
They were previously in /usr/share/docker/contrib which means they were
deleted at build time and not shipped into Docker sysext.

New ebuild version of Docker now provides those two files as symlinks to
/usr/share/docker/contrib from /usr/bin.

We can't really remove symlinks using find as docker-runc,
docker-containerd, etc. are broken symlinks too during the build phase.

Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
This commit is contained in:
Mathieu Tortuyaux 2024-09-18 17:45:48 +02:00 committed by Dongsu Park
parent 785725c167
commit 0aab7daaf7
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build_library/sysext_mangle_docker-flatcar
View File

@ -6,6 +6,9 @@ rootfs="${1}"
# Remove debug and contrib # Remove debug and contrib
echo ">>> NOTICE: $0: removing '/usr/lib/debug/', '/usr/share/docker/contrib' from sysext" echo ">>> NOTICE: $0: removing '/usr/lib/debug/', '/usr/share/docker/contrib' from sysext"
rm -rf "${rootfs}/usr/lib/debug/" "${rootfs}/usr/share/docker/contrib/" rm -rf "${rootfs}/usr/lib/debug/" "${rootfs}/usr/share/docker/contrib/"
# For Docker 27.2.1, two files are symlinked to /usr/share/docker/contrib
# There were previously shipped directly in /usr/share/docker/contrib folder
rm -f "${rootfs}/usr/bin/dockerd-rootless-setuptool.sh" "${rootfs}/usr/bin/dockerd-rootless.sh"
script_root="$(cd "$(dirname "$0")/../"; pwd)" script_root="$(cd "$(dirname "$0")/../"; pwd)"
files_dir="${script_root}/sdk_container/src/third_party/coreos-overlay/coreos/sysext/docker" files_dir="${script_root}/sdk_container/src/third_party/coreos-overlay/coreos/sysext/docker"