Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add bluefin CLI packages from wolfi #1001

Merged
merged 11 commits into from
Mar 12, 2024
Merged

feat: add bluefin CLI packages from wolfi #1001

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5443835
feat: add bluefin CLI packages from wolfi
castrojo Mar 4, 2024
15aa217
fix: ripgrep
bketelsen Mar 4, 2024
4aa2473
Merge branch 'main' into castrojo-patch-1
bketelsen Mar 4, 2024
0a33565
feat: source rclone/restic from wolfi
castrojo Mar 4, 2024
fc557b1
fix: leave rclone from distro
castrojo Mar 4, 2024
5f381e5
Merge branch 'main' into castrojo-patch-1
bketelsen Mar 4, 2024
1d03326
fix: add restic back
castrojo Mar 4, 2024
e1a9e8f
fix: revert to distro restic
castrojo Mar 4, 2024
bc87bb4
fix: remove rclone too
castrojo Mar 4, 2024
f61c252
Merge branch 'main' into castrojo-patch-1
castrojo Mar 4, 2024
2cef0b3
Merge branch 'main' into castrojo-patch-1
castrojo Mar 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,15 @@ RUN curl -Lo /tmp/starship.tar.gz "https://github.com/starship/starship/releases
install -c -m 0755 /tmp/starship /usr/bin && \
echo 'eval "$(starship init bash)"' >> /etc/bashrc

# Copy atuin from bluefin-cli
# Copy Bluefin CLI packages
COPY --from=ghcr.io/ublue-os/bluefin-cli /usr/bin/atuin /usr/bin/atuin
COPY --from=ghcr.io/ublue-os/bluefin-cli /usr/share/bash-prexec /usr/share/bash-prexec
COPY --from=ghcr.io/ublue-os/bluefin-cli /usr/bin/eza /usr/bin/eza
COPY --from=ghcr.io/ublue-os/bluefin-cli /usr/bin/fd /usr/bin/fd
COPY --from=ghcr.io/ublue-os/bluefin-cli /usr/bin/fzf /usr/bin/fzf
COPY --from=ghcr.io/ublue-os/bluefin-cli /usr/bin/restic /usr/bin/restic
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's remove restic for right now. The package in wolfi doesn't seem to provide the binary correctly.

COPY --from=ghcr.io/ublue-os/bluefin-cli /usr/bin/rg /usr/bin/rg
COPY --from=ghcr.io/ublue-os/bluefin-cli /usr/bin/zoxide /usr/bin/zoxide

RUN wget https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-"${FEDORA_MAJOR_VERSION}"/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo && \
wget https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh -O /usr/libexec/brew-install && \
Expand Down
3 changes: 1 addition & 2 deletions packages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
"pulseaudio-utils",
"python3-pip",
"rclone",
"restic",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's keep this here for now.

"samba-dcerpc",
"samba-ldb-ldap-modules",
"samba-winbind-clients",
Expand Down Expand Up @@ -62,7 +61,7 @@
"code",
"containerd.io",
"dbus-x11",
"devpod",
"devpod",
"distrobuilder",
"docker-ce",
"docker-ce-cli",
Expand Down
Loading