Merge tag 'v4.3.1' of gitlab.com:mythic-insight/legendary

Dockerfile

@@ -27,6 +27,9 @@ ADD ./apps/content/mix.exs ./apps/content/
 ADD ./apps/core/mix.exs ./apps/core/
 
 RUN mix deps.get
+RUN mix deps.compile
+
+ADD ./apps /root/app/apps
 
 # Leave off here so that we can built assets and compile the elixir app in parallel
 
@@ -38,12 +41,12 @@ ADD ./apps/app/assets/ /root/app/apps/app/assets/
 WORKDIR /root/app/apps/app/assets/
 COPY --from=0 /root/app/ /root/app/
 RUN npm install
+
+ADD ./apps /root/app/apps
 RUN npm run deploy
 
 FROM elixir-builder
 
-RUN mix deps.compile
-
 ADD ./apps /root/app/apps
 
 # Resume compilation of the elixir app

apps/admin/mix.exs

@@ -1,7 +1,7 @@
 defmodule Legendary.Admin.MixProject do
   use Mix.Project
 
-  @version "3.0.0"
+  @version "4.3.1"
 
   def project do
     [

apps/app/assets/tailwind.config.js

@@ -159,5 +159,4 @@ module.exports = {
       fontWeight: ["hover", "focus"],
     },
   },
-  plugins: [],
 };

apps/content/mix.exs

@@ -1,7 +1,7 @@
 defmodule Legendary.Content.MixProject do
   use Mix.Project
 
-  @version "3.0.0"
+  @version "4.3.1"
 
   def project do
     [

apps/core/mix.exs

@@ -1,7 +1,7 @@
 defmodule Legendary.Core.MixProject do
   use Mix.Project
 
-  @version "3.0.0"
+  @version "4.3.1"
 
   def project do
     [

mix.exs

@@ -1,7 +1,11 @@
 defmodule Legendary.Mixfile do
   use Mix.Project
 
+<<<<<<< HEAD
   @version "3.0.0"
+=======
+  @version "4.3.1"
+>>>>>>> 52db6ba1e087e55e1f3863277bfbaa3aa060af00
 
   def project do
     [