Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
funkwhale
funkwhale
Commits
9a3cf4e1
Commit
9a3cf4e1
authored
Sep 12, 2021
by
JuniorJPDJ
Committed by
Georg Krause
Sep 20, 2021
Browse files
Allow running docker container as non-root
parent
a1f03aa5
Pipeline
#16519
passed with stages
in 61 minutes and 53 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
api/Dockerfile
View file @
9a3cf4e1
...
...
@@ -2,25 +2,24 @@ FROM alpine:3.13 as builder
RUN
\
echo
'installing dependencies'
&&
\
apk add
--no-cache
\
git
\
musl-dev
\
apk add
--no-cache
\
git
\
musl-dev
\
gcc
\
postgresql-dev
\
python3-dev
\
py3-psycopg2
\
libldap
\
libffi-dev
\
make
\
zlib-dev
\
jpeg-dev
\
python3-dev
\
py3-psycopg2
\
libldap
\
libffi-dev
\
make
\
zlib-dev
\
jpeg-dev
\
openldap-dev
\
openssl-dev
\
cargo
\
libxml2-dev
\
libxslt-dev
\
&&
\
\
ln
-s
/usr/bin/python3 /usr/bin/python
# create virtual env for next stage
...
...
@@ -53,21 +52,21 @@ ENV PATH="/venv/bin:$PATH"
RUN
apk add
--no-cache
\
libmagic
\
bash
\
gettext
\
python3
\
bash
\
gettext
\
python3
\
jpeg-dev
\
ffmpeg
\
libpq
\
ffmpeg
\
libpq
\
libxml2
\
libxslt
\
&&
\
\
ln
-s
/usr/bin/python3 /usr/bin/python
COPY
. /app
WORKDIR
/app
RUN
chmod
755 compose compose/django
ENTRYPOINT
["./compose/django/entrypoint.sh"]
CMD
["./compose/django/server.sh"]
COPY
. /app
WORKDIR
/app
api/compose/django/entrypoint.sh
View file @
9a3cf4e1
...
...
@@ -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
...
...
changes/changelog.d/1334.enhancement
0 → 100644
View file @
9a3cf4e1
Allow running multi-container setup on non-root user inside docker (!1375) (fixes #1334)
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment