From 4529836464ec5bb1decc5440f5875e48bf82258b Mon Sep 17 00:00:00 2001 From: Robert Sturla Date: Thu, 21 Sep 2023 23:45:33 +0100 Subject: [PATCH 1/8] feat: install starship bash prompt in all images (#503) --- Containerfile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Containerfile b/Containerfile index 58193071e85..76c88af5f17 100644 --- a/Containerfile +++ b/Containerfile @@ -28,6 +28,12 @@ RUN wget https://copr.fedorainfracloud.org/coprs/rhcontainerbot/bootc/repo/fedor RUN rpm-ostree install bootc RUN rm -f /etc/yum.repos.d/bootc-"${FEDORA_MAJOR_VERSION}".repo +# Starship Shell Prompt +RUN curl -Lo /tmp/starship.tar.gz "https://github.com/starship/starship/releases/latest/download/starship-x86_64-unknown-linux-gnu.tar.gz" && \ + tar -xzf /tmp/starship.tar.gz -C /tmp && \ + install -c -m 0755 /tmp/starship /usr/bin && \ + echo 'eval "$(starship init bash)"' >> /etc/bashrc + RUN /tmp/build.sh && \ pip install --prefix=/usr yafti && \ systemctl enable rpm-ostree-countme.service && \ @@ -92,8 +98,6 @@ RUN wget https://raw.githubusercontent.com/ahmetb/kubectx/master/kubectx -O /usr wget https://raw.githubusercontent.com/ahmetb/kubectx/master/kubens -O /usr/bin/kubens && \ chmod +x /usr/bin/kubectx /usr/bin/kubens - - RUN systemctl enable podman.socket RUN systemctl disable pmie.service RUN systemctl disable pmlogger.service From 5d5637211b2480fb33d6e017a8ec6b3fd585abdc Mon Sep 17 00:00:00 2001 From: "Jorge O. Castro" Date: Fri, 22 Sep 2023 02:11:50 -0700 Subject: [PATCH 2/8] fix(distrobox): update fedora image url (#509) --- usr/etc/distrobox/distrobox.ini | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr/etc/distrobox/distrobox.ini b/usr/etc/distrobox/distrobox.ini index 754277e8fbc..b4738647aee 100644 --- a/usr/etc/distrobox/distrobox.ini +++ b/usr/etc/distrobox/distrobox.ini @@ -3,7 +3,7 @@ image=ghcr.io/ublue-os/ubuntu-toolbox:latest #additional_packages=" " #export=" " init=false -nvidia=false +nvidia=true pull=true root=false replace=true @@ -15,11 +15,11 @@ replace=true # See https://distrobox.privatedns.org/usage/distrobox-assemble/ #[fedora] -#image=registry.fedoraproject.org/fedora-toolbox:latest +#image=ghcr.io/ublue-os/fedora-toolbox:latest #additional_packages="ansible lynx chromium neofetch cmus" #export="app chromium" #init=false -#nvidia=false +#nvidia=true #pull=true #root=false #replace=true @@ -27,7 +27,7 @@ replace=true #[wolfi] #image=ghcr.io/ublue-os/wolfi-toolbox:latest #init=false -#nvidia=false +#nvidia=true #pull=true #root=false #replace=true From 079ad2112e591c34704b37c6bc4526a190357b72 Mon Sep 17 00:00:00 2001 From: "Jorge O. Castro" Date: Fri, 22 Sep 2023 02:12:13 -0700 Subject: [PATCH 3/8] feat: add input-leap (#510) --- packages.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages.json b/packages.json index 76955ea238e..36fc4136a9c 100644 --- a/packages.json +++ b/packages.json @@ -111,7 +111,9 @@ }, "39": { "include": { - "bluefin": [], + "bluefin": [ + "input-leap" + ], "bluefin-dx": [], "bluefin-framework": [] }, From f32a434e27ed62622421c81d29d962bf8c314fae Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Fri, 22 Sep 2023 16:48:25 -0700 Subject: [PATCH 4/8] feat: Switch to new justfile system (#506) --- usr/share/ublue-os/just/{custom.just => 60-custom.just} | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) rename usr/share/ublue-os/just/{custom.just => 60-custom.just} (99%) diff --git a/usr/share/ublue-os/just/custom.just b/usr/share/ublue-os/just/60-custom.just similarity index 99% rename from usr/share/ublue-os/just/custom.just rename to usr/share/ublue-os/just/60-custom.just index 9abeb41cf92..9e99674630f 100644 --- a/usr/share/ublue-os/just/custom.just +++ b/usr/share/ublue-os/just/60-custom.just @@ -1,3 +1,5 @@ +# vim: set ft=make : + # Run a one minute system benchmark benchmark: echo 'Running a 1 minute benchmark ...' @@ -198,7 +200,7 @@ distrobox-git: # Run the yafti setup tool yafti: - yafti /etc/yafti.yml + yafti /etc/yafti.yml --force # Switch to the zsh shell zsh: From 0d2540a3a56feda94ce7b9b99489e2648b48273c Mon Sep 17 00:00:00 2001 From: "Jorge O. Castro" Date: Fri, 22 Sep 2023 21:05:28 -0400 Subject: [PATCH 5/8] chore(ci): add a general check (#512) --- .github/workflows/build.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2fdfdd919a9..743c763129d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -175,3 +175,12 @@ jobs: if: github.event_name != 'pull_request' run: | echo "${{ toJSON(steps.push.outputs) }}" + + check: + name: Check all builds successful + runs-on: ubuntu-latest + needs: [push-ghcr] + steps: + - name: Exit + shell: bash + run: exit 0 From e723c14177b976648bf09f8a9b7f42234687187c Mon Sep 17 00:00:00 2001 From: RJ Trujillo Date: Sat, 23 Sep 2023 09:38:14 -0600 Subject: [PATCH 6/8] feat: Enable builds without kmods (#514) --- .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 743c763129d..d7c2df8a2be 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ jobs: strategy: fail-fast: false matrix: - image_flavor: [main, nvidia] + image_flavor: [main, nokmods, nvidia] base_name: [bluefin, bluefin-dx] major_version: [38, 39] include: From f6bdb7f6b4e95eb345193f73a2ba4afda63ea541 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Sat, 23 Sep 2023 10:21:52 -0700 Subject: [PATCH 7/8] feat: Add additional packages to Wolfi container for Distrobox (#515) --- toolboxes/Containerfile.wolfi | 46 +++++++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/toolboxes/Containerfile.wolfi b/toolboxes/Containerfile.wolfi index d76c02549fc..44c21286b65 100644 --- a/toolboxes/Containerfile.wolfi +++ b/toolboxes/Containerfile.wolfi @@ -8,9 +8,51 @@ LABEL com.github.containers.toolbox="true" \ COPY ./toolboxes/packages.wolfi /toolbox-packages +# Update image & add dependencies RUN apk update && \ - apk upgrade && \ - grep -v '^#' /toolbox-packages | xargs apk add + apk upgrade + +# Add Distrobox specific packages +# Remove procps due to conflict with coreutils +RUN apk del procps && \ + apk add sudo-rs \ + coreutils \ + bash \ + bzip2 \ + curl \ + diffutils \ + findmnt \ + findutils \ + git \ + gpg \ + iproute2 \ + iputils \ + keyutils \ + libcap \ + ncurses \ + ncurses-terminfo \ + net-tools \ + openssh-client \ + posix-libc-utils \ + rsync \ + tcpdump \ + tree \ + umount \ + util-linux \ + util-linux-misc \ + wget \ + xz \ + zip + +# Set up dependencies +RUN git clone https://github.com/89luca89/distrobox.git --single-branch /tmp/distrobox && \ + cp /tmp/distrobox/distrobox-host-exec /usr/bin/distrobox-host-exec && \ + wget https://github.com/1player/host-spawn/releases/download/$(cat /tmp/distrobox/distrobox-host-exec | grep host_spawn_version= | cut -d "\"" -f 2)/host-spawn-$(uname -m) -O /usr/bin/host-spawn && \ + chmod +x /usr/bin/host-spawn && \ + rm -drf /tmp/distrobox && \ + +# Add optional packages +RUN grep -v '^#' /toolbox-packages | xargs apk add RUN rm /toolbox-packages From 7fd650ea9024ac6058cb139433e6cc8c9430553c Mon Sep 17 00:00:00 2001 From: bobslept <38557801+bobslept@users.noreply.github.com> Date: Sat, 23 Sep 2023 19:12:57 +0200 Subject: [PATCH 8/8] fix: remove framework related just kargs (#513) --- usr/share/ublue-os/just/60-custom.just | 4 ---- 1 file changed, 4 deletions(-) diff --git a/usr/share/ublue-os/just/60-custom.just b/usr/share/ublue-os/just/60-custom.just index 9e99674630f..2e5eb1626e6 100644 --- a/usr/share/ublue-os/just/60-custom.just +++ b/usr/share/ublue-os/just/60-custom.just @@ -105,10 +105,6 @@ distrobox-universal: echo 'Creating Universal Development distrobox ...' distrobox create --image mcr.microsoft.com/devcontainers/universal:latest -n universal -Y -# Add boot parameters needed for a Framework 13 laptop -framework-13: - rpm-ostree kargs --append="module_blacklist=hid_sensor_hub" --append="nvme.noacpi=1" --append="tpm_tis.interrupts=0" --append="rd.luks.options=discard" - # Switch to the fish shell fish: sudo lchsh $USER /usr/bin/fish