docs

Makefile

@@ -53,7 +53,7 @@ pre-config: pre-init ## Initialise env files, and create some required folders,
 pre-init:
 	@ln -sfn $(FLAVOUR_PATH)/config ./config
 	@mkdir -p data/
-	@ln -sf $(FLAVOUR_PATH) ./data/current_flavour
+	@ln -sf ../$(FLAVOUR_PATH) ./data/current_flavour
 	@mkdir -p config/prod
 	@mkdir -p config/dev
 	@touch config/deps.path
@@ -168,6 +168,7 @@ deps.get: mix.remote~deps.get mix~deps.get js.ext.deps.get ## Fetch locked versi
 js.deps.get: js.assets.deps.get js.ext.deps.get
 
 js.assets.deps.get:
+	@pnpm -v || npm -g install pnpm
 	@chmod +x ./assets/install.sh
 	@make --no-print-directory cmd cmd=./assets/install.sh
 
@@ -310,7 +311,6 @@ rel.env:
 
 rel.config.prepare: rel.env # copy current flavour's config, without using symlinks
 	@cp -rfL $(FLAVOUR_PATH) ./data/current_flavour
-# @cp -rfL ./data/current_flavour/config ./config
 
 rel.rebuild: rel.env init rel.config.prepare assets.prepare ## Build the Docker image
 	docker build \

docs/HACKING.md

@@ -35,8 +35,7 @@ For example if you want to run the `coordination` flavour:
 - Dependencies:
 
   - `make`
-  - Docker
-  - Docker Compose (recent version)
+  - Recent versions of Docker & [docker-compose](https://docs.docker.com/compose/install/)
 
 - Make sure you've edited your .env files (see above) before getting started and proceed to Hello world!
 
@@ -45,9 +44,10 @@ For example if you want to run the `coordination` flavour:
 - Dependencies:
 
   - `make`
-  - Recent versions of elixir (1.11+) and OTP/erlang (23+)
-  - Docker
-  - Docker Compose (recent version)
+  - Recent versions of [Elixir](https://elixir-lang.org/install.html) (1.12+) and OTP/erlang (24+)
+  - Recent versions of [Rust](https://www.rust-lang.org/tools/install) and Cargo
+  - [pnpm](https://pnpm.io)
+  - Recent versions of Docker & [docker-compose](https://docs.docker.com/compose/install/)
 
 - Set an environment variable to indicate your choice: `export WITH_DOCKER=partial`
 
@@ -58,9 +58,11 @@ For example if you want to run the `coordination` flavour:
 - Dependencies:
 
   - `make`
-  - Recent versions of elixir (1.11+) and OTP/erlang (23+)
-  - Postgres 12+ (or Postgis if using the bonfire_geolocate extension)
-  - Meili Search (optional)
+  - Recent versions of [Elixir](https://elixir-lang.org/install.html) (1.12+) and OTP/erlang (24+)
+  - Recent versions of [Rust](https://www.rust-lang.org/tools/install) and Cargo
+  - [pnpm](https://pnpm.io)
+  - Postgres 12+ (or rather [Postgis](https://postgis.net/install/) if using the bonfire_geolocate extension)
+  - [Meili Search](https://docs.meilisearch.com/learn/getting_started/installation.html) (optional)
 
 - You will need to set the relevant environment variables in the .env files (see above) to match your local install of Postgres.
 

flavours/cooperation/config/deps.git

@@ -36,7 +36,7 @@ bonfire_federate_activitypub = "https://github.com/bonfire-networks/bonfire_fede
 bonfire_boundaries = "https://github.com/bonfire-networks/bonfire_boundaries#main"
 bonfire_files = "https://github.com/bonfire-networks/bonfire_files#main"
 #twinkle_star = "https://github.com/bonfire-networks/twinkle_star"
-tree_magic = "https://github.com/bonfire-networks/tree_magic.ex"
+#tree_magic = "https://github.com/bonfire-networks/tree_magic.ex"
 voodoo = "https://github.com/bonfire-networks/voodoo#main"
 ecto_shorts = "https://github.com/bonfire-networks/ecto_shorts#main"
 ecto_sparkles = "https://github.com/bonfire-networks/ecto_sparkles#main"