[docker] Separate various /data/gitea #6652
Conversation
Codecov Report
@@ Coverage Diff @@
## master #6652 +/- ##
==========================================
+ Coverage 40.54% 40.76% +0.22%
==========================================
Files 406 407 +1
Lines 54501 54735 +234
==========================================
+ Hits 22095 22311 +216
+ Misses 29370 29369 -1
- Partials 3036 3055 +19
Continue to review full report at Codecov.
|
GiteaBot
added
the
lgtm/need 2
| @@ -6,41 +6,20 @@ if [ ! -d /data/git/.ssh ]; then | |||
| fi | |||
|
|
|||
| if [ ! -f /data/git/.ssh/environment ]; then | |||
| echo "GITEA_CUSTOM=/data/gitea" >| /data/git/.ssh/environment | |||
| echo "GITEA_CUSTOM=${GITEA_CUSTOM}" >| /data/git/.ssh/environment | |||
There was a problem hiding this comment.
A change of GITEA_CUSTOM will not propagate to the /data/git/.ssh/environment file.
See PR #6608 for a workaround:
https://github.com/go-gitea/gitea/pull/6608/files#diff-e9383835b6feff19b2e8f36745b70414R12
There was a problem hiding this comment.
We should wait for your PR to get merged and I will rebased this PR on.
| #!/bin/bash | ||
|
|
||
| # Define the environment variables | ||
| export DATA_PATH=${DATA_PATH:-"/data/gitea"} |
There was a problem hiding this comment.
Why are these hidden in a service file?
Except for the INSTALL_LOCK they can all go into the Dockerfile.
There was a problem hiding this comment.
Yes I didn't want to cluter the dockerfile but still wanted to have a dedicated file detailing all the env variable possible to use and their default. But it could be in the Dockerfile.
There was a problem hiding this comment.
I added a comment to the Dockerfile to indicate to go see this file.
There was a problem hiding this comment.
I agree that the various config options seem to clutter the Dockerfile.
Removing the GITEA_CUSTOM environment variable breaks the ad-hoc commands.
# docker run -d --name gitea_no_env gitea:sapk
# docker exec -it gitea_no_env gitea dump
2019/04/17 13:14:08 ...s/setting/setting.go:501:NewContext() [W] Custom config '/usr/local/bin/custom/conf/app.ini' not found, ignore this if you're running first time
<snip>
There was a problem hiding this comment.
Why DATA_PATH? APP_DATA_PATH is already a setting in app.ini we should keep name same for same purpose.
|
Please resolve conflicts. |
|
This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs during the next 2 months. Thank you for your contributions. |
|
This pull request has been automatically closed because of inactivity. You can re-open it if needed. |
This PR change nothing to the current used docker paths.
The goal is to distinguish paths (AppWorkPath, AppDataPath, CustomPath) that could be confusing based on default path of gitea.
It permit to detail what
/data/giteapath we are using at each use.Later we could revert to a more default path based on gitea.
Ex: GITEA_CUSTOM = WorkDir + "/custom"
But permitting to continue to use old paths by simply overriding the env variable.
And move the config of env variable in a dedicate file.