mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-09 22:16:58 +02:00
Create seperate docker and containerd sysext
This commit is contained in:
parent
c026d9ed53
commit
3d17f65088
@ -626,12 +626,21 @@ finish_image() {
|
|||||||
local install_grub=0
|
local install_grub=0
|
||||||
local disk_img="${BUILD_DIR}/${image_name}"
|
local disk_img="${BUILD_DIR}/${image_name}"
|
||||||
|
|
||||||
# Ship the docker systemd-sysext image and rip out torcx in same go; TODO: create seperate sysext images for containerd and docker
|
# Ship the docker systemd-sysext image and rip out torcx in same go; TODO: create seperate sysext images for containerd and docker
|
||||||
|
echo "app-containers/containerd-1.6.16" >> ~/trunk/src/third_party/coreos-overlay/profiles/coreos/base/package.provided
|
||||||
emerge-"${FLAGS_board}" app-containers/docker
|
emerge-"${FLAGS_board}" app-containers/docker
|
||||||
sudo "$(dirname ${BASH_SOURCE[0]})/../build_sysext" --board="${BOARD}" --build_dir=${BUILD_DIR} --squashfs_base="${BUILD_DIR}/${image_sysext_base}" --manglefs_script="$(dirname ${BASH_SOURCE[0]})/../manglefs_docker" docker-flatcar app-containers/docker
|
sudo "$(dirname ${BASH_SOURCE[0]})/../build_sysext" --board="${BOARD}" --image_builddir=${BUILD_DIR} --squashfs_base="${BUILD_DIR}/${image_sysext_base}" --manglefs_script="$(dirname ${BASH_SOURCE[0]})/../manglefs_docker" docker-flatcar app-containers/docker
|
||||||
sudo install -m 0644 -D "${BUILD_DIR}/docker-flatcar.raw" "${root_fs_dir}"/usr/share/flatcar/
|
sudo install -m 0644 -D "${BUILD_DIR}/docker-flatcar.raw" "${root_fs_dir}"/usr/share/flatcar/
|
||||||
sudo mkdir -p "${root_fs_dir}"/etc/extensions/·
|
sudo mkdir -p "${root_fs_dir}"/etc/extensions/
|
||||||
sudo ln -sf /usr/share/flatcar/docker-flatcar.raw "${root_fs_dir}"/etc/extensions/docker-flatcar.raw
|
sudo ln -sf /usr/share/flatcar/docker-flatcar.raw "${root_fs_dir}"/etc/extensions/docker-flatcar.raw
|
||||||
|
sed -i '/containerd/d' ~/trunk/src/third_party/coreos-overlay/profiles/coreos/base/package.provided
|
||||||
|
|
||||||
|
|
||||||
|
emerge-"${FLAGS_board}" app-containers/containerd
|
||||||
|
sudo "$(dirname ${BASH_SOURCE[0]})/../build_sysext" --board="${BOARD}" --image_builddir=${BUILD_DIR} --squashfs_base="${BUILD_DIR}/${image_sysext_base}" containerd-flatcar app-containers/containerd
|
||||||
|
sudo install -m 0644 -D "${BUILD_DIR}/containerd-flatcar.raw" "${root_fs_dir}"/usr/share/flatcar/
|
||||||
|
sudo mkdir -p "${root_fs_dir}"/etc/extensions/
|
||||||
|
sudo ln -sf /usr/share/flatcar/containerd-flatcar.raw "${root_fs_dir}"/etc/extensions/containerd-flatcar.raw
|
||||||
|
|
||||||
# Only enable rootfs verification on prod builds.
|
# Only enable rootfs verification on prod builds.
|
||||||
local disable_read_write="${FLAGS_FALSE}"
|
local disable_read_write="${FLAGS_FALSE}"
|
||||||
|
Loading…
Reference in New Issue
Block a user