mirror of
				https://github.com/nitnelave/lldap.git
				synced 2023-04-12 14:25:13 +00:00 
			
		
		
		
	Merge branch 'main' into feature/dark-theme
This commit is contained in:
		
						commit
						d3ec5230f3
					
				@ -13,12 +13,10 @@ RUN groupadd --gid $USER_GID $USERNAME \
 | 
				
			|||||||
    && chmod 0440 /etc/sudoers.d/$USERNAME
 | 
					    && chmod 0440 /etc/sudoers.d/$USERNAME
 | 
				
			||||||
 | 
					
 | 
				
			||||||
RUN apt update && \
 | 
					RUN apt update && \
 | 
				
			||||||
    curl -fsSL https://deb.nodesource.com/setup_lts.x | bash - && \
 | 
					    apt install -y --no-install-recommends libssl-dev musl-dev make perl curl gzip && \
 | 
				
			||||||
    apt update && \
 | 
					    rm -rf /var/lib/apt/lists/*
 | 
				
			||||||
    apt install -y --no-install-recommends nodejs libssl-dev musl-dev make perl curl 
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
RUN RUSTFLAGS=-Ctarget-feature=-crt-static cargo install wasm-pack \
 | 
					RUN RUSTFLAGS=-Ctarget-feature=-crt-static cargo install wasm-pack \
 | 
				
			||||||
    && npm install -g rollup \
 | 
					 | 
				
			||||||
    && rustup target add wasm32-unknown-unknown
 | 
					    && rustup target add wasm32-unknown-unknown
 | 
				
			||||||
 | 
					
 | 
				
			||||||
USER $USERNAME
 | 
					USER $USERNAME
 | 
				
			||||||
 | 
				
			|||||||
@ -1,5 +1,8 @@
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
	"name": "LLDAP dev",
 | 
						"name": "LLDAP dev",
 | 
				
			||||||
	"build": { "dockerfile": "Dockerfile" },
 | 
						"build": { "dockerfile": "Dockerfile" },
 | 
				
			||||||
	"forwardPorts": [3890, 17170]
 | 
						"forwardPorts": [
 | 
				
			||||||
 | 
							3890,
 | 
				
			||||||
 | 
							17170
 | 
				
			||||||
 | 
						]
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
@ -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:
 | 
					To compile the project, you'll need:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
- nodejs 16: [nodesource nodejs installation guide](https://github.com/nodesource/distributions)
 | 
					- curl and gzip: `sudo apt install curl gzip`
 | 
				
			||||||
- curl: `sudo apt install curl`
 | 
					 | 
				
			||||||
- Rust/Cargo: [rustup.rs](https://rustup.rs/)
 | 
					- Rust/Cargo: [rustup.rs](https://rustup.rs/)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Then you can compile the server (and the migration tool if you want):
 | 
					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:
 | 
					cargo, you'll need:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
- WASM-pack: `cargo install wasm-pack`
 | 
					- 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
 | 
					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).
 | 
					this after every front-end change to update the WASM package served).
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user