diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4af6064c87..6c1060a43f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -103,7 +103,7 @@ jobs: # Build metadata - name: Image Metadata - uses: docker/metadata-action@v4 + uses: docker/metadata-action@v5 id: meta with: images: | @@ -165,7 +165,7 @@ jobs: --disable-content-trust - name: Login to GitHub Container Registry - uses: docker/login-action@v2 + uses: docker/login-action@v3 if: github.event_name != 'pull_request' && github.ref == 'refs/heads/live' with: registry: ghcr.io diff --git a/README.md b/README.md index 418d1613f9..9543ef0e13 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ After setup, it is recommended you update this README to describe your custom im The easiest way to start customizing is by looking at and modifying `config/recipe.yml`. It's documented using comments and should be pretty easy to understand. -If you want to add custom configuration files, you can just add them in the `/usr/etc/` directory, which is the official OSTree "configuration template" directory and will be applied to `/etc/` on boot. `usr` is copied into your image by default. If you need to add other directories in the root of your image, that can be done in the Containerfile. Writing to `/var/` in the image builds of OSTree-based distros isn't supported and will not work, as that is a local user-managed directory! +If you want to add custom configuration files, you can just add them in the `/usr/etc/` directory, which is the official OSTree "configuration template" directory and will be applied to `/etc/` on boot. `config/files/usr` is copied into your image's `/usr` by default. If you need to add other directories in the root of your image, that can be done using the `files` module. Writing to `/var/` in the image builds of OSTree-based distros isn't supported and will not work, as that is a local user-managed directory! For more information about customization, see [the README in the config directory](config/README.md) @@ -95,4 +95,4 @@ Then type `just` to list the just recipes available. The file `/usr/share/ublue-os/just/custom.just` is intended for the custom just commands (recipes) you wish to include in your image. By default, it includes the justfiles from [`ublue-os/bling`](https://github.com/ublue-os/bling), if you wish to disable that, you need to just remove the line that includes bling.just. -See [the just-page in the Universal Blue documentation](https://universal-blue.org/guide/just/) for more information. \ No newline at end of file +See [the just-page in the Universal Blue documentation](https://universal-blue.org/guide/just/) for more information. diff --git a/config/recipe.yml b/config/recipe.yml index e0c66405f2..b895915cf8 100644 --- a/config/recipe.yml +++ b/config/recipe.yml @@ -12,11 +12,13 @@ image-version: 38 # latest is also supported if you want new updates ASAP modules: - type: files files: - - usr: /usr # copy static configurations - # configuration you wish to end up in /etc/ on the booted system should be - # added into /usr/etc/ as that is the proper "distro" config directory on ostree - # read more in the files module's README - + - usr: /usr # copy static configurations + # + # copies config/files/usr into your image's /usr + # + # configuration you wish to end up in /etc/ on the booted system + # should be added into /usr/etc/ as that is the proper "distro" + # config directory on ostree. Read more in the files module's README - type: rpm-ostree repos: # - https://copr.fedorainfracloud.org/coprs/atim/starship/repo/fedora-%OS_VERSION%/atim-starship-fedora-%OS_VERSION%.repo