From 45ede1cbbef4419a26804661f03702a2039a3ab8 Mon Sep 17 00:00:00 2001 From: Szwendacz Date: Fri, 29 Dec 2023 09:22:55 +0100 Subject: [PATCH] helm, kustomize in cloud-toolbox, fzf in system-toolbox --- cloud-toolbox/Dockerfile | 2 +- system-toolbox/Dockerfile | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/cloud-toolbox/Dockerfile b/cloud-toolbox/Dockerfile index 37a9b73..093a5fd 100644 --- a/cloud-toolbox/Dockerfile +++ b/cloud-toolbox/Dockerfile @@ -6,7 +6,7 @@ ENV HISTSIZE=10000 ENV HISTTIMEFORMAT="%d/%m/%y %T " ENV HISTFILESIZE=20000 -ENV PKGS_BASE="fzf git python3-pip rclone bash-completion kubernetes-client" +ENV PKGS_BASE="fzf git python3-pip rclone bash-completion kubernetes-client helm golang-sigs-k8s-kustomize" ENV PKGS_TEMP="python3-devel gcc wget" RUN dnf clean all && \ diff --git a/system-toolbox/Dockerfile b/system-toolbox/Dockerfile index ff00438..35edad8 100644 --- a/system-toolbox/Dockerfile +++ b/system-toolbox/Dockerfile @@ -1,5 +1,13 @@ FROM registry.fedoraproject.org/fedora:39 +USER root + +ENV HISTSIZE=10000 +ENV HISTTIMEFORMAT="%d/%m/%y %T " +ENV HISTFILESIZE=20000 + +ENV PKGS_BASE="fzf bash-completion" + ENV PKGS_GENERAL="htop \ btop \ sysstat \ @@ -28,12 +36,15 @@ ENV PKGS_NETWORK="bind-utils \ mtr" RUN dnf clean all && \ - dnf install -y ${PKGS_GENERAL} ${PKGS_PROCESSES} ${PKGS_NETWORK} && \ + dnf install -y ${PKGS_BASE} ${PKGS_GENERAL} ${PKGS_PROCESSES} ${PKGS_NETWORK} && \ dnf -y autoremove && \ dnf -y clean all COPY help-toolbox.sh /usr/bin/help-toolbox -RUN chmod 555 /usr/bin/help-toolbox +RUN chmod 555 /usr/bin/help-toolbox && \ + echo $'[ -f /usr/share/fzf/shell/key-bindings.bash ] && source /usr/share/fzf/shell/key-bindings.bash;\ +PS1=\'[system-toolbox \W/]\$ \'\ +' >> /root/.bashrc USER root