Commit f877c2a2 authored by JuniorJPDJ's avatar JuniorJPDJ
Browse files

Allow running docker container as non-root

parent 5b1c2f68
Pipeline #16406 passed with stages
in 13 minutes and 32 seconds
...@@ -20,7 +20,6 @@ RUN \ ...@@ -20,7 +20,6 @@ RUN \
libxml2-dev \ libxml2-dev \
libxslt-dev \ libxslt-dev \
&& \ && \
\
ln -s /usr/bin/python3 /usr/bin/python ln -s /usr/bin/python3 /usr/bin/python
# create virtual env for next stage # create virtual env for next stage
...@@ -62,12 +61,12 @@ RUN apk add --no-cache \ ...@@ -62,12 +61,12 @@ RUN apk add --no-cache \
libxml2 \ libxml2 \
libxslt \ libxslt \
&& \ && \
\
ln -s /usr/bin/python3 /usr/bin/python ln -s /usr/bin/python3 /usr/bin/python
COPY . /app
WORKDIR /app
RUN chmod 755 compose compose/django
ENTRYPOINT ["./compose/django/entrypoint.sh"] ENTRYPOINT ["./compose/django/entrypoint.sh"]
CMD ["./compose/django/server.sh"] CMD ["./compose/django/server.sh"]
COPY . /app
WORKDIR /app
...@@ -19,8 +19,7 @@ if [ -z "$CELERY_BROKER_URL" ]; then ...@@ -19,8 +19,7 @@ if [ -z "$CELERY_BROKER_URL" ]; then
fi fi
# we copy the frontend files, if any so we can serve them from the outside # we copy the frontend files, if any so we can serve them from the outside
if [ -d "frontend" ]; then if [ -d "frontend" ] && [ -d "/frontend" ]; then
mkdir -p /frontend
cp -r frontend/* /frontend/ cp -r frontend/* /frontend/
export FUNKWHALE_SPA_HTML_ROOT=/frontend/index.html export FUNKWHALE_SPA_HTML_ROOT=/frontend/index.html
fi fi
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment