From 2b63bdb27c7350e83ee2b0e431cc85367a4e31f4 Mon Sep 17 00:00:00 2001 From: rsteube Date: Tue, 24 Dec 2024 00:18:45 +0100 Subject: [PATCH] fix dockerfiles --- .docker/bloop/Dockerfile | 7 ++++++- .docker/nix/Dockerfile | 5 ++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.docker/bloop/Dockerfile b/.docker/bloop/Dockerfile index 344daf4b72..d2e626e92b 100644 --- a/.docker/bloop/Dockerfile +++ b/.docker/bloop/Dockerfile @@ -10,6 +10,11 @@ RUN curl -fL "https://github.com/coursier/launchers/raw/master/cs-x86_64-pc-linu RUN cs setup -y RUN cs install bloop --only-prebuilt=true -ENV PATH="$PATH:/root/.local/share/coursier/bin" +ENV PATH="/root/.local/share/coursier/bin:$PATH:" RUN bloop + +RUN mkdir -p ~/.config/elvish \ + && echo "set paths = [ /carapace-bin/cmd/carapace \$@paths ]\neval (carapace _carapace|slurp)" > ~/.config/elvish/rc.elv +ENV PATH="/carapace-bin/cmd/carapace:$PATH:" + ENTRYPOINT [ "elvish" ] diff --git a/.docker/nix/Dockerfile b/.docker/nix/Dockerfile index c42355ff4f..c48467c07a 100644 --- a/.docker/nix/Dockerfile +++ b/.docker/nix/Dockerfile @@ -4,11 +4,10 @@ RUN pacman -Sy --noconfirm nix RUN pacman -Sy --noconfirm elvish RUN mkdir -p ~/.config/elvish \ -&& echo -e "set paths = [ /carapace-bin/cmd/carapace \$@paths ]\neval (carapace _carapace|slurp)" > ~/.config/elvish/rc.elv -RUN export PATH="/carapace-bin/cmd/carapace:$PATH" + && echo -e "set paths = [ /carapace-bin/cmd/carapace \$@paths ]\neval (carapace _carapace|slurp)" > ~/.config/elvish/rc.elv +ENV PATH="/carapace-bin/cmd/carapace:$PATH:" RUN mkdir -p ~/.config/nix \ && echo -e "experimental-features = nix-command flakes" > ~/.config/nix/nix.conf - CMD ["elvish"]