From fd3b3177e17e2f3a75a1e58ccd1e0b20f153d08b Mon Sep 17 00:00:00 2001 From: Kegan Myers Date: Sun, 23 Jul 2023 03:00:54 -0500 Subject: [PATCH] install frontends in container; use local sha for final image tag --- Dockerfile | 5 ++++- build.sh | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6d561b1..3093103 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,4 +10,7 @@ USER root RUN mkdir /config && touch /config/prod.secret.exs && chown -R 1000:1000 /opt/akkoma && chown -R 1000:1000 /config USER akkoma -RUN mix deps.get && mix compile +RUN mix deps.get && \ + mix compile && \ + mix pleroma.frontend install pleroma-fe --ref stable && \ + mix pleroma.frontend install admin-fe --ref stable diff --git a/build.sh b/build.sh index 4a838f0..29c4c10 100755 --- a/build.sh +++ b/build.sh @@ -2,8 +2,9 @@ set -Eeuxo pipefail AKKOMA_COMMIT=$(cd src; git rev-parse HEAD) +LOCAL_COMMIT=$(git rev-parse HEAD) AKKOMA_BASE_IMAGE="registry.nrd.li/nrdli/akkoma-base:${AKKOMA_COMMIT}" -AKKOMA_FINAL_IMAGE="registry.nrd.li/nrdli/akkoma:${AKKOMA_COMMIT}" +AKKOMA_FINAL_IMAGE="registry.nrd.li/nrdli/akkoma:${LOCAL_COMMIT}" pushd src docker build \