diff --git a/Dockerfile b/Dockerfile index d9535972..9c4f9d40 100644 --- a/Dockerfile +++ b/Dockerfile @@ -50,4 +50,11 @@ RUN MAKE=cmake mix compile COPY --from=asset-builder /root/app/apps/app/priv/static/ /root/app/apps/app/priv/static RUN mix phx.digest +<<<<<<< HEAD +======= +RUN script/restore-timestamps + +RUN mkdir -p /root/app/priv/ + +>>>>>>> v2.4.7 CMD elixir --name ${NAME:=legendary}@$(hostname -f) -S mix phx.server diff --git a/README.md b/README.md index 6498f862..989f3625 100644 --- a/README.md +++ b/README.md @@ -55,3 +55,12 @@ The CI script will automatically tag successful builds. To do this, you will need to configure a [CI variable](-/settings/ci_cd) named `GITLAB_TOKEN`. This token should be a [personal access token](/-/profile/personal_access_tokens) with `read_repository, write_repository` permissions. + + +# Support + +Want to support development? Chip in on buymeacoffee: + + + Buy Me A Coffee + diff --git a/apps/core/lib/i18n.ex b/apps/core/lib/i18n.ex index 48067edc..5ec34367 100644 --- a/apps/core/lib/i18n.ex +++ b/apps/core/lib/i18n.ex @@ -12,6 +12,7 @@ defmodule Legendary.I18n do path |> Path.basename() |> Path.rootname() + |> String.to_atom() locale locale, path end) diff --git a/infrastructure_templates/kube.yaml.dot b/infrastructure_templates/kube.yaml.dot index efb2898b..f6c80c6f 100644 --- a/infrastructure_templates/kube.yaml.dot +++ b/infrastructure_templates/kube.yaml.dot @@ -78,6 +78,21 @@ spec: secretKeyRef: name: legendary-doc-site key: smtp-password + - name: SMTP_HOST + valueFrom: + secretKeyRef: + name: legendary + key: smtp-host + - name: SMTP_USERNAME + valueFrom: + secretKeyRef: + name: legendary + key: smtp-username + - name: SMTP_PASSWORD + valueFrom: + secretKeyRef: + name: legendary + key: smtp-password --- apiVersion: v1 kind: Service diff --git a/mix.lock b/mix.lock index 6aa2936b..89f699cf 100644 --- a/mix.lock +++ b/mix.lock @@ -68,7 +68,7 @@ "plug_cowboy": {:hex, :plug_cowboy, "2.5.0", "51c998f788c4e68fc9f947a5eba8c215fbb1d63a520f7604134cab0270ea6513", [:mix], [{:cowboy, "~> 2.7", [hex: :cowboy, repo: "hexpm", optional: false]}, {:cowboy_telemetry, "~> 0.3", [hex: :cowboy_telemetry, repo: "hexpm", optional: false]}, {:plug, "~> 1.7", [hex: :plug, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "5b2c8925a5e2587446f33810a58c01e66b3c345652eeec809b76ba007acde71a"}, "plug_crypto": {:hex, :plug_crypto, "1.2.2", "05654514ac717ff3a1843204b424477d9e60c143406aa94daf2274fdd280794d", [:mix], [], "hexpm", "87631c7ad914a5a445f0a3809f99b079113ae4ed4b867348dd9eec288cecb6db"}, "postgrex": {:hex, :postgrex, "0.15.5", "aec40306a622d459b01bff890fa42f1430dac61593b122754144ad9033a2152f", [:mix], [{:connection, "~> 1.0", [hex: :connection, repo: "hexpm", optional: false]}, {:db_connection, "~> 2.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:decimal, "~> 1.5", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "ed90c81e1525f65a2ba2279dbcebf030d6d13328daa2f8088b9661eb9143af7f"}, - "pow": {:hex, :pow, "1.0.20", "b99993811af5233681bfc521e81ca706d25a56f2be54bad6424db327ce840ab9", [:mix], [{:ecto, "~> 2.2 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix, ">= 1.3.0 and < 1.6.0", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, ">= 2.0.0 and <= 3.0.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:plug, ">= 1.5.0 and < 2.0.0", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "4b6bd271399ccb353abbdbdc316199fe7fd7ae36bbf47059d53e366831c34fc8"}, + "pow": {:hex, :pow, "1.0.24", "d834f5ce40c9b15a810a942de6492314e0defa157b6503e63775014b165a9c10", [:mix], [{:ecto, "~> 2.2 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix, ">= 1.3.0 and < 1.6.0", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, ">= 2.0.0 and <= 3.0.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:plug, ">= 1.5.0 and < 2.0.0", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "70fe212f2b9a362a73e317cb33f506dbebd5d3bbfd3f64883898e77cc29ea9e5"}, "quantum": {:hex, :quantum, "2.4.0", "f2ad4b20988f848455d35ed0e884ba0c7629a27ee86cbec6a6e0fc214b6e69cf", [:mix], [{:calendar, "~> 0.17", [hex: :calendar, repo: "hexpm", optional: true]}, {:crontab, "~> 1.1", [hex: :crontab, repo: "hexpm", optional: false]}, {:gen_stage, "~> 0.12 or ~> 1.0", [hex: :gen_stage, repo: "hexpm", optional: false]}, {:swarm, "~> 3.3", [hex: :swarm, repo: "hexpm", optional: false]}, {:timex, "~> 3.1", [hex: :timex, repo: "hexpm", optional: true]}, {:tzdata, "~> 1.0", [hex: :tzdata, repo: "hexpm", optional: true]}], "hexpm", "a125a9e65a5af740a1198f3b05c1a736fce3942f5e0dc2901e0f9be5745bea99"}, "ranch": {:hex, :ranch, "1.8.0", "8c7a100a139fd57f17327b6413e4167ac559fbc04ca7448e9be9057311597a1d", [:make, :rebar3], [], "hexpm", "49fbcfd3682fab1f5d109351b61257676da1a2fdbe295904176d5e521a2ddfe5"}, "sitemap": {:hex, :sitemap, "1.1.0", "23a019cccef7c17090d0b493354ee47a94549db64fd1cf39bda7eb41c567729c", [:mix], [{:xml_builder, ">= 0.0.0", [hex: :xml_builder, repo: "hexpm", optional: false]}], "hexpm", "d21f2c3ac65567fbdbe231f9faaf802a48405aa487d24052964d3d818a3d8c22"}, diff --git a/script/console b/script/console index 28711888..ffe2c704 100755 --- a/script/console +++ b/script/console @@ -3,9 +3,8 @@ set -x set -e -FULL_PATH=$(realpath $0) -DIR_PATH=$(dirname $FULL_PATH) +DIR_PATH=$(dirname $0) $DIR_PATH/update -iex -S mix \ No newline at end of file +iex -S mix diff --git a/script/server b/script/server index 66d85385..9dea5283 100755 --- a/script/server +++ b/script/server @@ -3,8 +3,7 @@ set -x set -e -FULL_PATH=$(realpath $0) -DIR_PATH=$(dirname $FULL_PATH) +DIR_PATH=$(dirname $0) $DIR_PATH/update diff --git a/script/test b/script/test index 7ad18596..fb456593 100755 --- a/script/test +++ b/script/test @@ -3,8 +3,7 @@ set -x set -e -FULL_PATH=$(realpath $0) -DIR_PATH=$(dirname $FULL_PATH) +DIR_PATH=$(dirname $0) $DIR_PATH/bootstrap diff --git a/script/update b/script/update index 6771deb1..1e92daf3 100755 --- a/script/update +++ b/script/update @@ -3,8 +3,7 @@ set -x set -e -FULL_PATH=$(realpath $0) -DIR_PATH=$(dirname $FULL_PATH) +DIR_PATH=$(dirname $0) $DIR_PATH/bootstrap