Skip to content

Fix container push tag overwriting #35936

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
wxiaoguang merged 4 commits into from
Nov 14, 2025
Merged

Fix container push tag overwriting #35936

wxiaoguang merged 4 commits into from
Nov 14, 2025

Conversation

@wxiaoguang
Copy link
Contributor

@wxiaoguang wxiaoguang commented Nov 12, 2025

Fix #35853

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Nov 12, 2025
@github-actions github-actions bot added modifies/api This PR adds API routes or modifies them modifies/go Pull requests that update Go code labels Nov 12, 2025
@wxiaoguang wxiaoguang mentioned this pull request Nov 12, 2025
Closed
@wxiaoguang
Copy link
Contributor Author

wxiaoguang commented Nov 12, 2025 •
edited
Loading

The code pv.CreatedUnix doesn't seem right (it might be only for debug purpose when fixing the problem)

Also manually tested with "docker push" and "docker buildx":

image image

@wxiaoguang wxiaoguang marked this pull request as draft November 12, 2025 13:42
@wxiaoguang wxiaoguang added this to the 1.26.0 milestone Nov 12, 2025
@wxiaoguang wxiaoguang marked this pull request as ready for review November 12, 2025 13:55
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Nov 12, 2025
@wxiaoguang wxiaoguang mentioned this pull request Nov 13, 2025
Closed
25 tasks
@GiteaBot 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 Nov 13, 2025
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Nov 13, 2025
@wxiaoguang wxiaoguang mentioned this pull request Nov 14, 2025
Closed
@wxiaoguang wxiaoguang enabled auto-merge (squash) November 14, 2025 03:08
@wxiaoguang wxiaoguang merged commit 358de23 into go-gitea:main Nov 14, 2025
25 checks passed
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Nov 14, 2025
@wxiaoguang @GiteaBot
Fix container push tag overwriting (go-gitea#35936)
054a7f6 
Fix go-gitea#35853
@GiteaBot GiteaBot mentioned this pull request Nov 14, 2025
Merged
@GiteaBot GiteaBot added the backport/done All backports for this PR have been created label Nov 14, 2025
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Nov 14, 2025
@wxiaoguang wxiaoguang deleted the fix-container-push branch November 14, 2025 03:51
wxiaoguang added a commit that referenced this pull request Nov 14, 2025
@GiteaBot @wxiaoguang
Fix container push tag overwriting (#35936) (#35954)
1b01d6d 
Backport #35936 by wxiaoguang

Fix #35853

Co-authored-by: wxiaoguang <[email protected]>
zjjhot added a commit to zjjhot/gitea that referenced this pull request Nov 17, 2025
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
9336e09 
* giteaofficial/main:
  Fix diff blob excerpt expansion (go-gitea#35922)
  Add GITEA_PR_INDEX env variable to githooks (go-gitea#35938)
  Fix container push tag overwriting (go-gitea#35936)
  Upgrade deps golang.org/x/crypto (go-gitea#35952)
  Fix corrupted external render content (go-gitea#35946)
  Don't show unnecessary error message to end users for DeleteBranchAfterMerge (go-gitea#35937)
  Limit reading bytes instead of ReadAll (go-gitea#35928)
zjjhot added a commit to zjjhot/gitea that referenced this pull request Nov 24, 2025
@zjjhot
Merge remote-tracking branch 'giteaofficial/release/v1.25'
0a09b13 
* giteaofficial/release/v1.25: (77 commits)
  Add "site admin" back to profile menu (go-gitea#36010) (go-gitea#36013)
  release notes for 1.25.2 (go-gitea#35986)
  Allow empty commit when merging pull request with squash style (go-gitea#35989) (go-gitea#36003)
  Fix various permission & login related bugs (go-gitea#36002) (go-gitea#36004)
  upgrade golang.org/x/crypto to 0.45.0 (go-gitea#35988)
  Change project default column icon to 'star' (go-gitea#35967) (go-gitea#35979)
  Misc CSS fixes (go-gitea#35888) (go-gitea#35981)
  Fix container push tag overwriting (go-gitea#35936) (go-gitea#35954)
  Fix corrupted external render content (go-gitea#35946) (go-gitea#35950)
  Don't show unnecessary error message to end users for DeleteBranchAfterMerge (go-gitea#35937) (go-gitea#35941)
  Limit read bytes instead of ReadAll (go-gitea#35928) (go-gitea#35934)
  Load jQuery as early as possible to support custom scripts (go-gitea#35926) (go-gitea#35929)
  Allow to display embed images/pdfs when SERVE_DIRECT was enabled on MinIO storage (go-gitea#35882) (go-gitea#35917)
  Use correct form field for allowed force push users in branch protection API (go-gitea#35894) (go-gitea#35908)
  Make OAuth2 issuer configurable (go-gitea#35915) (go-gitea#35916)
  Fix go-gitea#35763: Add proper page title for project pages (go-gitea#35773) (go-gitea#35909)
  Display source code downloads last for release attachments (go-gitea#35897) (go-gitea#35903)
  Fix team member access check (go-gitea#35899) (go-gitea#35905)
  Fix conda null depend issue (go-gitea#35900) (go-gitea#35902)
  Fix avatar upload error handling (go-gitea#35887) (go-gitea#35890)
  ...

# Conflicts:
#	go.mod
#	go.sum
#	models/actions/run_test.go
#	models/fixtures/action_run.yml
#	models/fixtures/action_run_job.yml
#	models/fixtures/action_task.yml
#	models/fixtures/branch.yml
#	models/fixtures/repo_unit.yml
#	modules/git/tree_entry_gogit.go
#	modules/git/tree_gogit.go
#	routers/web/repo/actions/view.go
#	routers/web/repo/issue_comment.go
#	services/actions/workflow.go
#	services/doctor/actions_test.go
#	services/pull/comment.go
#	services/pull/pull.go
#	services/pull/temp_repo.go
#	templates/base/head_navbar.tmpl
#	templates/swagger/v1_json.tmpl
#	tests/integration/actions_schedule_test.go
#	tests/integration/git_lfs_ssh_test.go
#	tests/integration/pull_create_test.go
#	tests/integration/pull_merge_test.go
#	tests/sqlite.ini.tmpl
#	web_src/js/components/ContextPopup.vue
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lunny lunny lunny approved these changes

+1 more reviewer

@Zettat123 Zettat123 Zettat123 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

backport/done All backports for this PR have been created backport/v1.25 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/api This PR adds API routes or modifies them modifies/go Pull requests that update Go code type/bug

Projects

None yet

Milestone

1.26.0

Development

Successfully merging this pull request may close these issues.

Can't overwrite package tags

4 participants

@wxiaoguang @lunny @Zettat123 @GiteaBot