up

.dockerignore

@@ -39,6 +39,7 @@ forks/*/.hex
 forks/*/_build
 forks/*/deps
 forks/*/assets/node_modules
+deps/*/_build
 extensions/*/data/postgres
 extensions/*/.git
 extensions/*/.config

Dockerfile.release

@@ -41,9 +41,12 @@ COPY --link mix.lock ./
 # COPY --parents --link flavours/*/config/deps*hex ./
 
 # Optionally include local forks
-COPY --link data/current_flavour/config/deps*path ./config/ 
-RUN if [ "$FORKS_TO_COPY_PATH" = "data/null" ] ; then rm ./config/deps*path && rm ./flavours/*/config/deps*path ; else echo "Include locally forked extensions." ; fi 
-COPY --link ${FORKS_TO_COPY_PATH} ./${FORKS_TO_COPY_PATH}
+# COPY --link data/current_flavour/config/deps*path ./config/ 
+# RUN if [ "$FORKS_TO_COPY_PATH" = "data/null" ] ; then rm ./config/deps*path && rm ./flavours/*/config/deps*path ; else echo "Include locally forked extensions." ; fi 
+# COPY --link ${FORKS_TO_COPY_PATH} ./${FORKS_TO_COPY_PATH}
+
+# to skip / speed up re-downloading of deps
+COPY --link deps ./deps
 
 # RUN mix deps.get --only prod
 RUN HEX_HTTP_CONCURRENCY=1 HEX_HTTP_TIMEOUT=120 mix deps.get --only prod
@@ -81,6 +84,9 @@ RUN ls -la config/* && ls flavours/*/config/*
 # we need config before compiling Bonfire extensions
 COPY --link data/current_flavour/config/ ./config/
 
+# Optionally include local forks
+RUN if [ "$FORKS_TO_COPY_PATH" = "data/null" ] ; then rm ./config/deps*path && rm ./flavours/*/config/deps*path ; else echo "Include locally forked extensions." ; fi 
+COPY --link ${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)
 # RUN mix bonfire.deps.update

justfile

@@ -510,7 +510,7 @@ contrib-app-release: _pre-push-hooks contrib-app-release-increment git-publish
 
 contrib-forks-publish: update-forks
 
-contrib-rel-push: contrib-release rel-build-locked rel-push
+contrib-rel-push: contrib-release rel-build rel-push
 
 # Count lines of code (requires cloc: `brew install cloc`)
 cloc:
@@ -658,6 +658,7 @@ rel-config: config _rel-init _rel-prepare
 @_rel-prepare: _rel-config-prepare
 	mkdir -p extensions/
 	mkdir -p forks/
+	mkdir -p deps/
 	mkdir -p data/uploads/
 	mkdir -p data/null/
 	touch data/current_flavour/config/deps.path
@@ -667,12 +668,12 @@ rel-rebuild:
 	just rel-build {{EXT_PATH}} --no-cache
 
 # Build the Docker image (NOT including changes to local forks)
-rel-build-locked ARGS="":
+rel-build 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 {{ ARGS }}
 
 # Build the release
-rel-build USE_EXT="local" ARGS="":
+rel-build-with-clones USE_EXT="local" ARGS="":
 	@just {{ if WITH_DOCKER != "no" {"rel-build-docker"} else {"rel-build-OTP"} }} {{ USE_EXT }} {{ ARGS }}
 
 # Build the OTP release

mix.exs

@@ -208,7 +208,7 @@ defmodule Bonfire.Umbrella.MixProject do
   # TODO: put these in ENV or an external writeable config file similar to deps.*
   @config [
     # note that the flavour will automatically be added where the dash appears
-    version: "0.9.10-beta.161",
+    version: "0.9.10-beta.162",
     elixir: ">= #{System.get_env("ELIXIR_VERSION", "1.13.4")}",
     flavour: @flavour,
     default_flavour: @default_flavour,