From 91ada70c7d58878c22c802c12847a264b45c57af Mon Sep 17 00:00:00 2001 From: Austin Alvarado Date: Mon, 20 Mar 2023 14:29:54 -0600 Subject: [PATCH] vscode: Update devcontainer and build instructions --- .devcontainer/Dockerfile | 6 ++---- .devcontainer/devcontainer.json | 5 ++++- README.md | 4 +--- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index f8a4fc4..4d97d63 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -13,12 +13,10 @@ RUN groupadd --gid $USER_GID $USERNAME \ && chmod 0440 /etc/sudoers.d/$USERNAME RUN apt update && \ - curl -fsSL https://deb.nodesource.com/setup_lts.x | bash - && \ - apt update && \ - apt install -y --no-install-recommends nodejs libssl-dev musl-dev make perl curl + apt install -y --no-install-recommends libssl-dev musl-dev make perl curl gzip && \ + rm -rf /var/lib/apt/lists/* RUN RUSTFLAGS=-Ctarget-feature=-crt-static cargo install wasm-pack \ - && npm install -g rollup \ && rustup target add wasm32-unknown-unknown USER $USERNAME diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index cb3a95d..cb57540 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,5 +1,8 @@ { "name": "LLDAP dev", "build": { "dockerfile": "Dockerfile" }, - "forwardPorts": [3890, 17170] + "forwardPorts": [ + 3890, + 17170 + ] } diff --git a/README.md b/README.md index a660011..9dd4bce 100644 --- a/README.md +++ b/README.md @@ -144,8 +144,7 @@ See https://github.com/Evantage-WS/lldap-kubernetes for a LLDAP deployment for K To compile the project, you'll need: -- nodejs 16: [nodesource nodejs installation guide](https://github.com/nodesource/distributions) -- curl: `sudo apt install curl` +- curl and gzip: `sudo apt install curl gzip` - Rust/Cargo: [rustup.rs](https://rustup.rs/) Then you can compile the server (and the migration tool if you want): @@ -161,7 +160,6 @@ To bring up the server, you'll need to compile the frontend. In addition to cargo, you'll need: - WASM-pack: `cargo install wasm-pack` -- rollup.js: `npm install rollup` Then you can build the frontend files with `./app/build.sh` (you'll need to run this after every front-end change to update the WASM package served).