Make docker gitea/gitea:v1.16-dev etc refer to the latest build on that branch #18551

zeripath · 2022-02-02T13:03:40Z

One of the problems with our current docker tagging is that although we
have strict version tags, latest and dev we do not have a way for docker
users to track the current release branch. This PR simply suggests that
we use the 1.x-dev tag for these and we build and push these. This will
give users who want or need unreleased bug fixes the option of tracking
the pre-release version instead of simply jumping to dev.

Signed-off-by: Andrew Thornton art27@cantab.net

…at branch One of the problems with our current docker tagging is that although we have strict version tags, latest and dev we do not have a way for docker users to track the current release branch. This PR simply suggests that we use the 1.x-dev tag for these and we build and push these. This will give users who want or need unreleased bug fixes the option of tracking the pre-release version instead of simply jumping to dev. Signed-off-by: Andrew Thornton <art27@cantab.net>

6543

ACK

lunny · 2022-02-02T13:17:42Z

That should be 1.16 but not 1.16-dev ?

6543 · 2022-02-02T13:20:02Z

1.16 track latest specific release tag ... 1.16-dev track latest commit to release branch

lunny · 2022-02-02T13:25:49Z

1.16 track latest specific release tag ... 1.16-dev track latest commit to release branch

So we really need some documents update.

zeripath · 2022-02-02T13:28:01Z

