serv/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2024-12-28 13:33:47 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fix-docker-db-dir-permissions' into 'next'

Browse source 
Fix(docker): Make conduit own default db path

See merge request famedly/conduit!320
This commit is contained in:
Jonas Zohren 2022-02-22 15:34:14 +00:00
commit 6788225cac
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
docker/ci-binaries-packaging.Dockerfile
View file

@ -48,8 +48,6 @@ LABEL org.opencontainers.image.created=${CREATED} \
org.opencontainers.image.documentation="https://gitlab.com/famedly/conduit" \ org.opencontainers.image.documentation="https://gitlab.com/famedly/conduit" \
org.opencontainers.image.ref.name="" org.opencontainers.image.ref.name=""
# Created directory for the database and media files
RUN mkdir -p ${DEFAULT_DB_PATH}
# Test if Conduit is still alive, uses the same endpoint as Element # Test if Conduit is still alive, uses the same endpoint as Element
COPY ./docker/healthcheck.sh /srv/conduit/healthcheck.sh COPY ./docker/healthcheck.sh /srv/conduit/healthcheck.sh
@ -67,7 +65,9 @@ RUN set -x ; \
# Change ownership of Conduit files to conduit user and group # Change ownership of Conduit files to conduit user and group
RUN chown -cR conduit:conduit /srv/conduit && \ RUN chown -cR conduit:conduit /srv/conduit && \
chmod +x /srv/conduit/healthcheck.sh chmod +x /srv/conduit/healthcheck.sh && \
mkdir -p ${DEFAULT_DB_PATH} && \
chown -cR conduit:conduit ${DEFAULT_DB_PATH}
# Change user to conduit # Change user to conduit
USER conduit USER conduit