whitespace changes to appease downstream CI
The prow/validate job does some various whitespace checks and was complaining about these so I guess I'll try to make it happy: ``` [+] Found files with whitespace at the end of line ./fedora-coreos-config/fedora-bootc/.gitlab-ci.yml ./fedora-coreos-config/fedora-bootc/bootc-base-imagectl.md ./fedora-coreos-config/fedora-bootc/fedora-iot.yaml ./fedora-coreos-config/fedora-bootc/iot/manifest.yaml [+] Found files with missing empty line at end of file ./fedora-coreos-config/fedora-bootc/bootc-base-imagectl ./fedora-coreos-config/fedora-bootc/fedora-iot.yaml ./fedora-coreos-config/fedora-bootc/iot/manifest.yaml ```
This commit is contained in:
parent
e7cf60c183
commit
ef5e95d5bd
5 changed files with 9 additions and 8 deletions
|
|
@ -15,7 +15,7 @@ build-minimal:
|
||||||
script: |
|
script: |
|
||||||
set -xeuo pipefail
|
set -xeuo pipefail
|
||||||
buildah build -f Containerfile --no-cache -t localhost/fedora-bootc:minimal ${PRIV_ARGS} --build-arg=manifest=fedora-minimal .
|
buildah build -f Containerfile --no-cache -t localhost/fedora-bootc:minimal ${PRIV_ARGS} --build-arg=manifest=fedora-minimal .
|
||||||
cd tests/rootfs && buildah build -t localhost/test --from localhost/fedora-bootc:minimal
|
cd tests/rootfs && buildah build -t localhost/test --from localhost/fedora-bootc:minimal
|
||||||
|
|
||||||
build-minimal-plus:
|
build-minimal-plus:
|
||||||
extends: .build-image
|
extends: .build-image
|
||||||
|
|
|
||||||
|
|
@ -114,4 +114,5 @@ if __name__ == "__main__":
|
||||||
cmd_list.set_defaults(func=run_list)
|
cmd_list.set_defaults(func=run_list)
|
||||||
|
|
||||||
args = parser.parse_args()
|
args = parser.parse_args()
|
||||||
args.func(args)
|
args.func(args)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -90,7 +90,7 @@ and downloaded by clients, even if the content didn't actually change.
|
||||||
The `bootc-base-imagectl rechunk` command fixes all of these issues
|
The `bootc-base-imagectl rechunk` command fixes all of these issues
|
||||||
by taking an input container, operates on its final merged filesystem
|
by taking an input container, operates on its final merged filesystem
|
||||||
tree (hence removed/overridden files are handled), and then splits it up
|
tree (hence removed/overridden files are handled), and then splits it up
|
||||||
(currently based on the RPM database) into separate layers (tarballs).
|
(currently based on the RPM database) into separate layers (tarballs).
|
||||||
|
|
||||||
Further, because bootc uses OSTree today, and OSTree canonializes all timestamps
|
Further, because bootc uses OSTree today, and OSTree canonializes all timestamps
|
||||||
to zero on the client side, this tool does that at build time.
|
to zero on the client side, this tool does that at build time.
|
||||||
|
|
@ -104,7 +104,7 @@ can be selected by passing `--manifest` to `build-rootfs`.
|
||||||
|
|
||||||
The current implementation uses `rpm-ostree` on a manifest (treefile)
|
The current implementation uses `rpm-ostree` on a manifest (treefile)
|
||||||
embedded in the container image itself. These manifests are not intended
|
embedded in the container image itself. These manifests are not intended
|
||||||
to be editable directly.
|
to be editable directly.
|
||||||
|
|
||||||
To emphasize: the implementation of this command (especially the configuration
|
To emphasize: the implementation of this command (especially the configuration
|
||||||
files that it reads) are subject to change.
|
files that it reads) are subject to change.
|
||||||
|
|
@ -113,7 +113,7 @@ files that it reads) are subject to change.
|
||||||
|
|
||||||
The build tooling is designed to support "cross builds"; the
|
The build tooling is designed to support "cross builds"; the
|
||||||
repository root could e.g. be CentOS Stream 10, while the
|
repository root could e.g. be CentOS Stream 10, while the
|
||||||
builder root is Fedora or RHEL, etc.
|
builder root is Fedora or RHEL, etc.
|
||||||
|
|
||||||
In other words, one given base image can be used as a "builder" to produce another
|
In other words, one given base image can be used as a "builder" to produce another
|
||||||
using different RPMs.
|
using different RPMs.
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
include:
|
include:
|
||||||
- iot/manifest.yaml
|
- iot/manifest.yaml
|
||||||
- fedora-minimal-plus.yaml
|
- fedora-minimal-plus.yaml
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
metadata:
|
metadata:
|
||||||
summary: Fedora IoT bootc image
|
summary: Fedora IoT bootc image
|
||||||
|
|
||||||
variables:
|
variables:
|
||||||
distro: "fedora-iot"
|
distro: "fedora-iot"
|
||||||
|
|
||||||
|
|
@ -56,4 +56,4 @@ packages-aarch64:
|
||||||
- bcm283x-firmware
|
- bcm283x-firmware
|
||||||
- optee_client
|
- optee_client
|
||||||
- uboot-images-armv8
|
- uboot-images-armv8
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue