diff --git a/fetch.sh b/fetch.sh index 027fbcd..9fcc883 100644 --- a/fetch.sh +++ b/fetch.sh @@ -2,12 +2,26 @@ set -euo pipefail FILES_ROOT="/tmp/ublue-os/files" -wget -O /tmp/devpod "https://github.com/loft-sh/devpod/releases/latest/download/devpod-linux-amd64" -install -c -m 0755 /tmp/devpod "$FILES_ROOT/usr/bin" - -wget -O /tmp/devpod.rpm https://github.com/loft-sh/devpod/releases/latest/download/DevPod_linux_x86_64.rpm -mv /tmp/devpod.rpm /tmp/ublue-os/rpms - wget -O /tmp/intelmono.zip 'https://github.com/intel/intel-one-mono/releases/latest/download/ttf.zip' unzip /tmp/intelmono.zip -d "/tmp/intelmono" mv /tmp/intelmono/ttf "$FILES_ROOT/usr/share/fonts/intel-one-mono" + +wget -O /tmp/ublue-os/rpms/devpod.rpm "https://github.com/loft-sh/devpod/releases/latest/download/DevPod_linux_x86_64.rpm" + +wget -O /tmp/devpod "https://github.com/loft-sh/devpod/releases/latest/download/devpod-linux-amd64" +install -c -m 0755 /tmp/devpod "$FILES_ROOT/usr/bin" + +wget -O /tmp/docker-compose 'https://github.com/docker/compose/releases/latest/download/docker-compose-linux-x86_64' +install -c -m 0755 /tmp/docker-compose "$FILES_ROOT/usr/bin" + +wget -O /tmp/kind "https://github.com/kubernetes-sigs/kind/releases/latest/download/kind-linux-amd64" +install -c -m 0755 /tmp/kind "$FILES_ROOT/usr/bin" + +wget -O /tmp/kubectx "https://raw.githubusercontent.com/ahmetb/kubectx/master/kubectx" +install -c -m 0755 /tmp/kubectx "$FILES_ROOT/usr/bin" + +wget -O /tmp/kubens "https://raw.githubusercontent.com/ahmetb/kubectx/master/kubens" +install -c -m 0755 /tmp/kubens "$FILES_ROOT/usr/bin" + +export DIVE_VERSION=$(curl -sL "https://api.github.com/repos/wagoodman/dive/releases/latest" | grep '"tag_name":' | sed -E 's/.*"v([^"]+)".*/\1/') +wget -O /tmp/ublue-os/rpms/dive.rpm "https://github.com/wagoodman/dive/releases/download/v${DIVE_VERSION}/dive_${DIVE_VERSION}_linux_amd64.rpm" diff --git a/modules/bling/README.md b/modules/bling/README.md index a261f90..4beb530 100644 --- a/modules/bling/README.md +++ b/modules/bling/README.md @@ -18,4 +18,6 @@ install: # - dconf-update-service # a service unit that updates the dconf db on boot # - devpod # https://devpod.sh/ as an rpm # - gnome-vrr # enables gnome-vrr for your image + # - container-tools # installs container-related tools onto /usr/bin: kind, kubectx, docker-compose and kubens + ``` diff --git a/modules/bling/installers/container-tools.sh b/modules/bling/installers/container-tools.sh new file mode 100644 index 0000000..4d76425 --- /dev/null +++ b/modules/bling/installers/container-tools.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +# Tell build process to exit if there are any errors. +set -oue pipefail + +install -c -m 0755 "$BLING_DIRECTORY/files/usr/bin/docker-compose" "/usr/bin/docker-compose" +install -c -m 0755 "$BLING_DIRECTORY/files/usr/bin/kind" "/usr/bin/kind" +install -c -m 0755 "$BLING_DIRECTORY/files/usr/bin/kubectx" "/usr/bin/kubectx" +install -c -m 0755 "$BLING_DIRECTORY/files/usr/bin/kubectx" "/usr/bin/kubens" +rpm-ostree install "$BLING_DIRECTORY/rpms/dive*.rpm" +