Rootless Docker - Mistake with the repo-avatars parent folder name

[melroy89]

There was a mistake when choosing the structure for the repo avatars parent folder and it added a spurious /gitea.

The data directory should contain folders like:

• attachments/
• avatars/
• log/
• repo-avatars/

[wolfogre]

I would say, it's not a big mistake, it's just a mistake.

[wxiaoguang]

I would say, it's not a big mistake, it's just a mistake.

But if this PR gets merged, there will be the biggest mistake. It breaks the existing users Out-dated

---

Update: it seems fine

[wolfogre]

But if this PR gets merged, there will be the biggest mistake. It breaks the existing users ....

I don't think so, the file is a template to generate the config file, and it works only if there's no config file. I believe this is the only place it's used:

gitea/docker/rootless/usr/local/bin/docker-setup.sh

Line 47 in 74466eb

envsubst < /etc/templates/app.ini > ${GITEA_APP_INI}

[wxiaoguang]

But if this PR gets merged, there will be the biggest mistake. It breaks the existing users ....

I don't think so, the file is a template to generate the config file, and it works only if there's no config file. I believe this is the only place it's used:

Yup, you are right, edited the previous comment, I worried too much (in history, some users just do re-install without app.ini and causes various problems, I think there won't be such problem any more nowadays).

[melroy89]

This is the only folder that was left over in this wrong directory right?

Last night I did a major migration from postgresql database as well as gitea rootless migration. Which involved moving quite some directories.

So my point is; maybe there are other folder locations/configurations that also need to be updated. Or this is the last left over change..?

[lunny]

This is the only folder that was left over in this wrong directory right?

Last night I did a major migration from postgresql database as well as gitea rootless migration. Which involved moving quite some directories.

So my point is; maybe there are other folder locations/configurations that also need to be updated. Or this is the last left over change..?

Looks like it's the last one in this app.ini template file.

[melroy89]

I see a lot commits getting pushed into this PR? Is that intentionally?

Or is the PR already merge into main?

[jolheiser]

It is when someone updates the branch from main, as we require PRs to be up-to-date before merging. It's in the list to get merged. 🙂

[zeripath]

Merged using 🪄 as this could not fail tests.

[zeripath]

Please send backport

[melroy89]

Merged using 🪄 as this could not fail tests.

That depends how you wrote your tests and what it is testing 😉

[melroy89]

It is when someone updates the branch from main, as we require PRs to be up-to-date before merging. It's in the list to get merged. slightly_smiling_face

@jolheiser I can still give feedback on this response?

It's a good practice to use git rebase instead of git merge for this. Which gives a much cleaner result.

[delvh]

Well… not if you use git merge --squash like we do.

[melroy89]

...then it doesn't matter indeed, it will squashed into 1 commit which will produce a new commit on the main branch.

[lunny]

...then it doesn't matter indeed, it will squashed into 1 commit which will produce a new commit on the main branch.

If you merge, all pull request review history(the checkbox on the files of the pull request) could be reserved. If there are many files changed on the pull request, it's very useful. But if you rebase, those history will be disappeared.