From 43d598dbc784d7375c7fdb6d02fc6c12ff463115 Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 20 Jun 2024 17:25:29 +0200 Subject: [PATCH] collect static files at build image Signed-off-by: Alex --- tools/docker/Dockerfile | 2 ++ tools/docker/docker-compose-dev-redis-tls.yaml | 3 +-- tools/docker/docker-compose-dev.yaml | 3 +-- tools/docker/docker-compose-mac.yml | 3 +-- tools/docker/docker-compose-stage.yaml | 3 +-- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index b49d546e5..939f8369e 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -1,6 +1,7 @@ FROM quay.io/centos/centos:stream9 ARG USER_ID=${USER_ID:-1001} +ARG STATIC_ROOT=/var/lib/eda/static RUN useradd --uid "$USER_ID" --gid 0 --home-dir /app --create-home eda \ && mkdir -p /app/.local /var/lib/eda/ \ && chown -R "${USER_ID}:0" /app/.local /var/lib/eda \ @@ -52,6 +53,7 @@ RUN poetry install -E all --no-root --no-cache \ COPY . $SOURCES_DIR/ RUN poetry install -E all --only-root RUN pip install ansible-core +RUN EDA_SECRET_KEY=dummy EDA_STATIC_ROOT=${STATIC_ROOT} aap-eda-manage collectstatic --noinput --clear USER 0 RUN for dir in \ diff --git a/tools/docker/docker-compose-dev-redis-tls.yaml b/tools/docker/docker-compose-dev-redis-tls.yaml index 442ea0782..cc36a7e2c 100644 --- a/tools/docker/docker-compose-dev-redis-tls.yaml +++ b/tools/docker/docker-compose-dev-redis-tls.yaml @@ -84,8 +84,7 @@ services: - /bin/bash - -c - >- - aap-eda-manage collectstatic --noinput - && aap-eda-manage migrate + aap-eda-manage migrate && aap-eda-manage create_initial_data && scripts/create_superuser.sh && aap-eda-manage runserver 0.0.0.0:8000 diff --git a/tools/docker/docker-compose-dev.yaml b/tools/docker/docker-compose-dev.yaml index a6536260d..69c078249 100644 --- a/tools/docker/docker-compose-dev.yaml +++ b/tools/docker/docker-compose-dev.yaml @@ -100,8 +100,7 @@ services: - /bin/bash - -c - >- - aap-eda-manage collectstatic --noinput - && aap-eda-manage migrate + aap-eda-manage migrate && aap-eda-manage create_initial_data && scripts/create_superuser.sh && aap-eda-manage runserver 0.0.0.0:8000 diff --git a/tools/docker/docker-compose-mac.yml b/tools/docker/docker-compose-mac.yml index 21992f696..888905d1b 100644 --- a/tools/docker/docker-compose-mac.yml +++ b/tools/docker/docker-compose-mac.yml @@ -54,8 +54,7 @@ services: - /bin/bash - -c - >- - aap-eda-manage collectstatic --noinput - && aap-eda-manage migrate + aap-eda-manage migrate && aap-eda-manage create_initial_data && scripts/create_superuser.sh && aap-eda-manage runserver 0.0.0.0:8000 diff --git a/tools/docker/docker-compose-stage.yaml b/tools/docker/docker-compose-stage.yaml index e25e9a00b..a76f0abde 100644 --- a/tools/docker/docker-compose-stage.yaml +++ b/tools/docker/docker-compose-stage.yaml @@ -70,8 +70,7 @@ services: - /bin/bash - -c - >- - aap-eda-manage collectstatic --noinput - && aap-eda-manage migrate + aap-eda-manage migrate && aap-eda-manage create_initial_data && scripts/create_superuser.sh && gunicorn -b 0.0.0.0:8000