fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Up forms builder
[wolnelektury.git]
/
Dockerfile
diff --git
a/Dockerfile
b/Dockerfile
index
424f37b
..
d9a71d9
100644
(file)
--- a/
Dockerfile
+++ b/
Dockerfile
@@
-12,7
+12,7
@@
# Global build arguments. Stages using UID/GID must redeclare them
# (bare `ARG UID`) to bring them into scope; the defaults are set here.
# Global build arguments. Stages using UID/GID must redeclare them
# (bare `ARG UID`) to bring them into scope; the defaults are set here.
-ARG PYTHON_IMAGE=python:3.1
0
-trixie
+ARG PYTHON_IMAGE=python:3.1
2
-trixie
ARG UID=8100
ARG GID=8100
ARG UID=8100
ARG GID=8100
@@
-50,10
+50,6
@@
COPY requirements/requirements.txt requirements.txt
RUN --mount=type=cache,target=/root/.cache/pip \
pip install -r requirements.txt
RUN --mount=type=cache,target=/root/.cache/pip \
pip install -r requirements.txt
-RUN --mount=type=cache,target=/root/.cache/pip \
- pip install \
- psycopg2-binary \
- django-debug-toolbar==3.2.2
RUN addgroup --gid $GID app && \
adduser --gid $GID --home /app --uid $UID app
RUN addgroup --gid $GID app && \
adduser --gid $GID --home /app --uid $UID app
@@
-97,6
+93,11
@@
COPY src /app/src
#
FROM app AS static-builder
#
FROM app AS static-builder
+# django-pipeline compiler creates temp dirs in place. Let it.
+USER root
+RUN find /app/src/*/static -type d -exec chown app {} +
+USER app
+
RUN python manage.py collectstatic --noinput
RUN python manage.py collectstatic --noinput