This commit is contained in:
Mayel de Borniol 2024-02-16 23:28:56 +00:00
parent 0a0cc43fa3
commit 600937059d
3 changed files with 6 additions and 3 deletions

View file

@ -30,9 +30,12 @@ RUN mix deps.get --only prod
# Compile initial hex deps, only if we're not using forks (warning: this makes the assumption that no Bonfire extensions are coming from Hex. otherwise this should be done only after copying config)
RUN if [ "$FORKS_TO_COPY_PATH" = "data/null" ] ; then MIX_ENV=prod mix deps.compile ; else echo "Skip" ; fi
# add git deps (typically Bonfire extensions)
# add flavour's git deps (typically Bonfire extensions)
COPY data/current_flavour/config/deps*git ./config/
# add extra deps (specified by the core app)
RUN cp -rfL deps/bonfire/deps.* ./config/
# fetch them because we need them for the non-configurable paths in config/deps_hooks.js
RUN mix deps.get --only prod
# RUN HEX_HTTP_CONCURRENCY=1 HEX_HTTP_TIMEOUT=120 mix deps.get --only prod

View file

@ -593,8 +593,8 @@ rel-init:
mkdir -p data
rm -rf flavours/*/config/*/dev
cp -rfL flavours/classic data/current_flavour
cp -rfL extensions/bonfire/deps.* data/current_flavour/config/ || cp -rfL deps/bonfire/deps.* data/current_flavour/config/
cp -rfL $FLAVOUR_PATH/* data/current_flavour/
# cp -rfL extensions/bonfire/deps.* data/current_flavour/config/ || cp -rfL deps/bonfire/deps.* data/current_flavour/config/
# copy current flavour's config, without using symlinks
@rel-prepare: rel-config-prepare

View file

@ -103,7 +103,7 @@ defmodule Bonfire.Umbrella.MixProject do
@default_flavour "classic"
@config [
# note that the flavour will automatically be added where the dash appears
version: "0.9.8-beta.33",
version: "0.9.8-beta.34",
elixir: ">= #{System.get_env("ELIXIR_VERSION", "1.13.4")}",
default_flavour: @default_flavour,
logo: "assets/static/images/bonfire-icon.png",