diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 01a1b46..b14d6dd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -152,7 +152,7 @@ jobs: RECIPE=${{ matrix.recipe }} IMAGE_REGISTRY=${{ steps.registry_case.outputs.lowercase }} labels: ${{ steps.meta.outputs.labels }} - oci: false + oci: true # Push the image to GHCR (Image Registry) - name: Push To GHCR diff --git a/config/files/usr/lib/bootc/install/00-u.toml b/config/files/usr/lib/bootc/install/00-u.toml new file mode 100644 index 0000000..55cc508 --- /dev/null +++ b/config/files/usr/lib/bootc/install/00-u.toml @@ -0,0 +1,2 @@ +[install] +root-fs-type = "btrfs" diff --git a/config/recipe.yml b/config/recipe.yml index baa33a0..b0f3326 100644 --- a/config/recipe.yml +++ b/config/recipe.yml @@ -20,12 +20,25 @@ modules: # 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: script + scripts: + # this sets up the proper policy & signing files for signed images to work + - enable-testing-repo.sh - type: rpm-ostree repos: # - https://copr.fedorainfracloud.org/coprs/atim/starship/repo/fedora-%OS_VERSION%/atim-starship-fedora-%OS_VERSION%.repo install: # - micro # - starship + - vim + - gdisk + - bootupd + - grub2 + - ostree-grub2 + - grub2-efi-x64 + - efibootmgr + - nc + - cloud-utils remove: # - firefox # default firefox removed in favor of flatpak # - firefox-langpacks # langpacks needs to also be removed to prevent dependency problems @@ -45,6 +58,8 @@ modules: custom-flatpaks: # this section is optional # - Celluloid: io.github.celluloid_player.Celluloid # - Krita: org.kde.krita + - Firefox: org.mozilla.firefox + - Slack: com.slack.Slack - Scratch: edu.mit.Scratch - SonicPi: net.sonic_pi.SonicPi @@ -52,3 +67,6 @@ modules: scripts: # this sets up the proper policy & signing files for signed images to work - signing.sh + - type: script + scripts: + - bootupctl-update-metadata.sh diff --git a/config/scripts/bootupctl-update-metadata.sh b/config/scripts/bootupctl-update-metadata.sh new file mode 100755 index 0000000..cff9933 --- /dev/null +++ b/config/scripts/bootupctl-update-metadata.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +bootupctl backend generate-update-metadata diff --git a/config/scripts/enable-testing-repo.sh b/config/scripts/enable-testing-repo.sh new file mode 100755 index 0000000..6b6229b --- /dev/null +++ b/config/scripts/enable-testing-repo.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +set -oue pipefail + +echo ">>>>>> ENABLING TEST REPO <<<<<<" +sed -i -e '0,/enabled=0/s//enabled=1/' /etc/yum.repos.d/fedora-updates-testing.repo