diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c776b9d..80ad447 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,25 +36,9 @@ jobs: id-token: write steps: - - name: Prepare environment - run: | - # Lowercase the image uri - echo "IMAGE_REGISTRY=${IMAGE_REGISTRY,,}" >> ${GITHUB_ENV} - echo "IMAGE_NAME=${IMAGE_NAME,,}" >> ${GITHUB_ENV} - - # These stage versions are pinned by https://github.com/renovatebot/renovate - name: Checkout uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5 - # This is optional, but if you see that your builds are way too big for the runners, you can enable this by uncommenting the following lines: - # - name: Maximize build space - # uses: ublue-os/remove-unwanted-software@517622d6452028f266b7ba4cc9a123b5f58a6b53 # v7 - # with: - # remove-codeql: true - - - name: Mount BTRFS for podman storage - uses: ublue-os/container-storage-action@main - - name: Get current date id: date run: | @@ -64,14 +48,10 @@ jobs: # https://linux.die.net/man/1/date echo "date=$(date -u +%Y\-%m\-%d\T%H\:%M\:%S\Z)" >> $GITHUB_OUTPUT - # Image metadata for https://artifacthub.io/ - This is optional but is highly recommended so we all can get a index of all the custom images - # The metadata by itself is not going to do anything, you choose if you want your image to be on ArtifactHub or not. - name: Image Metadata uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5 id: metadata with: - # This generates all the tags for your image, you can add custom tags here too! - # Default tags are "$DEFAULT_TAG" and "$DEFAULT_TAG.$date". tags: | type=raw,value=${{ env.DEFAULT_TAG }} type=raw,value=${{ env.DEFAULT_TAG }}.{{date 'YYYYMMDD'}} @@ -101,17 +81,12 @@ jobs: id: build_image uses: redhat-actions/buildah-build@7a95fa7ee0f02d552a32753e7414641a04307056 # v2 with: - containerfiles: | - ./Containerfile - # Postfix image name with -custom to make it a little more descriptive - # Syntax: https://docs.github.com/en/actions/learn-github-actions/expressions#format + containerfiles: ./Containerfile image: ${{ env.IMAGE_NAME }} tags: ${{ steps.metadata.outputs.tags }} labels: ${{ steps.metadata.outputs.labels }} oci: false - # These `if` statements are so that pull requests for your custom images do not make it publish any packages under your name without you knowing - # They also check if the runner is on the default branch so that things like the merge queue (if you enable it), are going to work - name: Login to GitHub Container Registry uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3 if: github.event_name != 'pull_request' && github.ref == format('refs/heads/{0}', github.event.repository.default_branch) @@ -134,10 +109,6 @@ jobs: username: ${{ env.REGISTRY_USER }} password: ${{ env.REGISTRY_PASSWORD }} - # This section is optional and only needs to be enabled if you plan on distributing - # your project for others to consume. You will need to create a public and private key - # using Cosign and save the private key as a repository secret in Github for this workflow - # to consume. For more details, review the image signing section of the README. - name: Install Cosign uses: sigstore/cosign-installer@d58896d6a1865668819e1d91763c7751a165e159 # v3.9.2 if: github.event_name != 'pull_request' && github.ref == format('refs/heads/{0}', github.event.repository.default_branch) diff --git a/Justfile b/Justfile new file mode 100644 index 0000000..225c55e --- /dev/null +++ b/Justfile @@ -0,0 +1,16 @@ +iso: + mkdir -p output + sudo podman pull ghcr.io/tulilirockz/fiskar:latest + sudo podman run \ + --rm \ + -it \ + --privileged \ + --pull=newer \ + --security-opt label=type:unconfined_t \ + -v ./config.toml:/config.toml:ro \ + -v ./output:/output \ + -v /var/lib/containers/storage:/var/lib/containers/storage \ + quay.io/centos-bootc/bootc-image-builder:latest \ + --type iso \ + --use-librepo=True \ + ghcr.io/tulilirockz/fiskar:latest diff --git a/build-scripts/build.sh b/build-scripts/build.sh index 3da058b..abb200e 100755 --- a/build-scripts/build.sh +++ b/build-scripts/build.sh @@ -2,16 +2,18 @@ set -xeuo pipefail +systemctl enable sshd + dnf -y remove \ + adcli \ libdnf-plugin-subscription-manager \ python3-subscription-manager-rhsm \ subscription-manager \ - subscription-manager-rhsm-certificates + subscription-manager-rhsm-certificates \ + toolbox \ + yggdrasil dnf -y install --setopt=install_weak_deps=False \ - atheros-firmware \ - audit \ - brcmfmac-firmware \ cockpit-machines \ cockpit-networkmanager \ cockpit-podman \ @@ -20,79 +22,53 @@ dnf -y install --setopt=install_weak_deps=False \ cockpit-system \ firewalld \ git-core \ - hdparm \ - ipcalc \ - iwlegacy-firmware \ - iwlwifi-dvm-firmware \ - iwlwifi-mvm-firmware \ libvirt-client \ libvirt-daemon \ libvirt-daemon-kvm \ - man-db \ - man-pages \ - mt7xxx-firmware \ NetworkManager-wifi \ - nxpwireless-firmware \ open-vm-tools \ - pcp-zeroconf \ qemu-guest-agent \ - realtek-firmware \ - rsync \ - systemd-container \ - tiwilink-firmware \ - usbutils \ + systemd-resolved \ + udisks2-lvm2 \ virt-install \ - wireguard-tools \ - xdg-dbus-proxy \ - xdg-user-dirs \ - udisks2-lvm2 + xdg-user-dirs -dnf config-manager --add-repo https://pkgs.tailscale.com/stable/centos/"$(rpm -E %centos)"/tailscale.repo +systemctl enable firewalld + +dnf config-manager --add-repo "https://pkgs.tailscale.com/stable/centos/$(rpm -E %centos)/tailscale.repo" dnf config-manager --set-disabled tailscale-stable - dnf -y install --enablerepo='tailscale-stable' tailscale +systemctl enable tailscaled dnf -y copr enable ublue-os/packages dnf -y copr disable ublue-os/packages dnf -y install --enablerepo="copr:copr.fedorainfracloud.org:ublue-os:packages" --setopt=install_weak_deps=False \ ublue-os-libvirt-workarounds +dnf -y install epel-release +dnf config-manager --set-disabled epel +dnf -y install --enablerepo="epel" just + install -Dpm0644 -t /usr/lib/systemd /tmp/files/usr/lib/systemd/zram-generator.conf -install -Dpm0644 -t /usr/lib/systemd/system /tmp/files/usr/lib/systemd/system/cockpit.service sed -i 's|^ExecStart=.*|ExecStart=/usr/bin/bootc update --quiet|' /usr/lib/systemd/system/bootc-fetch-apply-updates.service sed -i 's|^OnUnitInactiveSec=.*|OnUnitInactiveSec=7d\nPersistent=true|' /usr/lib/systemd/system/bootc-fetch-apply-updates.timer sed -i 's|#AutomaticUpdatePolicy.*|AutomaticUpdatePolicy=stage|' /etc/rpm-ostreed.conf sed -i 's|#LockLayering.*|LockLayering=true|' /etc/rpm-ostreed.conf -systemctl enable firewalld - cat >/usr/lib/systemd/system-preset/91-resolved-default.preset <<'EOF' enable systemd-resolved.service EOF cat >/usr/lib/tmpfiles.d/resolved-default.conf <<'EOF' L /etc/resolv.conf - - - - ../run/systemd/resolve/stub-resolv.conf EOF - systemctl preset systemd-resolved.service -systemctl enable tailscaled - -KERNEL_VERSION="$(rpm -q --queryformat="%{EVR}.%{ARCH}" kernel-core)" +KERNEL_VERSION="$(find "/usr/lib/modules" -maxdepth 1 -type d ! -path "/usr/lib/modules" -exec basename '{}' ';' | sort | tail -n 1)" export DRACUT_NO_XATTR=1 -/usr/bin/dracut --no-hostonly --kver "$KERNEL_VERSION" --reproducible --zstd -v --add ostree -f "/lib/modules/$KERNEL_VERSION/initramfs.img" -chmod 0600 /lib/modules/"$KERNEL_VERSION"/initramfs.img -KERNEL_VERSION="$(rpm -q kernel-core --queryformat '%{EVR}.%{ARCH}')" +dracut --no-hostonly --kver "$KERNEL_VERSION" --reproducible --zstd -v --add ostree -f "/usr/lib/modules/$KERNEL_VERSION/initramfs.img" +chmod 0600 "/usr/lib/modules/${KERNEL_VERSION}/initramfs.img" -kernel_dirs=("$(ls -1 /usr/lib/modules)") -if [[ ${#kernel_dirs[@]} -gt 1 ]]; then - for kernel_dir in "${kernel_dirs[@]}"; do - echo "$kernel_dir" - if [[ "$kernel_dir" != "$KERNEL_VERSION" ]]; then - echo "Removing $kernel_dir" - rm -rf "/usr/lib/modules/$kernel_dir" - fi - done -fi +rm -rf /var/* bootc container lint diff --git a/config.toml b/config.toml new file mode 100644 index 0000000..abed495 --- /dev/null +++ b/config.toml @@ -0,0 +1,18 @@ +[customizations.installer.kickstart] +contents = """ +%post +bootc switch --mutate-in-place --transport registry ghcr.io/tulilirockz/taxifolia:latest +%end +""" + +[customizations.installer.modules] +enable = [ + "org.fedoraproject.Anaconda.Modules.Storage", + "org.fedoraproject.Anaconda.Modules.Runtime", + "org.fedoraproject.Anaconda.Modules.Users", + "org.fedoraproject.Anaconda.Modules.Network", + "org.fedoraproject.Anaconda.Modules.Security", + "org.fedoraproject.Anaconda.Modules.Services", + "org.fedoraproject.Anaconda.Modules.Subscription", + "org.fedoraproject.Anaconda.Modules.Timezone" +] diff --git a/files/usr/lib/systemd/system/cockpit.service b/files/usr/lib/systemd/system/cockpit.service deleted file mode 100644 index 37b0fbd..0000000 --- a/files/usr/lib/systemd/system/cockpit.service +++ /dev/null @@ -1,32 +0,0 @@ -[Unit] -Description=Cockpit Container -After=network-online.target -Wants=network-online.target -RequiresMountsFor=%t/containers -RequiresMountsFor=/ - -[X-Container] -Image=quay.io/cockpit/ws:latest -ContainerName=cockpit-ws -Environment=NAME=cockpit-ws - -Label=io.containers.autoupdate=registry - -Volume=/:/host -PodmanArgs=--pid host --privileged -Exec=/container/label-run - -[Service] -Restart=always -Environment=PODMAN_SYSTEMD_UNIT=%n -KillMode=mixed -ExecStopPost=-/usr/bin/podman rm -f -i --cidfile=%t/%N.cid -ExecStopPost=-rm -f %t/%N.cid -Delegate=yes -Type=notify -NotifyAccess=all -SyslogIdentifier=%N -ExecStart=/usr/bin/podman run --name=ws --cidfile=%t/%N.cid --replace --rm --cgroups=split --sdnotify=conmon -d -v /:/host --env NAME=ws --label io.containers.autoupdate=registry --pid host --privileged quay.io/cockpit/ws:latest /container/label-run - -[Install] -WantedBy=default.target