From bacee5fdf767f228dd74708546bebe0115bb5356 Mon Sep 17 00:00:00 2001 From: Jonathan Cremin Date: Sun, 25 May 2025 10:30:22 +0100 Subject: [PATCH] Add readme and license, small tidy up --- LICENSE | 7 +++++++ README.md | 7 +++++++ workstation-nvidia/Containerfile | 33 -------------------------------- workstation/Containerfile | 6 ------ 4 files changed, 14 insertions(+), 39 deletions(-) create mode 100644 LICENSE create mode 100644 README.md diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..4a3665e --- /dev/null +++ b/LICENSE @@ -0,0 +1,7 @@ +Copyright 2025 Jonathan Cremin + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/README.md b/README.md new file mode 100644 index 0000000..171adc3 --- /dev/null +++ b/README.md @@ -0,0 +1,7 @@ +# bootc + +This is an experiment in running bootable containers with [bootc](https://bootc-dev.github.io/bootc/) and [rpm-ostree](https://coreos.github.io/rpm-ostree/) on my workstations. + +## License + +[MIT](LICENSE) \ No newline at end of file diff --git a/workstation-nvidia/Containerfile b/workstation-nvidia/Containerfile index 0d78db2..f1bfa1e 100755 --- a/workstation-nvidia/Containerfile +++ b/workstation-nvidia/Containerfile @@ -58,7 +58,6 @@ RUN dnf remove -y \ # Clean up dnf clean all - # Setup watercooling RUN dnf copr enable -y codifryed/CoolerControl && \ dnf install -y coolercontrol && \ @@ -72,14 +71,6 @@ RUN dnf config-manager addrepo --from-repofile=https://rpm.releases.hashicorp.co # Remove btop and nvtop shortcuts RUN rm /usr/share/applications/btop.desktop /usr/share/applications/nvtop.desktop -# Don't install 1password, the browser integration breaks because 1Password uses /opt. -# I think this is polkit related. -# RUN mkdir -p /var/opt -# COPY scripts/1password.sh /tmp/1password.sh -# RUN /bin/sh /tmp/1password.sh - -# RUN authselect enable-feature with-fingerprint - LABEL org.opencontainers.image.description="Built on ublue-os/silverblue-main, adding more batteries" \ org.opencontainers.image.source="https://cremin.dev/jonathan/bootc" \ org.opencontainers.image.title="ublue-silverblue-nvidia" \ @@ -89,27 +80,3 @@ LABEL org.opencontainers.image.description="Built on ublue-os/silverblue-main, a org.opencontainers.image.revision="" \ org.opencontainers.image.version="" - - - -# FROM cremin.dev/jonathan/fedora-bootc-base:42 - -# RUN echo "blacklist nouveau" > /etc/modprobe.d/blacklist_nouveau.conf - -# RUN dnf install -y --allowerasing \ -# akmod-nvidia \ -# libva-nvidia-driver \ -# nvidia-container-toolkit \ -# nvidia-vaapi-driver \ -# xorg-x11-drv-nvidia \ -# xorg-x11-drv-nvidia-cuda \ -# xorg-x11-drv-nvidia-cuda-libs \ -# xorg-x11-drv-nvidia-power && \ -# # Clean up -# dnf clean all - -# RUN akmods --force --kernels `rpm -q --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}' kernel-devel` - -# RUN systemctl enable nvidia-toolkit-firstboot.service - -# COPY kargs-nvidia.toml /usr/lib/bootc/kargs.d/nvidia.toml diff --git a/workstation/Containerfile b/workstation/Containerfile index b923813..1995923 100644 --- a/workstation/Containerfile +++ b/workstation/Containerfile @@ -65,12 +65,6 @@ RUN dnf config-manager addrepo --from-repofile=https://rpm.releases.hashicorp.co # Remove btop and nvtop shortcuts RUN rm /usr/share/applications/btop.desktop /usr/share/applications/nvtop.desktop -# Don't install 1password, the browser integration breaks because 1Password uses /opt. -# I think this is polkit related. -# RUN mkdir -p /var/opt -# COPY scripts/1password.sh /tmp/1password.sh -# RUN /bin/sh /tmp/1password.sh - RUN authselect enable-feature with-fingerprint LABEL org.opencontainers.image.description="Built on ublue-os/silverblue-main, adding more batteries" \