jonathan/bootc
jonathan/bootc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Use copr for Ghostty, remove sudo from shell script

Browse source
This commit is contained in:
Jonathan Cremin 2025-05-17 17:51:58 +01:00
parent 64fc11fc58
commit 6a44899aff
2 changed files with 65 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

18
workstation/Containerfile
View file

@ -24,25 +24,30 @@ RUN dnf remove -y \
virtualbox-guest-additions && \ virtualbox-guest-additions && \
dnf swap -y ffmpeg-free ffmpeg --allowerasing && \ dnf swap -y ffmpeg-free ffmpeg --allowerasing && \
dnf swap -y libavcodec-free libavcodec-freeworld --allowerasing && \ dnf swap -y libavcodec-free libavcodec-freeworld --allowerasing && \
dnf group install -y multimedia --setopt="install_weak_deps=False" --exclude=PackageKit-gstreamer-plugin && \ dnf remove -y pipewire-libs-extra && \
dnf group install -y multimedia --setopt="install_weak_deps=False" --exclude=PackageKit-gstreamer-plugin --allowerasing && \
dnf copr enable -y alternateved/eza && \ dnf copr enable -y alternateved/eza && \
dnf copr enable -y pgdev/ghostty && \
dnf install -y \ dnf install -y \
acpi \ acpi \
akmod-v4l2loopback \ akmod-v4l2loopback \
btop \ btop \
direnv \ direnv \
distrobox \ dmidecode \
eza \ eza \
ffmpegthumbnailer \
ghostty \
git \ git \
gnome-boxes \ gnome-boxes \
gstreamer1-vaapi \ gstreamer1-vaapi \
helm \ helm \
kubectl \ kubectl \
util-linux \
lm_sensors \ lm_sensors \
lshw \
nmcli \
mpv \
ncdu \ ncdu \
pavucontrol \ pavucontrol \
qemu-guest-agent \
sysstat \ sysstat \
tailscale \ tailscale \
vdpauinfo \ vdpauinfo \
@ -55,10 +60,6 @@ RUN dnf remove -y \
# Remove btop and nvtop shortcuts # Remove btop and nvtop shortcuts
RUN rm /usr/share/applications/btop.desktop /usr/share/applications/nvtop.desktop RUN rm /usr/share/applications/btop.desktop /usr/share/applications/nvtop.desktop
# Don't use the ghostty copr for now, it's broken on 42. Download the appimage in userland.
# Todo: Try again when 42 is final.
# RUN dnf copr enable -y pgdev/ghostty && \
# dnf install -y ghostty
# Don't install 1password, the browser integration breaks because 1Password uses /opt. # Don't install 1password, the browser integration breaks because 1Password uses /opt.
# I think this is polkit related. # I think this is polkit related.
@ -76,4 +77,3 @@ LABEL org.opencontainers.image.description="Built on ublue-os/silverblue-main, a
org.opencontainers.image.licenses="Unlicensed" \ org.opencontainers.image.licenses="Unlicensed" \
org.opencontainers.image.revision="" \ org.opencontainers.image.revision="" \
org.opencontainers.image.version="" org.opencontainers.image.version=""

12
workstation/build-push.sh
View file

@ -11,10 +11,10 @@ CURRENT_IMAGE_ID=$(sudo podman images --format "{{.ID}}" cremin.dev/jonathan/ubl
echo "Pulling base image" echo "Pulling base image"
# ensure the base image is up to date # ensure the base image is up to date
sudo -E podman pull ghcr.io/ublue-os/silverblue-main:42 podman pull ghcr.io/ublue-os/silverblue-main:42
echo "Starting build" echo "Starting build"
sudo -E podman build -t cremin.dev/jonathan/ublue-silverblue-main:42 . podman build -t cremin.dev/jonathan/ublue-silverblue-main:42 .
NEW_IMAGE_ID=$(sudo podman images --format "{{.ID}}" cremin.dev/jonathan/ublue-silverblue-main:42) NEW_IMAGE_ID=$(sudo podman images --format "{{.ID}}" cremin.dev/jonathan/ublue-silverblue-main:42)
@ -25,9 +25,9 @@ if [ "$CURRENT_IMAGE_ID" = "$NEW_IMAGE_ID" ]; then
else else
echo "Image updated, pushing to registry" echo "Image updated, pushing to registry"
# Add the tags # Add the tags
sudo -E podman tag cremin.dev/jonathan/ublue-silverblue-main:42 cremin.dev/jonathan/ublue-silverblue-main:42-${DATE_TAG} cremin.dev/jonathan/ublue-silverblue-main:latest podman tag cremin.dev/jonathan/ublue-silverblue-main:42 cremin.dev/jonathan/ublue-silverblue-main:42-${DATE_TAG} cremin.dev/jonathan/ublue-silverblue-main:latest
# Push the image # Push the image
sudo -E podman push --authfile ~/.config/containers/auth.json cremin.dev/jonathan/ublue-silverblue-main:42-${DATE_TAG} podman push --authfile ~/.config/containers/auth.json cremin.dev/jonathan/ublue-silverblue-main:42-${DATE_TAG}
sudo -E podman push --authfile ~/.config/containers/auth.json cremin.dev/jonathan/ublue-silverblue-main:42 podman push --authfile ~/.config/containers/auth.json cremin.dev/jonathan/ublue-silverblue-main:42
sudo -E podman push --authfile ~/.config/containers/auth.json cremin.dev/jonathan/ublue-silverblue-main:latest podman push --authfile ~/.config/containers/auth.json cremin.dev/jonathan/ublue-silverblue-main:latest
fi fi