mythic-insight/legendary-doc-site
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Robert Prehn 2021-10-20 17:22:47 -05:00
commit d0a6677cdd
6 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Dockerfile
View file

@ -27,6 +27,9 @@ ADD ./apps/content/mix.exs ./apps/content/
ADD ./apps/core/mix.exs ./apps/core/ ADD ./apps/core/mix.exs ./apps/core/
RUN mix deps.get 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 # 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/ WORKDIR /root/app/apps/app/assets/
COPY --from=0 /root/app/ /root/app/ COPY --from=0 /root/app/ /root/app/
RUN npm install RUN npm install
ADD ./apps /root/app/apps
RUN npm run deploy RUN npm run deploy
FROM elixir-builder FROM elixir-builder
RUN mix deps.compile
ADD ./apps /root/app/apps ADD ./apps /root/app/apps
# Resume compilation of the elixir app # Resume compilation of the elixir app

2
apps/admin/mix.exs
View file

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

1
apps/app/assets/tailwind.config.js
View file

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

2
apps/content/mix.exs
View file

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

2
apps/core/mix.exs
View file

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

4
mix.exs
View file

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