Fix release

This commit is contained in:
Mayel de Borniol 2023-03-12 13:28:07 +13:00
parent 5bdb2851d4
commit ce8adeba1e
2 changed files with 5 additions and 4 deletions

View file

@ -42,7 +42,7 @@ RUN mkdir -p ./config
COPY data/current_flavour/config/config_basics.exs ./config/config.exs
# get deps from hex.pm
COPY data/current_flavour/config/deps.hex ./config/
COPY data/current_flavour/config/deps*hex ./config/
RUN mix do local.hex --force, local.rebar --force
RUN mix do deps.get --only prod
@ -50,7 +50,7 @@ RUN mix do deps.get --only prod
RUN if [ "$FORKS_TO_COPY_PATH" = "data/null" ] ; then MIX_ENV=prod mix do deps.compile ; else echo "Skip" ; fi
# add git deps (typically Bonfire extensions)
COPY data/current_flavour/config/deps.git ./config/
COPY data/current_flavour/config/deps*git ./config/
# fetch them because we need them for the non-configurable paths in config/deps_hooks.js
RUN mix do deps.get --only prod
@ -60,7 +60,7 @@ COPY data/current_flavour/config/ ./config/
# Optionally include local forks
ARG FORKS_TO_COPY_PATH
RUN if [ "$FORKS_TO_COPY_PATH" = "data/null" ] ; then rm ./config/deps.path ; else echo "Include locally forked extensions." ; fi
RUN if [ "$FORKS_TO_COPY_PATH" = "data/null" ] ; then rm ./config/deps*path ; else echo "Include locally forked extensions." ; fi
COPY ${FORKS_TO_COPY_PATH} ./${FORKS_TO_COPY_PATH}
# Update Bonfire extensions to latest git version (mostly useful in CI, and temporary: eventually we want to rely on version numbers and lockfile)

View file

@ -490,7 +490,8 @@ rel-config-prepare:
rm -rf data/current_flavour
mkdir -p data
rm -rf flavours/*/config/*/dev
cp -rfL $FLAVOUR_PATH data/current_flavour
cp -rfL flavours/classic data/current_flavour
cp -rfL $FLAVOUR_PATH/* data/current_flavour
# copy current flavour's config, without using symlinks
rel-prepare: rel-config-prepare