Skip to content

Commit

Permalink
Merge pull request #965 from cgwalters/release
Browse files Browse the repository at this point in the history
Release 1.1.3
  • Loading branch information
cgwalters authored Dec 12, 2024
2 parents 785acc9 + 1044a45 commit 90960ac
Show file tree
Hide file tree
Showing 18 changed files with 107 additions and 31 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/src/man/bootc-container-lint.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ part of a build process; it will error if any problems are detected.

# VERSION

v1.1.0
v1.1.3
2 changes: 1 addition & 1 deletion docs/src/man/bootc-container.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ bootc-container-help(8)

# VERSION

v1.1.0
v1.1.3
2 changes: 1 addition & 1 deletion docs/src/man/bootc-edit.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ Only changes to the \`spec\` section are honored.

# VERSION

v1.1.0
v1.1.3
30 changes: 30 additions & 0 deletions docs/src/man/bootc-install-ensure-completion.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# NAME

bootc-install-ensure-completion - Intended for use in environments that
are performing an ostree-based installation, not bootc

# SYNOPSIS

**bootc install ensure-completion** \[**-h**\|**\--help**\]

# DESCRIPTION

Intended for use in environments that are performing an ostree-based
installation, not bootc.

In this scenario the installation may be missing bootc specific features
such as kernel arguments, logically bound images and more. This command
can be used to attempt to reconcile. At the current time, the only
tested environment is Anaconda using \`ostreecontainer\` and it is
recommended to avoid usage outside of that environment. Instead, ensure
your code is using \`bootc install to-filesystem\` from the start.

# OPTIONS

**-h**, **\--help**

: Print help (see a summary with -h)

# VERSION

v1.1.3
2 changes: 1 addition & 1 deletion docs/src/man/bootc-install-print-configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ string-valued filesystem name suitable for passing to \`mkfs.\$type\`.

# VERSION

v1.1.0
v1.1.3
19 changes: 16 additions & 3 deletions docs/src/man/bootc-install-to-disk.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ bootc-install-to-disk - Install to the target block device
\[**\--enforce-container-sigpolicy**\] \[**\--target-ostree-remote**\]
\[**\--skip-fetch-check**\] \[**\--disable-selinux**\] \[**\--karg**\]
\[**\--root-ssh-authorized-keys**\] \[**\--generic-image**\]
\[**\--stateroot**\] \[**\--via-loopback**\] \[**-h**\|**\--help**\]
\<*DEVICE*\>
\[**\--bound-images**\] \[**\--stateroot**\] \[**\--via-loopback**\]
\[**-h**\|**\--help**\] \<*DEVICE*\>

# DESCRIPTION

Expand Down Expand Up @@ -130,6 +130,19 @@ boot.
\- All bootloader types will be installed - Changes to the system
firmware will be skipped

**\--bound-images**=*BOUND_IMAGES* \[default: stored\]

: How should logically bound images be retrieved\

\
*Possible values:*

> - stored: Bound images must exist in the sources root container
> storage (default)
>
> - pull: Bound images will be pulled and stored directly in the
> targets bootc container storage
**\--stateroot**=*STATEROOT*

: The stateroot name to use. Defaults to \`default\`
Expand All @@ -149,4 +162,4 @@ firmware will be skipped

# VERSION

v1.1.0
v1.1.3
25 changes: 20 additions & 5 deletions docs/src/man/bootc-install-to-existing-root.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ bootc-install-to-existing-root - Install to the host root filesystem
\[**\--target-ostree-remote**\] \[**\--skip-fetch-check**\]
\[**\--disable-selinux**\] \[**\--karg**\]
\[**\--root-ssh-authorized-keys**\] \[**\--generic-image**\]
\[**\--stateroot**\] \[**\--acknowledge-destructive**\]
\[**-h**\|**\--help**\] \[*ROOT_PATH*\]
\[**\--bound-images**\] \[**\--stateroot**\]
\[**\--acknowledge-destructive**\] \[**-h**\|**\--help**\]
\[*ROOT_PATH*\]

# DESCRIPTION

Expand Down Expand Up @@ -115,6 +116,19 @@ boot.
\- All bootloader types will be installed - Changes to the system
firmware will be skipped

**\--bound-images**=*BOUND_IMAGES* \[default: stored\]

: How should logically bound images be retrieved\

\
*Possible values:*

> - stored: Bound images must exist in the sources root container
> storage (default)
>
> - pull: Bound images will be pulled and stored directly in the
> targets bootc container storage
**\--stateroot**=*STATEROOT*

: The stateroot name to use. Defaults to \`default\`
Expand All @@ -129,9 +143,10 @@ firmware will be skipped

\[*ROOT_PATH*\] \[default: /target\]

: Path to the mounted root; its expected to invoke podman with \`-v
/:/target\`, then supplying this argument is unnecessary
: Path to the mounted root; this is now not necessary to provide.
Historically it was necessary to ensure the host rootfs was mounted
at here via e.g. \`-v /:/target\`

# VERSION

v1.1.0
v1.1.3
18 changes: 16 additions & 2 deletions docs/src/man/bootc-install-to-filesystem.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ filesystem structure
\[**\--target-ostree-remote**\] \[**\--skip-fetch-check**\]
\[**\--disable-selinux**\] \[**\--karg**\]
\[**\--root-ssh-authorized-keys**\] \[**\--generic-image**\]
\[**\--stateroot**\] \[**-h**\|**\--help**\] \<*ROOT_PATH*\>
\[**\--bound-images**\] \[**\--stateroot**\] \[**-h**\|**\--help**\]
\<*ROOT_PATH*\>

# DESCRIPTION

Expand Down Expand Up @@ -144,6 +145,19 @@ boot.
\- All bootloader types will be installed - Changes to the system
firmware will be skipped

**\--bound-images**=*BOUND_IMAGES* \[default: stored\]

: How should logically bound images be retrieved\

\
*Possible values:*

> - stored: Bound images must exist in the sources root container
> storage (default)
>
> - pull: Bound images will be pulled and stored directly in the
> targets bootc container storage
**\--stateroot**=*STATEROOT*

: The stateroot name to use. Defaults to \`default\`
Expand All @@ -161,4 +175,4 @@ mounting. To override this, use \`\--root-mount-spec\`.

# VERSION

v1.1.0
v1.1.3
9 changes: 7 additions & 2 deletions docs/src/man/bootc-install.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ bootc-install - Install the running container to a target

Install the running container to a target.

\## Understanding installations
## Understanding installations

OCI containers are effectively layers of tarballs with JSON for
metadata; they cannot be booted directly. The \`bootc install\` flow is
Expand Down Expand Up @@ -48,6 +48,11 @@ bootc-install-to-existing-root(8)

: Install to the host root filesystem

bootc-install-ensure-completion(8)

: Intended for use in environments that are performing an ostree-based
installation, not bootc

bootc-install-print-configuration(8)

: Output JSON to stdout that contains the merged installation
Expand All @@ -61,4 +66,4 @@ bootc-install-help(8)

# VERSION

v1.1.0
v1.1.3
2 changes: 1 addition & 1 deletion docs/src/man/bootc-rollback.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ rollback invocation.

# VERSION

v1.1.0
v1.1.3
6 changes: 3 additions & 3 deletions docs/src/man/bootc-status.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ bootc system state. If standard output is not a terminal, output a
YAML-formatted object using a schema intended to match a Kubernetes
resource that describes the state of the booted system.

\## Parsing output via programs
## Parsing output via programs

Either the default YAML format or \`\--format=json\` can be used. Do not
attempt to explicitly parse the output of \`\--format=humanreadable\` as
it will very likely change over time.

\## Programmatically detecting whether the system is deployed via bootc
## Programmatically detecting whether the system is deployed via bootc

Invoke e.g. \`bootc status \--json\`, and check if \`status.booted\` is
not \`null\`.
Expand Down Expand Up @@ -59,4 +59,4 @@ not \`null\`.

# VERSION

v1.1.0
v1.1.3
4 changes: 2 additions & 2 deletions docs/src/man/bootc-switch.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Target a new container image reference to boot.
This is almost exactly the same operation as \`upgrade\`, but
additionally changes the container image reference instead.

\## Usage
## Usage

A common pattern is to have a management agent control operating system
updates via container image tags; for example,
Expand Down Expand Up @@ -69,4 +69,4 @@ includes a default policy which requires signatures.

# VERSION

v1.1.0
v1.1.3
2 changes: 1 addition & 1 deletion docs/src/man/bootc-upgrade.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@ userspace-only restart.

# VERSION

v1.1.0
v1.1.3
8 changes: 4 additions & 4 deletions docs/src/man/bootc-usr-overlay.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,20 @@ will be discarded on reboot
Adds a transient writable overlayfs on \`/usr\` that will be discarded
on reboot.

\## Use cases
## Use cases

A common pattern is wanting to use tracing/debugging tools, such as
\`strace\` that may not be in the base image. A system package manager
such as \`apt\` or \`dnf\` can apply changes into this transient overlay
that will be discarded on reboot.

\## /etc and /var
## /etc and /var

However, this command has no effect on \`/etc\` and \`/var\` - changes
written there will persist. It is common for package installations to
modify these directories.

\## Unmounting
## Unmounting

Almost always, a system process will hold a reference to the open mount
point. You can however invoke \`umount -l /usr\` to perform a \"lazy
Expand All @@ -39,4 +39,4 @@ unmount\".

# VERSION

v1.1.0
v1.1.3
2 changes: 1 addition & 1 deletion docs/src/man/bootc.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,4 @@ bootc-help(8)

# VERSION

v1.1.0
v1.1.3
2 changes: 1 addition & 1 deletion lib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ license = "MIT OR Apache-2.0"
name = "bootc-lib"
readme = "README.md"
repository = "https://github.com/containers/bootc"
version = "1.1.2"
version = "1.1.3"
# For now don't bump this above what is currently shipped in RHEL9;
# also keep in sync with the version in cli.
rust-version = "1.75.0"
Expand Down
1 change: 0 additions & 1 deletion lib/src/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,6 @@ pub(crate) enum InstallOpts {
/// to reconcile. At the current time, the only tested environment is Anaconda using `ostreecontainer`
/// and it is recommended to avoid usage outside of that environment. Instead, ensure your
/// code is using `bootc install to-filesystem` from the start.
#[clap(hide = true)]
EnsureCompletion {},
/// Output JSON to stdout that contains the merged installation configuration
/// as it may be relevant to calling processes using `install to-filesystem`
Expand Down

0 comments on commit 90960ac

Please sign in to comment.