Skip to content
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.

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

Hardcode path to docker images #23955

Merged
merged 2 commits into from
Apr 7, 2023
Merged

Conversation

techknowlogick
Copy link
Member

Fix #23954

This allows for building on platforms that don't have docker hub as the default container registry.

@techknowlogick techknowlogick added the topic/build PR changes how Gitea is built, i.e. regarding Docker or the Makefile label Apr 6, 2023
@techknowlogick techknowlogick added this to the 1.20.0 milestone Apr 6, 2023
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Apr 6, 2023
@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 Apr 6, 2023
@techknowlogick techknowlogick enabled auto-merge (squash) April 6, 2023 19:58
@silverwind
Copy link
Member

silverwind commented Apr 6, 2023

Is the /library path required? I recall it works without as well: docker.io/ubuntu.

Also we may want to update image names in .drone.yml for consistency.

@techknowlogick techknowlogick added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 6, 2023
@techknowlogick techknowlogick added the outdated/backport/v1.19 This PR should be backported to Gitea 1.19 label Apr 7, 2023
@techknowlogick
Copy link
Member Author

🤖 🎺

@techknowlogick techknowlogick merged commit 6148e38 into go-gitea:main Apr 7, 2023
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Apr 7, 2023
Fix go-gitea#23954

This allows for building on platforms that don't have docker hub as the
default container registry.
@GiteaBot GiteaBot added the backport/done All backports for this PR have been created label Apr 7, 2023
@lunny lunny removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 7, 2023
zjjhot added a commit to zjjhot/gitea that referenced this pull request Apr 7, 2023
* upstream/main:
  Clean template/helper.go (go-gitea#23922)
  Remove `Repository.getFilesChanged` to fix Actions `paths` and `paths-ignore` filter (go-gitea#23920)
  Hardcode path to docker images (go-gitea#23955)
  Title can be empty when creating tag only (go-gitea#23917)
  Actions: Use default branch as ref when a branch/tag delete occurs (go-gitea#23910)
  Refactor authors dropdown (send get request from frontend to avoid long wait time) (go-gitea#23890)
  [skip ci] Updated translations via Crowdin
  Merge `push to create`, `open PR from push`, and `push options` docs articles into one (go-gitea#23744)
  Delete deleted release attachments immediately from storage (go-gitea#23913)
  More specific and unique feed name for NuGet install command template. (go-gitea#23889)
  Treat PRs with agit flow as fork PRs when triggering actions. (go-gitea#23884)
  Use graceful editorconfig loader to reduce errors when loading malformed editorconfigs (go-gitea#21257)
  Remove -v from vulncheck (go-gitea#23953)
  Improve permission check of packages (go-gitea#23879)
  Adjust some documentations titles (go-gitea#23941)
6543 pushed a commit that referenced this pull request Apr 7, 2023
Backport #23955 by @techknowlogick

Fix #23954

This allows for building on platforms that don't have docker hub as the
default container registry.

Co-authored-by: techknowlogick <[email protected]>
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Aug 1, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. outdated/backport/v1.19 This PR should be backported to Gitea 1.19 topic/build PR changes how Gitea is built, i.e. regarding Docker or the Makefile
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Use of FQIN in Dockerfile FROM instructions.
7 participants