Commit 9a3cf4e1 authored by JuniorJPDJ's avatar JuniorJPDJ Committed by Georg Krause
Browse files

Allow running docker container as non-root

parent a1f03aa5
Pipeline #16518 passed with stages
in 15 minutes and 21 seconds
...@@ -2,25 +2,24 @@ FROM alpine:3.13 as builder ...@@ -2,25 +2,24 @@ FROM alpine:3.13 as builder
RUN \ RUN \
echo 'installing dependencies' && \ echo 'installing dependencies' && \
apk add --no-cache \ apk add --no-cache \
git \ git \
musl-dev \ musl-dev \
gcc \ gcc \
postgresql-dev \ postgresql-dev \
python3-dev \ python3-dev \
py3-psycopg2 \ py3-psycopg2 \
libldap \ libldap \
libffi-dev \ libffi-dev \
make \ make \
zlib-dev \ zlib-dev \
jpeg-dev \ jpeg-dev \
openldap-dev \ openldap-dev \
openssl-dev \ openssl-dev \
cargo \ cargo \
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
...@@ -53,21 +52,21 @@ ENV PATH="/venv/bin:$PATH" ...@@ -53,21 +52,21 @@ ENV PATH="/venv/bin:$PATH"
RUN apk add --no-cache \ RUN apk add --no-cache \
libmagic \ libmagic \
bash \ bash \
gettext \ gettext \
python3 \ python3 \
jpeg-dev \ jpeg-dev \
ffmpeg \ ffmpeg \
libpq \ libpq \
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
......
Allow running multi-container setup on non-root user inside docker (!1375) (fixes #1334)
Markdown is supported
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