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

[pull] bluefin-main from ublue-os:main #48

Merged
merged 4 commits into from
Dec 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
104 changes: 104 additions & 0 deletions .github/workflows/build-bluefin-toolbox.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
name: Build and Push Bluefin Toolbox Image
on:
schedule:
- cron: '20 22 * * *' # 10:20pm everyday
pull_request:
merge_group:
workflow_dispatch:
env:
IMAGE_NAME: bluefin-cli
IMAGE_TAGS: latest
IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }}

concurrency:
group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
cancel-in-progress: true

jobs:
push-ghcr:
name: Build and push image
runs-on: ubuntu-22.04
permissions:
contents: read
packages: write
id-token: write
strategy:
fail-fast: false
steps:
# Checkout push-to-registry action GitHub repository
- name: Checkout Push to Registry action
uses: actions/checkout@v4

# Build metadata
- name: Image Metadata
uses: docker/metadata-action@v5
id: meta
with:
images: |
${{ env.IMAGE_NAME }}
labels: |
io.artifacthub.package.readme-url=https://raw.githubusercontent.com/ublue-os/boxkit/main/README.md

# Build image using Buildah action
- name: Build Image
id: build_image
uses: redhat-actions/buildah-build@v2
with:
containerfiles: |
./toolboxes/Containerfile.bluefin-cli
image: ${{ env.IMAGE_NAME }}
tags: ${{ env.IMAGE_TAGS }}
labels: ${{ steps.meta.outputs.labels }}
oci: false

# Workaround bug where capital letters in your GitHub username make it impossible to push to GHCR.
# https://github.com/macbre/push-to-ghcr/issues/12
- name: Lowercase Registry
id: registry_case
uses: ASzc/change-string-case-action@v6
with:
string: ${{ env.IMAGE_REGISTRY }}

# Push the image to GHCR (Image Registry)
- name: Push To GHCR
uses: redhat-actions/push-to-registry@v2
if: github.event_name != 'pull_request'
id: push
env:
REGISTRY_USER: ${{ github.actor }}
REGISTRY_PASSWORD: ${{ github.token }}
with:
image: ${{ steps.build_image.outputs.image }}
tags: ${{ steps.build_image.outputs.tags }}
registry: ${{ steps.registry_case.outputs.lowercase }}
username: ${{ env.REGISTRY_USER }}
password: ${{ env.REGISTRY_PASSWORD }}
extra-args: |
--disable-content-trust

- name: Login to GitHub Container Registry
uses: docker/login-action@v3
if: github.event_name != 'pull_request'
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

# Sign container
- uses: sigstore/[email protected]
if: github.event_name != 'pull_request'

- name: Sign container image
if: github.event_name != 'pull_request'
run: |
echo "${{ env.COSIGN_PRIVATE_KEY }}" > cosign.key
wc -c cosign.key
cosign sign -y --key cosign.key ${{ steps.registry_case.outputs.lowercase }}/${{ env.IMAGE_NAME }}@${TAGS}
env:
TAGS: ${{ steps.push.outputs.digest }}
COSIGN_EXPERIMENTAL: false
COSIGN_PRIVATE_KEY: ${{ secrets.SIGNING_SECRET }}

- name: Echo outputs
run: |
echo "${{ toJSON(steps.push.outputs) }}"
10 changes: 10 additions & 0 deletions just/custom.just
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,16 @@ aqua:
printf '\n export PATH="${AQUA_ROOT_DIR:-${XDG_DATA_HOME:-$HOME/.local/share}/aquaproj-aqua}/bin:$PATH"\n'
printf '\n=> see https://aquaproj.github.io/docs/tutorial for more info\n'

[private]
bluefin-cli:
#!/usr/bin/env bash
if [ ! -f "${HOME}/.brew_pkgs" ]; then
echo dysk > "${HOME}/.brew_pkgs"
fi;
distrobox-create --nvidia --image ghcr.io/ublue-os/bluefin-cli:latest -n bluefin-cli -Y -a "--env BREW_PKGS=.brew_pkgs"
echo "Entering bluefin-cli"
distrobox enter bluefin-cli

