diff --git a/containers/base/Containerfile b/containers/base/Containerfile index be6cdc4..21ef51b 100644 --- a/containers/base/Containerfile +++ b/containers/base/Containerfile @@ -11,9 +11,7 @@ RUN --mount=type=cache,id=dnf-cache,target=/var/cache/libdnf5 \ RUN LAZYGIT_VERSION=$(curl -s "https://api.github.com/repos/jesseduffield/lazygit/releases/latest" | jq -r .tag_name | sed 's/^v//') && \ curl -sL "https://github.com/jesseduffield/lazygit/releases/latest/download/lazygit_${LAZYGIT_VERSION}_linux_x86_64.tar.gz" | tar xz -C /usr/local/bin lazygit && \ curl -sL "https://github.com/jorgerojas26/lazysql/releases/latest/download/lazysql_Linux_x86_64.tar.gz" | tar xz -C /usr/local/bin lazysql && \ - curl -sL "https://github.com/neovim/neovim/releases/download/nightly/nvim-linux-x86_64.tar.gz" | tar xz -C /usr/local --strip-components=1 && \ - GO_VERSION=$(curl -sL "https://go.dev/VERSION?m=text" | head -n 1 | tr -d '\r\n') && \ - curl -sL "https://go.dev/dl/${GO_VERSION}.linux-amd64.tar.gz" | tar xz -C /usr/local/bin --strip-components=2 go/bin/go go/bin/gofmt + curl -sL "https://github.com/neovim/neovim/releases/download/nightly/nvim-linux-x86_64.tar.gz" | tar xz -C /usr/local --strip-components=1 COPY config/bin /usr/local/bin diff --git a/containers/go/Containerfile b/containers/go/Containerfile index 2f7f395..62023b9 100644 --- a/containers/go/Containerfile +++ b/containers/go/Containerfile @@ -2,7 +2,7 @@ ARG TAG FROM job79/base:${TAG} USER root -RUN --mount=type=cache,id=dnf-cache,target=/var/cache/libdnf5 \ - dnf -y --setopt=keepcache=1 --setopt=install_weak_deps=False install go +RUN GO_VERSION=$(curl -sL "https://go.dev/VERSION?m=text" | head -n 1 | tr -d '\r\n') && \ + curl -sL "https://go.dev/dl/${GO_VERSION}.linux-amd64.tar.gz" | tar xz -C /usr/local/bin --strip-components=2 go/bin/go go/bin/gofmt USER user