diff options
| author | pml68 <contact@pml68.dev> | 2024-12-17 01:01:50 +0100 |
|---|---|---|
| committer | pml68 <contact@pml68.dev> | 2024-12-17 01:01:50 +0100 |
| commit | 75d9b3c3aa29b0a95142f35de85175e89651db02 (patch) | |
| tree | 0cf69b3617e3bde2fee3d09b895c71a0661e268d /Dockerfile | |
| parent | feat: remove CPPFLAGS from `.bashrc` (diff) | |
| download | nvim-75d9b3c3aa29b0a95142f35de85175e89651db02.tar.gz | |
feat: switch to rustup pkg over rust, no-tex becomes base
Diffstat (limited to '')
| -rw-r--r-- | Dockerfile | 19 | ||||
| -rw-r--r-- | Dockerfile.tex (renamed from Dockerfile.no-tex) | 19 |
2 files changed, 24 insertions, 14 deletions
@@ -19,7 +19,7 @@ RUN apk add --no-cache wget \ gzip \ neovim-doc \ ripgrep \ - rust \ + rustup \ python3 \ openjdk21 \ openjdk17 \ @@ -30,21 +30,14 @@ RUN apk add --no-cache wget \ nodejs \ npm -# install TeX -RUN apk add --no-cache texlive \ - texlive-binextra \ - texmf-dist-fontutils \ - texmf-dist-fontsrecommended \ - texmf-dist-langenglish \ - texmf-dist-langeuropean \ - texmf-dist-latexextra \ - texmf-dist-latexrecommended \ - texmf-dist-pictures \ - texmf-dist-plaingeneric - # pre-download lazy.nvim RUN git clone --filter=blob:none https://github.com/folke/lazy.nvim.git --branch=stable /root/.local/share/nvim/lazy/lazy.nvim +RUN rustup-init -y --default-toolchain none +RUN /root/.cargo/bin/rustup toolchain install nightly --allow-downgrade --profile minimal --component rustfmt,rust-src,clippy + +RUN echo -e "[unstable]\ngc = true" > /root/.cargo/config.toml + # copy config files COPY .bashrc .bashrc COPY . .config/nvim diff --git a/Dockerfile.no-tex b/Dockerfile.tex index 3342c16..b411266 100644 --- a/Dockerfile.no-tex +++ b/Dockerfile.tex @@ -19,7 +19,7 @@ RUN apk add --no-cache wget \ gzip \ neovim-doc \ ripgrep \ - rust \ + rustup \ python3 \ openjdk21 \ openjdk17 \ @@ -30,9 +30,26 @@ RUN apk add --no-cache wget \ nodejs \ npm +# install TeX +RUN apk add --no-cache texlive \ + texlive-binextra \ + texmf-dist-fontutils \ + texmf-dist-fontsrecommended \ + texmf-dist-langenglish \ + texmf-dist-langeuropean \ + texmf-dist-latexextra \ + texmf-dist-latexrecommended \ + texmf-dist-pictures \ + texmf-dist-plaingeneric + # pre-download lazy.nvim RUN git clone --filter=blob:none https://github.com/folke/lazy.nvim.git --branch=stable /root/.local/share/nvim/lazy/lazy.nvim +RUN rustup-init -y --default-toolchain none +RUN /root/.cargo/bin/rustup toolchain install nightly --allow-downgrade --profile minimal --component rustfmt,rust-src,clippy + +RUN echo -e "[unstable]\ngc = true" > /root/.cargo/config.toml + # copy config files COPY .bashrc .bashrc COPY . .config/nvim |