logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: b729a8b140306fd67817442bdde1299e05aca5b2
parent 4e355b8595a5c4ff7aaaa4c0755b3dc7a37c6b6c
Author: tusooa <tusooa@kazv.moe>
Date:   Thu, 10 Aug 2023 00:42:29 +0000

Merge branch 'fix-dockerfile-perms' into 'develop'

Fix config ownership in dockerfile to pass restriction test

See merge request pleroma/pleroma!3931

Diffstat:

MDockerfile2+-
Achangelog.d/dockerfile-config-perms.fix1+
2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile @@ -49,7 +49,7 @@ USER pleroma COPY --from=build --chown=pleroma:0 /release ${HOME} -COPY ./config/docker.exs /etc/pleroma/config.exs +COPY --chown=pleroma --chmod=640 ./config/docker.exs /etc/pleroma/config.exs COPY ./docker-entrypoint.sh ${HOME} EXPOSE 4000 diff --git a/changelog.d/dockerfile-config-perms.fix b/changelog.d/dockerfile-config-perms.fix @@ -0,0 +1 @@ +- Fix config ownership in dockerfile to pass restriction test