This commit is contained in:
Mayel de Borniol 2023-03-07 08:50:39 +13:00
parent cdaa9325ca
commit 6624900f93
2 changed files with 4 additions and 3 deletions

View file

@ -117,7 +117,7 @@ for config <- "bonfire_*.exs" |> Path.expand(__DIR__) |> Path.wildcard() do
end
# include configs for the current flavour (augmenting or overriding the previous ones)
import_config "flavour_#{flavour}.exs"
if File.exists?("flavour_#{flavour}.exs"), do: import_config "flavour_#{flavour}.exs"
import_config "activity_pub.exs"

View file

@ -505,9 +505,9 @@ rel-rebuild:
just rel-build {{EXT_PATH}} --no-cache
# Build the Docker image (NOT including changes to local forks)
rel-build-release:
rel-build-release ARGS="":
@echo "Please note that the build will not include any changes in forks that haven't been committed and pushed, you may want to run just contrib-release first."
@just rel-build remote
@just rel-build remote {{ ARGS }}
# Build the release
rel-build USE_EXT="local" ARGS="":
@ -537,6 +537,7 @@ rel-build-docker USE_EXT="local" ARGS="": rel-init rel-prepare assets-prepare
rel-build-path FORKS_TO_COPY_PATH ARGS="":
@echo "Building $APP_NAME with flavour $FLAVOUR for arch {{arch()}}."
@MIX_ENV=prod docker build {{ ARGS }} --progress=plain \
--build-arg FLAVOUR=$FLAVOUR \
--build-arg FLAVOUR_PATH=data/current_flavour \
--build-arg APP_NAME=$APP_NAME \
--build-arg APP_VSN=$APP_VSN \