diff --git a/Dockerfile b/Dockerfile index ee349317..ed2c16b3 100644 --- a/Dockerfile +++ b/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 diff --git a/apps/admin/mix.exs b/apps/admin/mix.exs index b30e9b11..e79077d8 100644 --- a/apps/admin/mix.exs +++ b/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 [ diff --git a/apps/app/assets/tailwind.config.js b/apps/app/assets/tailwind.config.js index 618058a0..094a02af 100644 --- a/apps/app/assets/tailwind.config.js +++ b/apps/app/assets/tailwind.config.js @@ -159,5 +159,4 @@ module.exports = { fontWeight: ["hover", "focus"], }, }, - plugins: [], }; diff --git a/apps/content/mix.exs b/apps/content/mix.exs index 35dc8999..4c866b61 100644 --- a/apps/content/mix.exs +++ b/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 [ diff --git a/apps/core/mix.exs b/apps/core/mix.exs index 3e6fffe7..91ef2eb5 100644 --- a/apps/core/mix.exs +++ b/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 [ diff --git a/mix.exs b/mix.exs index a7411a1c..f14a8700 100644 --- a/mix.exs +++ b/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 [