kopia lustrzana https://dev.funkwhale.audio/funkwhale/funkwhale
Allow running docker container as non-root
rodzic
a1f03aa5cf
commit
9a3cf4e1dd
|
@ -20,7 +20,6 @@ RUN \
|
|||
libxml2-dev \
|
||||
libxslt-dev \
|
||||
&& \
|
||||
\
|
||||
ln -s /usr/bin/python3 /usr/bin/python
|
||||
|
||||
# create virtual env for next stage
|
||||
|
@ -62,12 +61,12 @@ RUN apk add --no-cache \
|
|||
libxml2 \
|
||||
libxslt \
|
||||
&& \
|
||||
\
|
||||
ln -s /usr/bin/python3 /usr/bin/python
|
||||
|
||||
|
||||
ENTRYPOINT ["./compose/django/entrypoint.sh"]
|
||||
CMD ["./compose/django/server.sh"]
|
||||
|
||||
COPY . /app
|
||||
WORKDIR /app
|
||||
|
||||
RUN chmod 755 compose compose/django
|
||||
|
||||
ENTRYPOINT ["./compose/django/entrypoint.sh"]
|
||||
CMD ["./compose/django/server.sh"]
|
||||
|
|
|
@ -19,8 +19,7 @@ if [ -z "$CELERY_BROKER_URL" ]; then
|
|||
fi
|
||||
|
||||
# we copy the frontend files, if any so we can serve them from the outside
|
||||
if [ -d "frontend" ]; then
|
||||
mkdir -p /frontend
|
||||
if [ -d "frontend" ] && [ -d "/frontend" ]; then
|
||||
cp -r frontend/* /frontend/
|
||||
export FUNKWHALE_SPA_HTML_ROOT=/frontend/index.html
|
||||
fi
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
Allow running multi-container setup on non-root user inside docker (!1375) (fixes #1334)
|
Ładowanie…
Reference in New Issue