diff --git a/base_container/Containerfile b/base_container/Containerfile index a4d56c4..88136d0 100644 --- a/base_container/Containerfile +++ b/base_container/Containerfile @@ -6,7 +6,7 @@ FROM registry.fedoraproject.org/fedora-toolbox:39 # Label it right, ya know? -ENV NAME=custom_base_image VERSION=1.1 +ENV NAME=custom_base_image VERSION=1.2 LABEL com.github.containers.toolbox="true" \ com.redhat.component="$NAME" \ name="$NAME" \ @@ -17,12 +17,11 @@ LABEL com.github.containers.toolbox="true" \ vendor="Miller Web Solutions" # Install base development packages -RUN dnf install neovim tmux git fish zsh bat exa -y -q +RUN dnf copr enable atim/starship -y -q +RUN dnf copr enable varlad/zellij -y -q +RUN dnf install neovim tmux git fish zsh bat exa starship zellij wget unzip ansible htop iftop -y -q RUN dnf groupinstall "C Development Tools and Libraries" -y -q -# Install starship prompt (to the moon!) -RUN curl -sS https://starship.rs/install.sh | sh -s -- -y - # Install atuin (magical shell history) RUN curl -L https://github.com/atuinsh/atuin/releases/download/v18.0.2/atuin-v18.0.2-x86_64-unknown-linux-gnu.tar.gz --output atuin-v18.0.2-x86_64-unknown-linux-gnu.tar.gz RUN tar xvzf atuin-v18.0.2-x86_64-unknown-linux-gnu.tar.gz @@ -34,3 +33,9 @@ RUN curl -L https://github.com/jesseduffield/lazygit/releases/download/v0.40.2/l RUN tar xvzf lazygit_0.40.2_Linux_x86_64.tar.gz RUN cp ./lazygit /usr/local/bin/lazygit RUN rm LICENSE README.md lazygit + +# Install smug (a tmux manager) +RUN curl -L https://github.com/ivaaaan/smug/releases/download/v0.3.3/smug_0.3.3_Linux_x86_64.tar.gz --output smug_0.3.3_Linux_x86_64.tar.gz +RUN tar xvzf smug_0.3.3_Linux_x86_64.tar.gz +RUN cp ./smug /usr/local/bin/smug +RUN rm LICENSE README.md smug diff --git a/language-containers/kotlin/Containerfile b/language-containers/kotlin/Containerfile index f7c5aca..bf23b86 100644 --- a/language-containers/kotlin/Containerfile +++ b/language-containers/kotlin/Containerfile @@ -19,10 +19,8 @@ LABEL com.github.containers.toolbox="true" \ # Set environment variables ENV KOTLIN_VERSION=1.9.23 ENV KOTLIN_HOME=/usr/local/kotlin -ENV PATH="${PATH}:${KOTLIN_HOME}/bin" ENV GRADLE_VERSION=8.6 ENV GRADLE_HOME=/opt/gradle -ENV PATH="${PATH}:${GRADLE_HOME}/bin" # Install required packages RUN dnf install -y -q wget unzip java-17-openjdk java-17-openjdk-devel && \