From 65189fe496168b28370512136523b21234bdab27 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Sep 2023 16:00:29 +0000 Subject: [PATCH 1/3] build(deps): bump docker/login-action from 2 to 3 (#154) Bumps [docker/login-action](https://github.com/docker/login-action) from 2 to 3. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](https://github.com/docker/login-action/compare/v2...v3) --- updated-dependencies: - dependency-name: docker/login-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4af6064c87..5f079fd882 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 From 7aee88c878fdbff0a85173164575ebce6a26fb74 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Sep 2023 16:05:50 +0000 Subject: [PATCH 2/3] build(deps): bump docker/metadata-action from 4 to 5 (#153) Bumps [docker/metadata-action](https://github.com/docker/metadata-action) from 4 to 5. - [Release notes](https://github.com/docker/metadata-action/releases) - [Upgrade guide](https://github.com/docker/metadata-action/blob/master/UPGRADE.md) - [Commits](https://github.com/docker/metadata-action/compare/v4...v5) --- updated-dependencies: - dependency-name: docker/metadata-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5f079fd882..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: | From 44fb9251ec350dcb8a11873656629872dd8a72b1 Mon Sep 17 00:00:00 2001 From: qoijjj <129108030+qoijjj@users.noreply.github.com> Date: Mon, 18 Sep 2023 09:15:53 -0700 Subject: [PATCH 3/3] fix: add additional clarity to the location of files for the files module (#151) * fix: add additional clarity to the location of files for the files module * docs: chore: recommend files module instead of COPY --------- Co-authored-by: xyny <60004820+xynydev@users.noreply.github.com> --- README.md | 4 ++-- config/recipe.yml | 11 +++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) 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 90d4cb16fa..c71eae8e0d 100644 --- a/config/recipe.yml +++ b/config/recipe.yml @@ -13,10 +13,13 @@ 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: