diff options
| author | zeripath <art27@cantab.net> | 2021-12-01 18:08:27 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-01 18:08:27 +0000 |
| commit | 7d0629adf859bebbbefcfbc5dedb457b75a7ce00 (patch) | |
| tree | f97ee1b839a3293caea47fe917c802804602714f /Dockerfile.rootless | |
| parent | 042cac5fedeec8af53080b9666fe043072f3a6be (diff) | |
| download | gitea-7d0629adf859bebbbefcfbc5dedb457b75a7ce00.tar.gz gitea-7d0629adf859bebbbefcfbc5dedb457b75a7ce00.zip | |
Use shadowing script for docker (#17846)
Too many docker users are caught out by the default location for the
app.ini file being environment dependent so that when they docker exec
into the container the gitea commands do not work properly and require
additional -c arguments to correctly pick up the configuration.
This PR simply shadows the gitea binary using variants of the FHS
compatible script to make the command gitea have the default locations
by default.
Fix #14468
Reference #17497
Reference #12082
Reference #8941
... amongst others ...
Replace #17501
Signed-off-by: Andrew Thornton <art27@cantab.net>
Diffstat (limited to 'Dockerfile.rootless')
| -rw-r--r-- | Dockerfile.rootless | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Dockerfile.rootless b/Dockerfile.rootless index f6430e5f69..8bfaf9cb86 100644 --- a/Dockerfile.rootless +++ b/Dockerfile.rootless @@ -53,9 +53,9 @@ RUN mkdir -p /var/lib/gitea /etc/gitea RUN chown git:git /var/lib/gitea /etc/gitea COPY docker/rootless / -COPY --from=build-env --chown=root:root /go/src/code.gitea.io/gitea/gitea /usr/local/bin/gitea +COPY --from=build-env --chown=root:root /go/src/code.gitea.io/gitea/gitea /app/gitea/gitea COPY --from=build-env --chown=root:root /go/src/code.gitea.io/gitea/environment-to-ini /usr/local/bin/environment-to-ini -RUN chmod 755 /usr/local/bin/docker-entrypoint.sh /usr/local/bin/docker-setup.sh /usr/local/bin/gitea /usr/local/bin/environment-to-ini +RUN chmod 755 /usr/local/bin/docker-entrypoint.sh /usr/local/bin/docker-setup.sh /app/gitea/gitea /usr/local/bin/gitea /usr/local/bin/environment-to-ini #git:git USER 1000:1000 |