mirrors/bonfire-app
1
0
Fork 0
mirror of https://github.com/bonfire-networks/bonfire-app.git synced 2024-05-14 23:22:40 +00:00
Code Issues Projects Releases Wiki Activity

misc

Browse source
This commit is contained in:
Mayel de Borniol 2022-11-14 14:03:01 +13:00
parent 12d2815182
commit 12ddfa1056
3 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/CHANGELOG-autogenerated.md
View file

@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html)
## [Unreleased (2022-11-12)]
## [Unreleased (2022-11-14)]
### Added
- Enable/disable extensions [#448](https://github.com/bonfire-networks/bonfire-app/issues/448)
- Coordination MVP [#445](https://github.com/bonfire-networks/bonfire-app/issues/445) by mayel & ivanminutillo

2
justfile
View file

@ -550,7 +550,7 @@ dc *args='':
{{ if MIX_ENV == "prod" { "just rel-services" } else { "just dev-services" } }}
@dev-services:
{{ if WITH_DOCKER != "no" { "docker-compose up -d db search || exit You may want to make sure the docker daemon is started or run 'colima start' first." } else {""} }}
{{ if WITH_DOCKER != "no" { "docker-compose up -d db search || exit \"You may want to make sure the docker daemon is started or run 'colima start' first.\"" } else {""} }}
# Build the docker image
build: init

16
lib/mix/mess/mixer.ex
View file

@ -46,17 +46,21 @@ if not Code.ensure_loaded?(Bonfire.Mixer) do
def flavour_path(config),
do: System.get_env("FLAVOUR_PATH", "flavours/" <> flavour(config))
def flavour(config \\ Bonfire.Application.mix_config()),
do: System.get_env("FLAVOUR") || config[:default_flavour]
def flavour(config \\ Bonfire.Application.mix_config())
def config_path(config, filename),
do: Path.expand(Path.join([flavour_path(config), "config", filename]))
def flavour(default_flavour) when is_binary(default_flavour),
do: System.get_env("FLAVOUR") || default_flavour
def flavour(config), do: System.get_env("FLAVOUR") || config[:default_flavour]
def config_path(config_or_flavour, filename),
do: Path.expand(Path.join([flavour_path(config_or_flavour), "config", filename]))
def forks_path(), do: System.get_env("FORKS_PATH", "forks/")
def mess_sources(config) do
def mess_sources(config_or_flavour) do
do_mess_sources(System.get_env("WITH_FORKS", "1"))
|> Enum.map(fn {k, v} -> {k, config_path(config, v)} end)
|> Enum.map(fn {k, v} -> {k, config_path(config_or_flavour, v)} end)
end
defp do_mess_sources("0"), do: [git: "deps.git", hex: "deps.hex"]