From cd5426213a93b8c26fd5907d05a2db7987c8d640 Mon Sep 17 00:00:00 2001 From: Robert Prehn Date: Wed, 20 Oct 2021 16:48:30 -0500 Subject: [PATCH 1/2] fix: Make tailwind purge work in Docker build --- Dockerfile | 7 +++++-- apps/app/assets/tailwind.config.js | 1 - 2 files changed, 5 insertions(+), 3 deletions(-) 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/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: [], }; From 52db6ba1e087e55e1f3863277bfbaa3aa060af00 Mon Sep 17 00:00:00 2001 From: Robert Prehn Date: Wed, 20 Oct 2021 22:15:13 +0000 Subject: [PATCH 2/2] chore(release): 4.3.1 [skip ci] --- apps/admin/mix.exs | 2 +- apps/content/mix.exs | 2 +- apps/core/mix.exs | 2 +- infrastructure/kube.yaml | 2 +- mix.exs | 2 +- package.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/admin/mix.exs b/apps/admin/mix.exs index b028b647..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 "4.3.0" + @version "4.3.1" def project do [ diff --git a/apps/content/mix.exs b/apps/content/mix.exs index 33da155d..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 "4.3.0" + @version "4.3.1" def project do [ diff --git a/apps/core/mix.exs b/apps/core/mix.exs index cc7eff48..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 "4.3.0" + @version "4.3.1" def project do [ diff --git a/infrastructure/kube.yaml b/infrastructure/kube.yaml index e93621ad..2438ffc4 100644 --- a/infrastructure/kube.yaml +++ b/infrastructure/kube.yaml @@ -20,7 +20,7 @@ spec: spec: containers: - name: app - image: registry.gitlab.com/mythic-insight/legendary:4.3.0 + image: registry.gitlab.com/mythic-insight/legendary:4.3.1 command: ["elixir"] args: - "--name" diff --git a/mix.exs b/mix.exs index 9b127f76..c4420b41 100644 --- a/mix.exs +++ b/mix.exs @@ -1,7 +1,7 @@ defmodule Legendary.Mixfile do use Mix.Project - @version "4.3.0" + @version "4.3.1" def project do [ diff --git a/package.json b/package.json index b4bf1318..9cda6c9d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@mythic-insight/legendary", - "version": "4.3.0", + "version": "4.3.1", "private": true, "description": "The Legendary Phoenix Boilerplate.", "main": "index.js",