From 9fa341eb2736dae27a4f9f76306d1b2c54cd5ae5 Mon Sep 17 00:00:00 2001 From: Chris Kyrouac Date: Mon, 22 Jul 2024 10:57:01 -0400 Subject: [PATCH] boundimages: Switch from bootc-experimental to bootc This is a stable enough feature to be included in the primary bootc directory. Signed-off-by: Chris Kyrouac --- Makefile | 2 +- contrib/packaging/bootc.spec | 1 - docs/src/experimental-logically-bound-images.md | 6 +++--- lib/src/boundimage.rs | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 4767148bf..d3e82e0c7 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ all: install: install -D -m 0755 -t $(DESTDIR)$(prefix)/bin target/release/bootc - install -d -m 0755 $(DESTDIR)$(prefix)/lib/bootc-experimental/bound-images.d + install -d -m 0755 $(DESTDIR)$(prefix)/lib/bootc/bound-images.d install -d -m 0755 $(DESTDIR)$(prefix)/lib/bootc/kargs.d install -d -m 0755 $(DESTDIR)$(prefix)/lib/systemd/system-generators/ ln -f $(DESTDIR)$(prefix)/bin/bootc $(DESTDIR)$(prefix)/lib/systemd/system-generators/bootc-systemd-generator diff --git a/contrib/packaging/bootc.spec b/contrib/packaging/bootc.spec index bc79085ba..7a5bb798e 100644 --- a/contrib/packaging/bootc.spec +++ b/contrib/packaging/bootc.spec @@ -31,7 +31,6 @@ BuildRequires: libzstd-devel %{_bindir}/bootc %{_prefix}/lib/systemd/system-generators/* %{_prefix}/lib/bootc -%{_prefix}/lib/bootc-experimental %{_unitdir}/* %{_mandir}/man*/bootc* diff --git a/docs/src/experimental-logically-bound-images.md b/docs/src/experimental-logically-bound-images.md index 3a09b8a67..8f3046f9d 100644 --- a/docs/src/experimental-logically-bound-images.md +++ b/docs/src/experimental-logically-bound-images.md @@ -14,7 +14,7 @@ This experimental feature enables an association of container "app" images to a ## Using logically bound images -Each image is defined in a [Podman Quadlet](https://docs.podman.io/en/latest/markdown/podman-systemd.unit.5.html) `.image` or `.container` file. An image is selected to be bound by creating a symlink in the `/usr/lib/bootc-experimental/bound-images.d` directory pointing to a `.image` or `.container` file. With these defined, during a `bootc upgrade` or `bootc switch` the bound images defined in the new bootc image will be automatically pulled via podman. +Each image is defined in a [Podman Quadlet](https://docs.podman.io/en/latest/markdown/podman-systemd.unit.5.html) `.image` or `.container` file. An image is selected to be bound by creating a symlink in the `/usr/lib/bootc/bound-images.d` directory pointing to a `.image` or `.container` file. With these defined, during a `bootc upgrade` or `bootc switch` the bound images defined in the new bootc image will be automatically pulled via podman. An example Containerfile @@ -24,8 +24,8 @@ FROM quay.io/myorg/myimage:latest COPY ./my-app.image /usr/share/containers/systemd/my-app.image COPY ./another-app.container /usr/share/containers/systemd/another-app.container -RUN ln -s /usr/share/containers/systemd/my-app.image /usr/lib/bootc-experimental/bound-images.d/my-app.image && \ - ln -s /usr/share/containers/systemd/my-app.image /usr/lib/bootc-experimental/bound-images.d/my-app.image +RUN ln -s /usr/share/containers/systemd/my-app.image /usr/lib/bootc/bound-images.d/my-app.image && \ + ln -s /usr/share/containers/systemd/my-app.image /usr/lib/bootc/bound-images.d/my-app.image ``` ## Limitations diff --git a/lib/src/boundimage.rs b/lib/src/boundimage.rs index 3c46923f9..a5bf06d19 100644 --- a/lib/src/boundimage.rs +++ b/lib/src/boundimage.rs @@ -16,7 +16,7 @@ use ostree_ext::sysroot::SysrootLock; /// The path in a root for bound images; this directory should only contain /// symbolic links to `.container` or `.image` files. -const BOUND_IMAGE_DIR: &str = "usr/lib/bootc-experimental/bound-images.d"; +const BOUND_IMAGE_DIR: &str = "usr/lib/bootc/bound-images.d"; /// A subset of data parsed from a `.image` or `.container` file with /// the minimal information necessary to fetch the image.