mirrors/bonfire-app
1
0
Fork 0
mirror of https://github.com/bonfire-networks/bonfire-app.git synced 2024-05-17 08:32:41 +00:00
Code Issues Projects Releases Wiki Activity

misc

Browse source
This commit is contained in:
Mayel de Borniol 2024-02-20 18:51:38 +00:00
parent 850485e96d
commit 31c3ac9cf6
7 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Dockerfile.release
View file

@ -20,19 +20,24 @@ COPY lib/mix ./lib/mix
RUN mkdir -p ./config
COPY data/current_flavour/config/config_basics.exs ./config/config.exs
RUN mix do local.hex --force, local.rebar --force
# get deps from hex.pm
COPY data/current_flavour/config/deps*hex ./config/
RUN mix do local.hex --force, local.rebar --force
RUN mix deps.get --only prod
# RUN HEX_HTTP_CONCURRENCY=1 HEX_HTTP_TIMEOUT=120 mix deps.get --only prod
# ^ useful in case of spotting connectivity
# ^ useful in case of spotty connectivity
RUN ls -la config/*
# 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 flavour's git deps (typically Bonfire extensions)
COPY data/current_flavour/config/deps*git ./config/
# fetch more deps/extensions
RUN mix deps.get --only prod
# add extra deps (specified by the core app)
RUN cp -rfL deps/bonfire/deps.* ./config/

2
flavours/classic/config/config_basics.exs
View file

@ -2,6 +2,8 @@ import Config
config :phoenix, :json_library, Jason
config :bonfire_common, :otp_app, :bonfire
config :ecto_sparkles, :otp_app, :bonfire
config :ecto_sparkles, :env, config_env()
config :ecto_sparkles, :umbrella_otp_app, :bonfire_umbrella

3
flavours/classic/config/deps.flavour.git
View file

@ -64,3 +64,6 @@ bonfire_open_id = "https://github.com/bonfire-networks/bonfire_open_id#main"
ex_aws = "https://github.com/bonfire-networks/ex_aws#main"
needle = "https://github.com/bonfire-networks/needle#main"
surface = "https://github.com/surface-ui/surface"

1
flavours/classic/config/deps.flavour.hex
View file

@ -1,5 +1,4 @@
# Data Schemas
# bonfire_data_access_control = "~> 0.1"
# bonfire_data_activity_pub = "~> 0.1"

2
justfile
View file

@ -595,7 +595,7 @@ rel-init:
rm -rf flavours/*/config/*/dev
cp -rfL flavours/classic data/current_flavour
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/
cp -rfL extensions/bonfire/deps.* data/current_flavour/config/ || cp -rfL deps/bonfire/deps.* data/current_flavour/config/ || echo "Could not copy the deps definitions from the bonfire_spark dep"
# copy current flavour's config, without using symlinks
@rel-prepare: rel-config-prepare

2
mix.exs
View file

@ -16,7 +16,7 @@ defmodule Bonfire.Umbrella.MixProject do
if @use_umbrella?, do: IO.puts("NOTE: Running as umbrella...")
@extra_deps [
{:bonfire, git: "https://github.com/bonfire-networks/bonfire_spark"},
# {:bonfire, git: "https://github.com/bonfire-networks/bonfire_spark"}, # putting it here breaks Dockerfile.release
# compilation
# {:tria, github: "hissssst/tria"},

2
mix.lock
View file

@ -35,7 +35,7 @@
"bonfire_epics": {:git, "https://github.com/bonfire-networks/bonfire_epics", "1fdef52cae560d65e19540ef3d34e47ad860e38c", [branch: "main"]},
"bonfire_fail": {:git, "https://github.com/bonfire-networks/bonfire_fail", "d0ff9604b5ccf767e0d08625297fa2b7bb954910", [branch: "main"]},
"bonfire_federate_activitypub": {:git, "https://github.com/bonfire-networks/bonfire_federate_activitypub", "84a6d1e4341890be1c6e55e6d021bc2f73b0a1dd", [branch: "main"]},
"bonfire_files": {:git, "https://github.com/bonfire-networks/bonfire_files", "ada349c40ae11deaa3c5aa5dafc3f024603370d8", [branch: "main"]},
"bonfire_files": {:git, "https://github.com/bonfire-networks/bonfire_files", "f257c5fb1a0102223e10d03ebe3c2cb03ae14dc7", [branch: "main"]},
"bonfire_invite_links": {:git, "https://github.com/bonfire-networks/bonfire_invite_links", "55ffefd23c2607d0bfec91541a00834f018663f7", [branch: "main"]},
"bonfire_label": {:git, "https://github.com/bonfire-networks/bonfire_label", "00f65cb273f4171c8cdaa7f4c6563813eb8bfae0", [branch: "main"]},
"bonfire_mailer": {:git, "https://github.com/bonfire-networks/bonfire_mailer", "001ca742f2bcc234c2d84500d0de3d70a9ad44e8", [branch: "main"]},