diff --git a/rust-nextest/Dockerfile b/rust-nextest/Dockerfile index 78cbfda..266b3b9 100644 --- a/rust-nextest/Dockerfile +++ b/rust-nextest/Dockerfile @@ -8,3 +8,6 @@ RUN tar xzf cargo-nextest.tar.gz -C ${CARGO_HOME:-~/.cargo}/bin # clean up RUN rm cargo-nextest.tar.gz + +# install sqlx +RUN cargo install sqlx-cli --no-default-features --features native-tls,postgres diff --git a/rust-webapp/Dockerfile b/rust-webapp/Dockerfile index 6e43d22..4987cb4 100644 --- a/rust-webapp/Dockerfile +++ b/rust-webapp/Dockerfile @@ -1,19 +1,6 @@ FROM catthehacker/ubuntu:rust-latest WORKDIR /app -ARG NODE_VERSION=24 - -# install curl -RUN apt update && apt install curl -y - -RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.3/install.sh | bash - -ENV NVM_DIR=/root/.nvm -RUN echo "NVM_DIR=/root/.nvm" | tee -a /etc/environment - -# install node -RUN bash -c "source $NVM_DIR/nvm.sh && nvm install $NODE_VERSION" - # download static bin ADD https://get.nexte.st/latest/linux cargo-nextest.tar.gz @@ -22,3 +9,6 @@ RUN tar xzf cargo-nextest.tar.gz -C ${CARGO_HOME:-~/.cargo}/bin # clean up RUN rm cargo-nextest.tar.gz + +# install sqlx +RUN cargo install sqlx-cli --no-default-features --features native-tls,postgres