Skip to content
This repository has been archived by the owner on May 18, 2024. It is now read-only.

Commit

Permalink
feat: bluefin-cli custom
Browse files Browse the repository at this point in the history
  • Loading branch information
auricom committed Apr 20, 2024
1 parent 5d29523 commit 1fe8e6c
Show file tree
Hide file tree
Showing 5 changed files with 63 additions and 46 deletions.
23 changes: 23 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
; https://editorconfig.org/

root = true

[*]
indent_style = space
indent_size = 2
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[{Makefile,go.mod,go.sum,*.go,.gitmodules}]
indent_style = tab
indent_size = 4

[{*.md,*.toml}]
indent_size = 4
trim_trailing_whitespace = false

[{Containerfile,Dockerfile,*.bash,*.sh}]
indent_style = space
indent_size = 4
6 changes: 3 additions & 3 deletions .github/workflows/build-boxkit.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
name: build-boxkit
name: build-bluefin-toolbox
on:
pull_request:
branches:
- main
schedule:
- cron: '0 0 * * TUE'
- cron: 26 7,19 * * * # (26 minutes after ublue-os/toolbox/bluefin-cli builds)
push:
branches:
- main
paths-ignore:
- '**/README.md'
env:
IMAGE_NAME: boxkit
IMAGE_NAME: bluefin-cli
IMAGE_TAGS: latest
IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }}

Expand Down
37 changes: 20 additions & 17 deletions Containerfile
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
FROM quay.io/toolbx-images/alpine-toolbox:edge
FROM ghcr.io/ublue-os/bluefin-cli:latest

LABEL com.github.containers.toolbox="true" \
usage="This image is meant to be used with the toolbox or distrobox command" \
summary="A cloud-native terminal experience" \
maintainer="jorge.castro@gmail.com"
LABEL com.github.containers.toolbox="true" \
usage="This image is meant to be used with the Toolbox or Distrobox commands" \
summary="A new cloud-native terminal experience powered by Wolfi and Homebrew" \
maintainer="27022259+auricom@users.noreply.github.com"

COPY extra-packages /
RUN apk update && \
apk upgrade && \
grep -v '^#' /extra-packages | xargs apk add
RUN rm /extra-packages
COPY ./extra-packages /extra-packages

RUN ln -fs /bin/sh /usr/bin/sh && \
ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/docker && \
ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/flatpak && \
ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/podman && \
ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/rpm-ostree && \
ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/transactional-update

# Remove default fish bling script, Install extra packages, nix-portable and devbox
RUN \
rm usr/share/fish/vendor_conf.d/bling.fish && \
grep -v '^#' /extra-packages | xargs apk add && \
rm /extra-packages && \
wget --output-document /usr/bin/nix-portable \
https://github.com/DavHau/nix-portable/releases/latest/download/nix-portable-$(uname -m) && \
chmod +x /usr/bin/nix-portable && \
ln -s /usr/bin/nix-portable /usr/bin/nix && \
ln -s /usr/bin/nix-portable /usr/bin/nix-shell && \
curl -fsSL https://get.jetify.com/devbox | bash -s -- --force && \
mv /usr/local/bin/devbox /usr/bin/devbox

ENV NP_GIT=/usr/bin/git
6 changes: 3 additions & 3 deletions cosign.pub
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-----BEGIN PUBLIC KEY-----
MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE7lh7fJMV4dBT2jT1XafixUJa7OVA
cT+QFVD8IfIJIS/KBAc8hx1aslzkH3tfeM0cwyCLB7kOStZ4sh6RyFQD9w==
-----END PUBLIC KEY-----
MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE/tZcxAuuK/qIKSMWfr5Rux5yRXHC
V8y2Xx4XGkqXyp3yVh5QXzhKe9k7bbTBwF4nhJp5XvlQfmPKu6Ohn1cknA==
-----END PUBLIC KEY-----
37 changes: 14 additions & 23 deletions extra-packages
Original file line number Diff line number Diff line change
@@ -1,31 +1,22 @@
age
atuin
btop
bat
brew
btop
chezmoi
clipboard
cosign
dbus-x11
direnv
eza
ffmpeg
fd
fish
fzf
github-cli
helix
just
make
micro
ncdu
ncurses
neofetch
neovim
npm
plocate
python3
gawk
mc
nmap
rclone
ripgrep
speedtest-cli
sed
starship
vimdiff
wl-clipboard
zellij
zstd
systemd
task
tig
uutils
zoxide

0 comments on commit 1fe8e6c

Please sign in to comment.