From 19067bcf904121ffe20e0a3f1951ce9bba5182cd Mon Sep 17 00:00:00 2001 From: ver4a Date: Tue, 29 Apr 2025 12:23:46 +0200 Subject: [PATCH 1/4] ci: Remove broken cleanup --- .forgejo/workflows/build-image.yaml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.forgejo/workflows/build-image.yaml b/.forgejo/workflows/build-image.yaml index d5fbc43..1233c5b 100644 --- a/.forgejo/workflows/build-image.yaml +++ b/.forgejo/workflows/build-image.yaml @@ -205,12 +205,8 @@ jobs: --compression-level=${{ vars.COMPRESSION_LEVEL }} ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-kde:main-nvidia-ver4a.expiring ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-kde:$(buildah inspect -t image -f '{{ index .OCIv1.Config.Labels "org.opencontainers.image.version" }}' ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-kde:main-nvidia-ver4a)-nvidia-ver4a - - if: '!cancelled()' - run: > - podman image rm -f ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-kde:main && podman image prune -f && - podman image rm -f ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-kde:main-ver4a && podman image prune -f && - podman image rm -f ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-kde:main-nvidia && podman image prune -f && - podman image rm -f ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-kde:main-nvidia-ver4a && podman image prune -f + + # build-gnome: # runs-on: oci-builder # steps: From 6a8bea3dbf1e73fbce293998856c64fdbb31fe4b Mon Sep 17 00:00:00 2001 From: ver4a Date: Tue, 29 Apr 2025 12:24:37 +0200 Subject: [PATCH 2/4] ci: Remove unused gnome build --- .forgejo/workflows/build-image.yaml | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/.forgejo/workflows/build-image.yaml b/.forgejo/workflows/build-image.yaml index 1233c5b..557bf2f 100644 --- a/.forgejo/workflows/build-image.yaml +++ b/.forgejo/workflows/build-image.yaml @@ -205,28 +205,3 @@ jobs: --compression-level=${{ vars.COMPRESSION_LEVEL }} ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-kde:main-nvidia-ver4a.expiring ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-kde:$(buildah inspect -t image -f '{{ index .OCIv1.Config.Labels "org.opencontainers.image.version" }}' ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-kde:main-nvidia-ver4a)-nvidia-ver4a - - -# build-gnome: -# runs-on: oci-builder -# steps: -# - uses: actions/checkout@v4 -# - run: cd ${{ env.GITHUB_WORKSPACE }} -# - run: podman login -u ${{ vars.REGISTRY_USERNAME }} -p ${{ secrets.REGISTRY_PASSWORD }} ${{ vars.REGISTRY_DOMAIN }} -# # base -# - run: mkdir cache -# # Waits for a CI pull lock to be released before starting a new pull -# - run: flock -x /tmp/CI-podman-pull-lock -c 'podman pull quay.io/fedora-ostree-desktops/silverblue:42' -# - run: podman build . -f Dockerfile.gnome --userns container --security-opt no-new-privileges --no-cache --pull=never -v ${PWD}/cache:/var/cache/libdnf5:Z --squash --build-arg REGISTRY_DOMAIN=${{ vars.REGISTRY_DOMAIN }} --build-arg NAMESPACE=${{ vars.NAMESPACE }} -t ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-gnome:main --annotation quay.expires-after= -# - run: podman push --compression-format=zstd --compression-level=${{ vars.COMPRESSION_LEVEL }} ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-gnome:main ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-gnome:main -# - run: podman build -f Dockerfile.scratch --from ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-gnome:main -t ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-gnome:main --label quay.expires-after=4w --annotation quay.expires-after=4w -# - run: podman push --compression-format=zstd --compression-level=${{ vars.COMPRESSION_LEVEL }} ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-gnome:main ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-gnome:$(podman image inspect -f '{{ index .Labels "org.opencontainers.image.version" }}' ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-gnome:main) -# # base + nvidia -# - run: podman build . -f Dockerfile.gnome-nvidia --userns container --security-opt no-new-privileges --no-cache --pull=never -v ${PWD}/cache:/var/cache/libdnf5:Z --squash --build-arg REGISTRY_DOMAIN=${{ vars.REGISTRY_DOMAIN }} --build-arg NAMESPACE=${{ vars.NAMESPACE }} -t ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-gnome:main-nvidia --annotation quay.expires-after= -# - run: podman push --compression-format=zstd --compression-level=${{ vars.COMPRESSION_LEVEL }} ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-gnome:main-nvidia ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-gnome:main-nvidia -# - run: podman build -f Dockerfile.scratch --from ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-gnome:main-nvidia -t ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-gnome:main-nvidia --label quay.expires-after=4w --annotation quay.expires-after=4w -# - run: podman push --compression-format=zstd --compression-level=${{ vars.COMPRESSION_LEVEL }} ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-gnome:main-nvidia ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-gnome:$(podman image inspect -f '{{ index .Labels "org.opencontainers.image.version" }}' ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-gnome:main)-nvidia -# - if: '!cancelled()' -# run: > -# podman image rm -f ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-gnome:main && podman image prune -f && -# podman image rm -f ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-gnome:main-nvidia && podman image prune -f From c6204ee504f680b3db97472e1d9a199f38c780fb Mon Sep 17 00:00:00 2001 From: ver4a Date: Tue, 29 Apr 2025 14:38:14 +0200 Subject: [PATCH 3/4] Remove unused scratch Dockerfile --- Dockerfile.scratch | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 Dockerfile.scratch diff --git a/Dockerfile.scratch b/Dockerfile.scratch deleted file mode 100644 index 8c075ec..0000000 --- a/Dockerfile.scratch +++ /dev/null @@ -1,2 +0,0 @@ -# This servres as a placeholder for the "-f" parameter to "podman build" e.g. if we set "--from" and "--label" to relabel an image. -FROM scratch From c61a0fa2a0914847ec83b6fae8c4275342e8af62 Mon Sep 17 00:00:00 2001 From: ver4a Date: Tue, 29 Apr 2025 15:06:24 +0200 Subject: [PATCH 4/4] Optimize repository --- .forgejo/workflows/build-image.yaml | 3 +++ Dockerfile.gnome => containers/Dockerfile.gnome | 0 Dockerfile.gnome-nvidia => containers/Dockerfile.gnome-nvidia | 0 Dockerfile.kde => containers/Dockerfile.kde | 0 Dockerfile.kde-nvidia => containers/Dockerfile.kde-nvidia | 0 .../Dockerfile.kde-nvidia-ver4a | 0 Dockerfile.kde-ver4a => containers/Dockerfile.kde-ver4a | 0 {etc => containers/etc}/dnf/dnf.conf | 0 .../etc}/polkit-1/rules.d/80-libvirt-manage.rules | 0 {etc => containers/etc}/polkit-1/rules.d/80-rpm-ostree.rules | 0 .../etc}/polkit-1/rules.d/80-systemd-unit-manage.rules | 0 {etc => containers/etc}/profile.d/20-bat-manpager.sh | 0 {etc => containers/etc}/profile.d/20-less.sh | 0 {etc => containers/etc}/profile.d/20-systemd-less.sh | 0 {etc => containers/etc}/profile.d/bash-color-prompt.sh | 0 .../etc}/ssh/sshd_config.d/20-disable-gssapi.conf | 0 .../etc}/ssh/sshd_config.d/20-disable-passwords.conf | 0 {etc => containers/etc}/sysctl.d/20-high-swappines.conf | 0 {etc => containers/etc}/sysctl.d/20-no-page-cluster.conf | 0 {etc => containers/etc}/systemd/resolved.conf | 0 {etc => containers/etc}/systemd/zram-generator.conf | 0 {etc => containers/etc}/vimrc.local | 0 {etc => containers/etc}/yum.repos.d/vscodium.repo | 0 mpv_options => containers/mpv_options | 0 .../usr.nvidia}/lib/bootc/kargs.d/10-nvidia-drivers.toml | 0 {usr => containers/usr}/lib/bootc/kargs.d/10-luks-discard.toml | 0 26 files changed, 3 insertions(+) rename Dockerfile.gnome => containers/Dockerfile.gnome (100%) rename Dockerfile.gnome-nvidia => containers/Dockerfile.gnome-nvidia (100%) rename Dockerfile.kde => containers/Dockerfile.kde (100%) rename Dockerfile.kde-nvidia => containers/Dockerfile.kde-nvidia (100%) rename Dockerfile.kde-nvidia-ver4a => containers/Dockerfile.kde-nvidia-ver4a (100%) rename Dockerfile.kde-ver4a => containers/Dockerfile.kde-ver4a (100%) rename {etc => containers/etc}/dnf/dnf.conf (100%) rename {etc => containers/etc}/polkit-1/rules.d/80-libvirt-manage.rules (100%) rename {etc => containers/etc}/polkit-1/rules.d/80-rpm-ostree.rules (100%) rename {etc => containers/etc}/polkit-1/rules.d/80-systemd-unit-manage.rules (100%) rename {etc => containers/etc}/profile.d/20-bat-manpager.sh (100%) rename {etc => containers/etc}/profile.d/20-less.sh (100%) rename {etc => containers/etc}/profile.d/20-systemd-less.sh (100%) rename {etc => containers/etc}/profile.d/bash-color-prompt.sh (100%) rename {etc => containers/etc}/ssh/sshd_config.d/20-disable-gssapi.conf (100%) rename {etc => containers/etc}/ssh/sshd_config.d/20-disable-passwords.conf (100%) rename {etc => containers/etc}/sysctl.d/20-high-swappines.conf (100%) rename {etc => containers/etc}/sysctl.d/20-no-page-cluster.conf (100%) rename {etc => containers/etc}/systemd/resolved.conf (100%) rename {etc => containers/etc}/systemd/zram-generator.conf (100%) rename {etc => containers/etc}/vimrc.local (100%) rename {etc => containers/etc}/yum.repos.d/vscodium.repo (100%) rename mpv_options => containers/mpv_options (100%) rename {usr.nvidia => containers/usr.nvidia}/lib/bootc/kargs.d/10-nvidia-drivers.toml (100%) rename {usr => containers/usr}/lib/bootc/kargs.d/10-luks-discard.toml (100%) diff --git a/.forgejo/workflows/build-image.yaml b/.forgejo/workflows/build-image.yaml index 557bf2f..e65f864 100644 --- a/.forgejo/workflows/build-image.yaml +++ b/.forgejo/workflows/build-image.yaml @@ -1,5 +1,8 @@ on: push: + paths: + - 'containers/**' + - '.forgejo/workflows/build-image.yaml' schedule: - cron: '0 5 * * *' jobs: diff --git a/Dockerfile.gnome b/containers/Dockerfile.gnome similarity index 100% rename from Dockerfile.gnome rename to containers/Dockerfile.gnome diff --git a/Dockerfile.gnome-nvidia b/containers/Dockerfile.gnome-nvidia similarity index 100% rename from Dockerfile.gnome-nvidia rename to containers/Dockerfile.gnome-nvidia diff --git a/Dockerfile.kde b/containers/Dockerfile.kde similarity index 100% rename from Dockerfile.kde rename to containers/Dockerfile.kde diff --git a/Dockerfile.kde-nvidia b/containers/Dockerfile.kde-nvidia similarity index 100% rename from Dockerfile.kde-nvidia rename to containers/Dockerfile.kde-nvidia diff --git a/Dockerfile.kde-nvidia-ver4a b/containers/Dockerfile.kde-nvidia-ver4a similarity index 100% rename from Dockerfile.kde-nvidia-ver4a rename to containers/Dockerfile.kde-nvidia-ver4a diff --git a/Dockerfile.kde-ver4a b/containers/Dockerfile.kde-ver4a similarity index 100% rename from Dockerfile.kde-ver4a rename to containers/Dockerfile.kde-ver4a diff --git a/etc/dnf/dnf.conf b/containers/etc/dnf/dnf.conf similarity index 100% rename from etc/dnf/dnf.conf rename to containers/etc/dnf/dnf.conf diff --git a/etc/polkit-1/rules.d/80-libvirt-manage.rules b/containers/etc/polkit-1/rules.d/80-libvirt-manage.rules similarity index 100% rename from etc/polkit-1/rules.d/80-libvirt-manage.rules rename to containers/etc/polkit-1/rules.d/80-libvirt-manage.rules diff --git a/etc/polkit-1/rules.d/80-rpm-ostree.rules b/containers/etc/polkit-1/rules.d/80-rpm-ostree.rules similarity index 100% rename from etc/polkit-1/rules.d/80-rpm-ostree.rules rename to containers/etc/polkit-1/rules.d/80-rpm-ostree.rules diff --git a/etc/polkit-1/rules.d/80-systemd-unit-manage.rules b/containers/etc/polkit-1/rules.d/80-systemd-unit-manage.rules similarity index 100% rename from etc/polkit-1/rules.d/80-systemd-unit-manage.rules rename to containers/etc/polkit-1/rules.d/80-systemd-unit-manage.rules diff --git a/etc/profile.d/20-bat-manpager.sh b/containers/etc/profile.d/20-bat-manpager.sh similarity index 100% rename from etc/profile.d/20-bat-manpager.sh rename to containers/etc/profile.d/20-bat-manpager.sh diff --git a/etc/profile.d/20-less.sh b/containers/etc/profile.d/20-less.sh similarity index 100% rename from etc/profile.d/20-less.sh rename to containers/etc/profile.d/20-less.sh diff --git a/etc/profile.d/20-systemd-less.sh b/containers/etc/profile.d/20-systemd-less.sh similarity index 100% rename from etc/profile.d/20-systemd-less.sh rename to containers/etc/profile.d/20-systemd-less.sh diff --git a/etc/profile.d/bash-color-prompt.sh b/containers/etc/profile.d/bash-color-prompt.sh similarity index 100% rename from etc/profile.d/bash-color-prompt.sh rename to containers/etc/profile.d/bash-color-prompt.sh diff --git a/etc/ssh/sshd_config.d/20-disable-gssapi.conf b/containers/etc/ssh/sshd_config.d/20-disable-gssapi.conf similarity index 100% rename from etc/ssh/sshd_config.d/20-disable-gssapi.conf rename to containers/etc/ssh/sshd_config.d/20-disable-gssapi.conf diff --git a/etc/ssh/sshd_config.d/20-disable-passwords.conf b/containers/etc/ssh/sshd_config.d/20-disable-passwords.conf similarity index 100% rename from etc/ssh/sshd_config.d/20-disable-passwords.conf rename to containers/etc/ssh/sshd_config.d/20-disable-passwords.conf diff --git a/etc/sysctl.d/20-high-swappines.conf b/containers/etc/sysctl.d/20-high-swappines.conf similarity index 100% rename from etc/sysctl.d/20-high-swappines.conf rename to containers/etc/sysctl.d/20-high-swappines.conf diff --git a/etc/sysctl.d/20-no-page-cluster.conf b/containers/etc/sysctl.d/20-no-page-cluster.conf similarity index 100% rename from etc/sysctl.d/20-no-page-cluster.conf rename to containers/etc/sysctl.d/20-no-page-cluster.conf diff --git a/etc/systemd/resolved.conf b/containers/etc/systemd/resolved.conf similarity index 100% rename from etc/systemd/resolved.conf rename to containers/etc/systemd/resolved.conf diff --git a/etc/systemd/zram-generator.conf b/containers/etc/systemd/zram-generator.conf similarity index 100% rename from etc/systemd/zram-generator.conf rename to containers/etc/systemd/zram-generator.conf diff --git a/etc/vimrc.local b/containers/etc/vimrc.local similarity index 100% rename from etc/vimrc.local rename to containers/etc/vimrc.local diff --git a/etc/yum.repos.d/vscodium.repo b/containers/etc/yum.repos.d/vscodium.repo similarity index 100% rename from etc/yum.repos.d/vscodium.repo rename to containers/etc/yum.repos.d/vscodium.repo diff --git a/mpv_options b/containers/mpv_options similarity index 100% rename from mpv_options rename to containers/mpv_options diff --git a/usr.nvidia/lib/bootc/kargs.d/10-nvidia-drivers.toml b/containers/usr.nvidia/lib/bootc/kargs.d/10-nvidia-drivers.toml similarity index 100% rename from usr.nvidia/lib/bootc/kargs.d/10-nvidia-drivers.toml rename to containers/usr.nvidia/lib/bootc/kargs.d/10-nvidia-drivers.toml diff --git a/usr/lib/bootc/kargs.d/10-luks-discard.toml b/containers/usr/lib/bootc/kargs.d/10-luks-discard.toml similarity index 100% rename from usr/lib/bootc/kargs.d/10-luks-discard.toml rename to containers/usr/lib/bootc/kargs.d/10-luks-discard.toml