diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 745e461c12..37382131d0 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -94,6 +94,7 @@ jobs: # ghcr.io/bonfire-networks/bonfire-app:latest-${{ env.FLAVOUR }}${{ matrix.tag_extra }} # ghcr.io/bonfire-networks/bonfire-app:${{steps.version.outputs.current-version}}-${{ env.FLAVOUR }}${{ matrix.tag_extra }} build-args: | + "ENABLE_IMAGE_VIX=${{ env.ENABLE_IMAGE_VIX }}" "ALPINE_VERSION=${{ env.ALPINE_VERSION }}" "ELIXIR_DOCKER_IMAGE=${{env.ELIXIR_VERSION}}-erlang-${{env.ERLANG_VERSION}}-alpine-${{env.ALPINE_VERSION}}" - diff --git a/Dockerfile.release b/Dockerfile.release index 00e90118e2..f5d57a34b6 100644 --- a/Dockerfile.release +++ b/Dockerfile.release @@ -10,6 +10,7 @@ FROM hexpm/elixir:${ELIXIR_DOCKER_IMAGE} as builder ARG FLAVOUR ARG FLAVOUR_PATH ARG FORKS_TO_COPY_PATH +ARG ENABLE_IMAGE_VIX # necessary utils + dependencies COPY --link deps-alpine.sh ./ @@ -19,7 +20,7 @@ RUN sh deps-alpine-build.sh # RUN apk --update add tar curl git rust cargo npm yarn bash make gcc libc-dev openssl-dev -ENV HOME=/opt/app/ TERM=xterm MIX_ENV=prod FLAVOUR_PATH=./ +ENV HOME=/opt/app/ TERM=xterm MIX_ENV=prod FLAVOUR_PATH=./ ENABLE_IMAGE_VIX=$ENABLE_IMAGE_VIX WORKDIR $HOME # Prepare elixir deps @@ -118,7 +119,7 @@ COPY --link lib lib # workaround for compilation errors (eg. "could not load module Needle.UID due to reason :unavailable") RUN MIX_ENV=prod mix deps.clean needle_uid jason poison --build -RUN MIX_ENV=prod mix deps.compile --include-children needle_uid paper_trail +RUN MIX_ENV=prod mix deps.compile --include-children needle_uid # compile protocols (attempted fix for 'could not load module Poison.Encoder due to reason :unavailable') # RUN MIX_ENV=prod mix compile.protocols diff --git a/mix.exs b/mix.exs index cad1b2cb72..c3c541af17 100644 --- a/mix.exs +++ b/mix.exs @@ -196,7 +196,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.144", + version: "0.9.10-beta.145", elixir: ">= #{System.get_env("ELIXIR_VERSION", "1.13.4")}", flavour: @flavour, default_flavour: @default_flavour,