Fix broken stuff
This commit is contained in:
+3
-1
@@ -6,9 +6,11 @@ COPY install-rust.sh /usr/local/bin/
|
||||
COPY install-cargo-tools.sh /usr/local/bin/
|
||||
COPY setup-dev.sh /usr/local/bin/
|
||||
|
||||
|
||||
# Make them executable and run the orchestrator
|
||||
ENV PATH="$PATH:/root/.cargo/bin"
|
||||
RUN chmod +x /usr/local/bin/*.sh && \
|
||||
/usr/local/bin/setup-dev.sh
|
||||
sh /usr/local/bin/setup-dev.sh
|
||||
|
||||
# Set the default shell to fish (or bash)
|
||||
CMD ["/usr/bin/fish"]
|
||||
|
||||
@@ -12,4 +12,4 @@ podman run -it --rm \
|
||||
-v "$PWD:$PWD" \
|
||||
-w "$PWD" \
|
||||
$IMAGE_NAME \
|
||||
bash
|
||||
fish
|
||||
|
||||
+2
-1
@@ -6,8 +6,9 @@ apk add --no-cache \
|
||||
bash \
|
||||
curl \
|
||||
ca-certificates \
|
||||
dust \
|
||||
delta \
|
||||
git \
|
||||
git-delta \
|
||||
htop \
|
||||
i2c-tools \
|
||||
luarocks \
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
echo "Installing cargo tools..."
|
||||
# Use binstall for speed where possible
|
||||
cargo binstall --no-confirm difftastic dust
|
||||
cargo binstall --no-confirm difftastic
|
||||
|
||||
+2
-1
@@ -1,6 +1,7 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
echo "Installing Rust toolchain..."
|
||||
rustup default stable
|
||||
rustup-init -y --profile complete --default-toolchain stable
|
||||
export PATH="$PATH:/root/.cargo/bin"
|
||||
curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
|
||||
cargo binstall --no-confirm cargo-watch cargo-get
|
||||
|
||||
+3
-4
@@ -1,10 +1,9 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
|
||||
# Run the sub-scripts
|
||||
/usr/local/bin/install-apk.sh
|
||||
/usr/local/bin/install-rust.sh
|
||||
/usr/local/bin/install-cargo-tools.sh
|
||||
sh /usr/local/bin/install-apk.sh
|
||||
sh /usr/local/bin/install-rust.sh
|
||||
sh /usr/local/bin/install-cargo-tools.sh
|
||||
|
||||
echo "Setting up dotfiles..."
|
||||
mkdir -p $HOME/.config/dotfiles
|
||||
|
||||
Reference in New Issue
Block a user