diff --git a/containers/base/Containerfile b/containers/base/Containerfile index da6a028..b94db8a 100644 --- a/containers/base/Containerfile +++ b/containers/base/Containerfile @@ -5,9 +5,10 @@ RUN --mount=type=cache,id=dnf-cache,target=/var/cache/libdnf5 \ dnf update -y && \ dnf copr enable -y gierth/tools-golang && \ dnf copr enable -y agriffis/neovim-nightly && \ - dnf -y --setopt=keepcache=1 install bash-completion glibc-minimal-langpack \ + dnf -y --setopt=keepcache=1 --setopt=install_weak_deps=False install \ + bash-completion git-core fzf curl awk jq unzip which \ host-spawn dbus-launch \ - git npm neovim awk jq unzip lazygit lazydocker lazysql + npm neovim wl-copy gcc lazygit lazysql COPY config/bin /usr/local/bin diff --git a/containers/go/Containerfile b/containers/go/Containerfile index f0e97a1..2f7f395 100644 --- a/containers/go/Containerfile +++ b/containers/go/Containerfile @@ -3,6 +3,6 @@ FROM job79/base:${TAG} USER root RUN --mount=type=cache,id=dnf-cache,target=/var/cache/libdnf5 \ - dnf -y --setopt=keepcache=1 install go + dnf -y --setopt=keepcache=1 --setopt=install_weak_deps=False install go USER user diff --git a/containers/infra/Containerfile b/containers/infra/Containerfile index 084b669..eb3f5d2 100644 --- a/containers/infra/Containerfile +++ b/containers/infra/Containerfile @@ -3,7 +3,8 @@ FROM job79/base:${TAG} USER root RUN --mount=type=cache,id=dnf-cache,target=/var/cache/libdnf5 \ - dnf -y --setopt=keepcache=1 install kubectl k9s openssl age "$(curl -s https://api.github.com/repos/getsops/sops/releases/latest | jq -r ".assets[] | select(.name | test(\"sops-.*.$(arch).rpm\$\")) | .browser_download_url")" && \ + dnf -y --setopt=keepcache=1 --setopt=install_weak_deps=False install \ + kubectl k9s openssl age "$(curl -s https://api.github.com/repos/getsops/sops/releases/latest | jq -r ".assets[] | select(.name | test(\"sops-.*.$(arch).rpm\$\")) | .browser_download_url")" && \ curl -sL https://talos.dev/install | sh && \ curl -s https://fluxcd.io/install.sh | bash diff --git a/containers/php/Containerfile b/containers/php/Containerfile index 51e3971..6583d24 100644 --- a/containers/php/Containerfile +++ b/containers/php/Containerfile @@ -3,7 +3,7 @@ FROM job79/base:${TAG} USER root RUN --mount=type=cache,id=dnf-cache,target=/var/cache/libdnf5 \ - dnf -y --setopt=keepcache=1 install php composer && \ + dnf -y --setopt=keepcache=1 --setopt=install_weak_deps=False install php composer && \ composer global require laravel/installer USER user