From a55ca60df5354ad65fff8ae6472477dfbe54189c Mon Sep 17 00:00:00 2001 From: Kegan Myers Date: Sun, 23 Jul 2023 17:25:51 -0500 Subject: [PATCH] update static dir in placeholder config; combine install steps again --- Dockerfile | 11 ++++++----- prod.secret.exs | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index aba55b0..b997278 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,8 +15,9 @@ ADD --chown=akkoma:akkoma akkoma /opt/akkoma ADD --chown=akkoma:akkoma static /opt/akkoma-static WORKDIR /opt/akkoma -RUN mix local.hex --force && mix local.rebar --force -RUN mix deps.get -RUN mix compile -RUN mix pleroma.frontend install pleroma-fe --ref stable -RUN mix pleroma.frontend install admin-fe --ref stable +RUN mix local.hex --force && \ + mix local.rebar --force && \ + mix deps.get && \ + mix compile && \ + mix pleroma.frontend install pleroma-fe --ref stable && \ + mix pleroma.frontend install admin-fe --ref stable diff --git a/prod.secret.exs b/prod.secret.exs index 68bd1dc..0babdfc 100644 --- a/prod.secret.exs +++ b/prod.secret.exs @@ -29,7 +29,7 @@ config :pleroma, Pleroma.Repo, config :pleroma, :database, rum_enabled: false -config :pleroma, :instance, static_dir: "/opt/akkoma/instance/static" +config :pleroma, :instance, static_dir: "/opt/akkoma-static" config :pleroma, Pleroma.Upload, uploader: Pleroma.Uploaders.S3,