# Enable Cockpit for web-based system management | https://cockpit-project.org/
cockpit:
echo 'Enabling Cockpit'
Expand Down
27 changes: 0 additions & 27 deletions packages.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@
],
"bluefin-dx": [
"adobe-source-code-pro-fonts",
"bison",
"byacc",
"cascadiacode-nerd-fonts",
"cockpit-machines",
"cockpit-networkmanager",
Expand All @@ -54,44 +52,25 @@
"cockpit-system",
"code",
"containerd.io",
"cscope",
"ctags",
"curl",
"cvs",
"dbus-x11",
"diffstat",
"docker-ce",
"docker-ce-cli",
"docker-buildx-plugin",
"docker-compose-plugin",
"doxygen",
"edk2-ovmf",
"edk2-ovmf",
"file",
"flex",
"gcc",
"gcc-c++",
"gcc-fortran",
"genisoimage",
"gettext",
"git",
"google-droid-sans-mono-fonts",
"google-go-mono-fonts",
"ibm-plex-mono-fonts",
"incus",
"incus-agent",
"indent",
"intltool",
"iotop",
"jetbrains-mono-fonts-all",
"libtool",
"libvirt",
"lxc",
"lxd-agent",
"lxd",
"mozilla-fira-mono-fonts",
"patch",
"patchutils",
"p7zip-plugins",
"p7zip",
"podman-compose",
Expand All @@ -100,7 +79,6 @@
"podmansh",
"powerline-fonts",
"powertop",
"procps-ng",
"qemu-char-spice",
"qemu-device-display-virtio-gpu",
"qemu-device-display-virtio-vga",
Expand All @@ -110,11 +88,6 @@
"qemu-user-binfmt",
"qemu-user-static",
"qemu",
"rcs",
"redhat-rpm-config",
"subversion",
"swig",
"systemtap",
"ubuntu-nerd-fonts",
"ubuntumono-nerd-fonts",
"virt-manager",
Expand Down
29 changes: 29 additions & 0 deletions toolboxes/Containerfile.bluefin-cli
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
FROM ghcr.io/homebrew/brew
# From https://github.com/Homebrew/brew/pkgs/container/brew

LABEL com.github.containers.toolbox="true" \
usage="This image is meant to be used with the toolbox or distrobox command" \
summary="The Bluefin Command Line experience" \
maintainer="[email protected]"

COPY ./toolboxes/packages.bluefin-cli /toolbox-packages
COPY ./toolboxes/brew_script.bluefin-cli /etc/profile.d/brew_pkgs.sh

USER root

RUN apt-get update && \
apt-get upgrade -y && \
DEBIAN_FRONTEND=noninteractive apt-get -y install \
$(cat /toolbox-packages | xargs) && \
rm -rd /var/lib/apt/lists/*

RUN rm /toolbox-packages

RUN 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

RUN echo "ALL ALL = (ALL) NOPASSWD: ALL" >> /etc/sudoers

USER linuxbrew
8 changes: 8 additions & 0 deletions toolboxes/brew_script.bluefin-cli
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/usr/bin/env bash
if [ ! -f /home/linuxbrew/.firstrun ] && [ -n "${BREW_PKGS}" ]; then
touch /home/linuxbrew/.firstrun
# `brew update-reset` is currently needed
# because somekind of issue with brew
brew update-reset
xargs brew install < "${HOME}"/"${BREW_PKGS}"
fi
47 changes: 47 additions & 0 deletions toolboxes/packages.bluefin-cli
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
bash
apt-utils
bash-completion
bc
bzip2
curl
dialog
diffutils
findutils
gnupg
gnupg2
gpgsm
hostname
iproute2
iputils-ping
less
locales
lsof
man-db
manpages
ncurses-base
nano
openssh-client
passwd
pigz
pinentry-curses
procps
rsync
sudo
tcpdump
time
traceroute
tree
tzdata
unzip
util-linux
wget
xauth
xz-utils
zip
libgl1
libegl1-mesa
libgl1-mesa-glx
libegl1
libglx-mesa0
libvulkan1
mesa-vulkan-drivers