collect static files at build image

Signed-off-by: Alex <aizquier@redhat.com>
ansible · Jun 20, 2024 · 43d598d · 43d598d
1 parent 7e2fea6
commit 43d598d
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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