aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Dockerfile6
-rw-r--r--Dockerfile.tex8
2 files changed, 6 insertions, 8 deletions
diff --git a/Dockerfile b/Dockerfile
index 11b692d..eda80f7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -33,10 +33,8 @@ RUN apk add --no-cache wget \
# 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
+# set up Rust
+RUN rustup-init -y --default-toolchain none && /root/.cargo/bin/rustup toolchain install nightly --allow-downgrade --profile minimal --component rustfmt,rust-src,clippy && echo -e "[unstable]\ngc = true" > /root/.cargo/config.toml
# copy config files
COPY .bashrc .bashrc
diff --git a/Dockerfile.tex b/Dockerfile.tex
index b411266..54654e0 100644
--- a/Dockerfile.tex
+++ b/Dockerfile.tex
@@ -45,10 +45,8 @@ RUN apk add --no-cache texlive \
# 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
+# set up Rust
+RUN rustup-init -y --default-toolchain none && /root/.cargo/bin/rustup toolchain install nightly --allow-downgrade --profile minimal --component rustfmt,rust-src,clippy && echo -e "[unstable]\ngc = true" > /root/.cargo/config.toml
# copy config files
COPY .bashrc .bashrc
@@ -63,3 +61,5 @@ RUN nvim --headless +"Lazy! sync" +qa; rm -rf /root/.cache
RUN ln -sf /usr/bin/clangd /root/.local/share/nvim/mason/bin/clangd
ENTRYPOINT ["/bin/bash"]
+
+# vi: ft=dockerfile