diff options
| author | tusooa <tusooa@kazv.moe> | 2023-08-10 00:42:29 +0000 |
|---|---|---|
| committer | tusooa <tusooa@kazv.moe> | 2023-08-10 00:42:29 +0000 |
| commit | b729a8b140306fd67817442bdde1299e05aca5b2 (patch) | |
| tree | f70c458b12e5499413ecd8060d46522952db1a3e | |
| parent | 4e355b8595a5c4ff7aaaa4c0755b3dc7a37c6b6c (diff) | |
| parent | c298e0165c29b30380466910bb328964a7264c4c (diff) | |
| download | pleroma-b729a8b140306fd67817442bdde1299e05aca5b2.tar.gz pleroma-b729a8b140306fd67817442bdde1299e05aca5b2.zip | |
Merge branch 'fix-dockerfile-perms' into 'develop'
Fix config ownership in dockerfile to pass restriction test
See merge request pleroma/pleroma!3931
| -rw-r--r-- | Dockerfile | 2 | ||||
| -rw-r--r-- | changelog.d/dockerfile-config-perms.fix | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Dockerfile b/Dockerfile index 310d18104..72c227b76 100644 --- 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 new file mode 100644 index 000000000..49ea5becb --- /dev/null +++ b/changelog.d/dockerfile-config-perms.fix @@ -0,0 +1 @@ +- Fix config ownership in dockerfile to pass restriction test |