Currently we use "auto tagging" when pushing tags to docker. So 1.x.y will auto tag 1.x and 1 too. (auto tagging as defined by https://github.com/drone-plugins/drone-manifest/blob/92722b712a4a378262ca8f3e39e34248646c8a7b/tagging/tagging.go#L21)

Thus gitea/gitea:1 = gitea/gitea:1.16 = gitea/gitea:1.16.0

and

gitea/gitea:1.15 = gitea/gitea:1.15.11

If we were to push the branch to 1.16 without the dev suffix we'd be changing that.

Signed-off-by: Andrew Thornton <art27@cantab.net>

zeripath · 2022-02-02T13:44:00Z

I've pushed up some non-automatic specific documentation changes but I can make it more generic if we're gonna backport this to 1.15.

zeripath · 2022-02-02T13:45:54Z

A more generic phrase would be:

If you'd like to run the latest commit from a release branch you can use the 
`:1.x-dev` tag, where x is the current minor version of Gitea. (e.g. `:1.16-dev`)

docs/content/doc/installation/with-docker-rootless.en-us.md

docs/content/doc/installation/with-docker.en-us.md

codecov-commenter · 2022-02-02T16:17:58Z

Codecov Report

Merging #18551 (a6652be) into main (80048c0) will increase coverage by 0.07%.
The diff coverage is 52.09%.

@@            Coverage Diff             @@
##             main   #18551      +/-   ##
==========================================
+ Coverage   46.25%   46.32%   +0.07%     
==========================================
  Files         842      846       +4     
  Lines      121180   121168      -12     
==========================================
+ Hits        56052    56136      +84     
+ Misses      58321    58230      -91     
+ Partials     6807     6802       -5

Impacted Files	Coverage Δ
models/commit.go	`62.50% <0.00%> (ø)`
models/release.go	`49.45% <0.00%> (-1.49%)`	⬇️
models/review.go	`50.29% <0.00%> (-0.60%)`	⬇️
models/user/external_login_user.go	`28.57% <ø> (ø)`
modules/gitgraph/graph_models.go	`80.85% <0.00%> (ø)`
modules/migration/pullrequest.go	`0.00% <0.00%> (ø)`
modules/migration/release.go	`0.00% <0.00%> (ø)`
modules/migration/review.go	`0.00% <0.00%> (ø)`
routers/web/org/teams.go	`0.00% <0.00%> (ø)`
routers/web/repo/commit.go	`26.16% <0.00%> (ø)`
... and 24 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 76e3111...a6652be. Read the comment docs.

Co-authored-by: zeripath <art27@cantab.net>

docs/content/doc/installation/with-docker-rootless.en-us.md

Co-authored-by: KN4CK3R <admin@oldschoolhack.me>

6543 · 2022-02-03T08:47:01Z

🚀

…at branch (go-gitea#18551) Backport go-gitea#18551 (Backporting this will enable this target to create 1.16-dev) One of the problems with our current docker tagging is that although we have strict version tags, latest and dev we do not have a way for docker users to track the current release branch. This PR simply suggests that we use the 1.x-dev tag for these and we build and push these. This will give users who want or need unreleased bug fixes the option of tracking the pre-release version instead of simply jumping to dev. Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: KN4CK3R <admin@oldschoolhack.me> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>

…at branch (#18551) (#18569) Backport #18551 (Backporting this will enable this target to create 1.16-dev) One of the problems with our current docker tagging is that although we have strict version tags, latest and dev we do not have a way for docker users to track the current release branch. This PR simply suggests that we use the 1.x-dev tag for these and we build and push these. This will give users who want or need unreleased bug fixes the option of tracking the pre-release version instead of simply jumping to dev. (Also contains backport for #18573) Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: KN4CK3R <admin@oldschoolhack.me> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>

…at branch (go-gitea#18551) (go-gitea#18569) Backport go-gitea#18551 One of the problems with our current docker tagging is that although we have strict version tags, latest and dev we do not have a way for docker users to track the current release branch. This PR simply suggests that we use the 1.x-dev tag for these and we build and push these. This will give users who want or need unreleased bug fixes the option of tracking the pre-release version instead of simply jumping to dev. However, there is a problem with go-gitea#18551/go-gitea#18569 whereby the manifest is not properly uploading. Therefore this PR adds in some debug logging in order to get this to debug things. Signed-off-by: Andrew Thornton <art27@cantab.net>

…at branch (#18551) (#18569) (#18575) Backport #18551 One of the problems with our current docker tagging is that although we have strict version tags, latest and dev we do not have a way for docker users to track the current release branch. This PR simply suggests that we use the 1.x-dev tag for these and we build and push these. This will give users who want or need unreleased bug fixes the option of tracking the pre-release version instead of simply jumping to dev. However, there is a problem with #18551/#18569 whereby the manifest is not properly uploading. Therefore this PR adds in some debug logging in order to get this to debug things. Signed-off-by: Andrew Thornton <art27@cantab.net>

It appears that go-gitea#18551 and go-gitea#18573 have a mistake in that raymond does not have an {{else}} on {{#equal}}. This PR notes that Sprig has a hasPrefix function and so we use this with another if. Signed-off-by: Andrew Thornton <art27@cantab.net>

Backport go-gitea#18578 It appears that go-gitea#18551 and go-gitea#18573 have a mistake in that raymond does not have an {{else}} on {{#equal}}. This PR notes that Sprig has a hasPrefix function and so we use this with another if. Signed-off-by: Andrew Thornton <art27@cantab.net>

Backport #18578 It appears that #18551 and #18573 have a mistake in that raymond does not have an {{else}} on {{#equal}}. This PR notes that Sprig has a hasPrefix function and so we use this with another if. Signed-off-by: Andrew Thornton <art27@cantab.net>

* Fix pushing to 1-x-dev docker tag It appears that #18551 and #18573 have a mistake in that raymond does not have an {{else}} on {{#equal}}. This PR notes that Sprig has a hasPrefix function and so we use this with another if. Signed-off-by: Andrew Thornton <art27@cantab.net> * Fix pushing to 1-x-dev docker tag (part 2) Although we now have the manifest working, we need to create the images. Here we adjust the .drone.yml to force building of the images Signed-off-by: Andrew Thornton <art27@cantab.net> * Fix pushing to 1-x-dev docker tag OK now we have the images building we should make sure that the main ones stays dev and the release/v* ones become *-dev-* Signed-off-by: Andrew Thornton <art27@cantab.net> * Apply suggestions from code review

* Fix pushing to 1-x-dev docker tag It appears that #18551 and #18573 have a mistake in that raymond does not have an {{else}} on {{#equal}}. This PR notes that Sprig has a hasPrefix function and so we use this with another if. Signed-off-by: Andrew Thornton <art27@cantab.net> * Fix pushing to 1-x-dev docker tag (part 2) Although we now have the manifest working, we need to create the images. Here we adjust the .drone.yml to force building of the images Signed-off-by: Andrew Thornton <art27@cantab.net> * Fix pushing to 1-x-dev docker tag OK now we have the images building we should make sure that the main ones stays dev and the release/v* ones become *-dev-* Signed-off-by: Andrew Thornton <art27@cantab.net>

* giteaofficial/main: Use `CryptoRandomBytes` instead of `CryptoRandomString` (go-gitea#18439) Remove the spurious space in the .ui.right additional selector (go-gitea#18605) Ensure commit-statuses box is sized correctly in headers (go-gitea#18538) [skip ci] Updated translations via Crowdin Prevent merge messages from being sorted to the top of email chains (go-gitea#18566) Fix pushing to 1-x-dev docker tag (go-gitea#18578) Replace `sync.Map` with normal maps (go-gitea#18584) Fix oauth docs usage for 2fa (go-gitea#18581) Update .gitattributes for .tmpl files (go-gitea#18576) Prevent panic on prohibited user login with oauth2 (go-gitea#18562) Fix manifest.tmpl (go-gitea#18573) Make docker gitea/gitea:v1.16-dev etc refer to the latest build on that branch (go-gitea#18551) Add dropdown icon to template loading dropdown (go-gitea#18564)

…at branch (go-gitea#18551) * Make docker gitea/gitea:v1.16-dev etc refer to the latest build on that branch One of the problems with our current docker tagging is that although we have strict version tags, latest and dev we do not have a way for docker users to track the current release branch. This PR simply suggests that we use the 1.x-dev tag for these and we build and push these. This will give users who want or need unreleased bug fixes the option of tracking the pre-release version instead of simply jumping to dev. Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: KN4CK3R <admin@oldschoolhack.me> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>

* Fix pushing to 1-x-dev docker tag It appears that go-gitea#18551 and go-gitea#18573 have a mistake in that raymond does not have an {{else}} on {{#equal}}. This PR notes that Sprig has a hasPrefix function and so we use this with another if. Signed-off-by: Andrew Thornton <art27@cantab.net> * Fix pushing to 1-x-dev docker tag (part 2) Although we now have the manifest working, we need to create the images. Here we adjust the .drone.yml to force building of the images Signed-off-by: Andrew Thornton <art27@cantab.net> * Fix pushing to 1-x-dev docker tag OK now we have the images building we should make sure that the main ones stays dev and the release/v* ones become *-dev-* Signed-off-by: Andrew Thornton <art27@cantab.net> * Apply suggestions from code review

zeripath added theme/docker labels Feb 2, 2022

zeripath added this to the 1.17.0 milestone Feb 2, 2022

6543 approved these changes Feb 2, 2022

View reviewed changes

GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Feb 2, 2022

update docs

a6652be

Signed-off-by: Andrew Thornton <art27@cantab.net>

6543 approved these changes Feb 2, 2022

View reviewed changes

zeripath commented Feb 2, 2022

View reviewed changes

docs/content/doc/installation/with-docker-rootless.en-us.md Outdated Show resolved Hide resolved

docs/content/doc/installation/with-docker.en-us.md Outdated Show resolved Hide resolved

wxiaoguang approved these changes Feb 3, 2022

View reviewed changes

GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Feb 3, 2022

Apply suggestions from code review

9290083

Co-authored-by: zeripath <art27@cantab.net>

KN4CK3R reviewed Feb 3, 2022

View reviewed changes

docs/content/doc/installation/with-docker-rootless.en-us.md Outdated Show resolved Hide resolved

zeripath and others added 2 commits February 3, 2022 08:15

Update docs/content/doc/installation/with-docker-rootless.en-us.md

fbc473d

Co-authored-by: KN4CK3R <admin@oldschoolhack.me>

Merge branch 'main' into docker-build-branch-images

3238b61

6543 merged commit bc77b28 into go-gitea:main Feb 3, 2022

zeripath deleted the docker-build-branch-images branch February 3, 2022 08:58

zeripath mentioned this pull request Feb 3, 2022

Make docker gitea/gitea:v1.16-dev etc refer to the latest build on that branch (#18551) #18569

Merged

zeripath added topic/build PR changes how Gitea is built, i.e. regarding Docker or the Makefile backport/done All backports for this PR have been created labels Feb 3, 2022

zeripath mentioned this pull request Feb 3, 2022

Make docker gitea/gitea:v1.15-dev etc refer to the latest build on that branch (#18551) (#18569) #18575

Merged

zeripath mentioned this pull request Feb 3, 2022

Fix pushing to 1-x-dev docker tag #18578

Merged

zeripath mentioned this pull request Feb 3, 2022

Fix pushing to 1-x-dev docker tag (#18578) #18579

Merged

zeripath mentioned this pull request Feb 3, 2022

Fix pushing to 1-x-dev docker tag (#18578) #18580

Merged

go-gitea locked and limited conversation to collaborators Apr 28, 2022

delvh added topic/distribution This PR changes something about the packaging of Gitea and removed theme/docker labels Oct 7, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make docker gitea/gitea:v1.16-dev etc refer to the latest build on that branch #18551

Make docker gitea/gitea:v1.16-dev etc refer to the latest build on that branch #18551

zeripath commented Feb 2, 2022

6543 left a comment

lunny commented Feb 2, 2022

6543 commented Feb 2, 2022

lunny commented Feb 2, 2022

zeripath commented Feb 2, 2022 •

edited

Loading

zeripath commented Feb 2, 2022

zeripath commented Feb 2, 2022 •

edited

Loading

codecov-commenter commented Feb 2, 2022

6543 commented Feb 3, 2022

Make docker gitea/gitea:v1.16-dev etc refer to the latest build on that branch #18551

Make docker gitea/gitea:v1.16-dev etc refer to the latest build on that branch #18551

Conversation

zeripath commented Feb 2, 2022

6543 left a comment

Choose a reason for hiding this comment

lunny commented Feb 2, 2022

6543 commented Feb 2, 2022

lunny commented Feb 2, 2022

zeripath commented Feb 2, 2022 • edited Loading

zeripath commented Feb 2, 2022

zeripath commented Feb 2, 2022 • edited Loading

codecov-commenter commented Feb 2, 2022

Codecov Report

6543 commented Feb 3, 2022

zeripath commented Feb 2, 2022 •

edited

Loading

zeripath commented Feb 2, 2022 •

edited

Loading