Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/bluefin-main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
ethanjli committed Nov 22, 2023
2 parents 1ef8573 + 3b84b1f commit 340004f
Show file tree
Hide file tree
Showing 10 changed files with 260 additions and 187 deletions.
36 changes: 36 additions & 0 deletions .github/ISSUE_TEMPLATE/bug-report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: Bug Report
description: Report an issue about using Bluefin
body:
- type: markdown
attributes:
value: |
Thank you for taking the time to fill out this bug report! (She bites sometimes)
- type: textarea
id: describe-bug
attributes:
label: Describe the bug
description: A clear and concise description of what the bug is.
placeholder: Tell us what happened!
value: "When I entered 2 + 2, I got the answer 6."
validations:
required: true
- type: textarea
id: expected-bahavior
attributes:
label: What did you expect to happen?
description: A clear and concise description of what you expected to happen.
placeholder: What were you expecting to happen?
value: "I expected 2 + 2 to equal 4, but instead 2 + 2 equaled 6!"
validations:
required: true
- type: textarea
id: version
attributes:
label: Output of `rpm-ostree status`
description: Please run `rpm-ostree status` and paste the output here.
render: shell
- type: textarea
id: extra-context
attributes:
label: Extra information or context
description: Add any other context about the problem here.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
blank_issues_enabled: true
contact_links:
- name: Questions and Feedback
url: https://github.com/orgs/ublue-os/discussions/categories/bluefin
url: https://universal-blue.discourse.group/c/bluefin/6
about: Ask a question, share tips, and help others
3 changes: 3 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ jobs:
- name: Checkout Push to Registry action
uses: actions/checkout@v4

- name: Check just syntax
uses: ublue-os/just-action@v1

- name: Matrix Variables
run: |
if [[ "${{ matrix.image_flavor }}" == "main" ]]; then
Expand Down
8 changes: 2 additions & 6 deletions Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,13 @@ RUN wget https://copr.fedorainfracloud.org/coprs/ublue-os/bling/repo/fedora-$(rp
fc-cache -f /usr/share/fonts/inter && \
find /tmp/just -iname '*.just' -exec printf "\n\n" \; -exec cat {} \; >> /usr/share/ublue-os/just/60-custom.just && \
rm -f /etc/yum.repos.d/tailscale.repo && \
rm -f /etc/yum.repos.d/charm.repo && \
rm -f /etc/yum.repos.d/_copr_ublue-os-bling.repo && \
rm -f /etc/yum.repos.d/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo && \
rm -f /usr/share/applications/fish.desktop && \
rm -f /usr/share/applications/htop.desktop && \
rm -f /usr/share/applications/nvtop.desktop && \
rm -fr /usr/share/applications/gnome-system-monitor.desktop && \
sed -i 's/#DefaultTimeoutStopSec.*/DefaultTimeoutStopSec=15s/' /etc/systemd/user.conf && \
sed -i 's/#DefaultTimeoutStopSec.*/DefaultTimeoutStopSec=15s/' /etc/systemd/system.conf && \
sed -i '/^PRETTY_NAME/s/Kinoite/Lutho/' /usr/lib/os-release && \
Expand Down Expand Up @@ -137,12 +139,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

# Install Charm gum
RUN rpm-ostree install $(curl https://api.github.com/repos/charmbracelet/gum/releases/latest | jq -r '.assets[] | select(.name| test(".*.x86_64.rpm$")).browser_download_url')

# Install Charm glow
RUN rpm-ostree install $(curl https://api.github.com/repos/charmbracelet/glow/releases/latest | jq -r '.assets[] | select(.name| test(".*.x86_64.rpm$")).browser_download_url')

# Set up services
RUN systemctl enable podman.socket && \
systemctl disable pmie.service && \
Expand Down
2 changes: 1 addition & 1 deletion dx/usr/share/ublue-os/distrobox/pytorch-nvidia.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[mlbox]
image=nvcr.io/nvidia/pytorch:23.09-py3
image=nvcr.io/nvidia/pytorch:23.10-py3
additional_packages="nano git htop"
init_hooks="pip3 install huggingface_hub tokenizers transformers accelerate datasets wandb peft bitsandbytes fastcore fastprogress watermark torchmetrics deepspeed"
#pre-init-hooks="/init_script.sh"
Expand Down
6 changes: 6 additions & 0 deletions etc/yum.repos.d/charm.repo
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[charm]
name=Charm
baseurl=https://repo.charm.sh/yum/
enabled=1
gpgcheck=1
gpgkey=https://repo.charm.sh/yum/gpg.key
Loading

0 comments on commit 340004f

Please sign in to comment.