gapodo/forgejo
gapodo/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge 6256bab860 into 57df0f116a

Browse source
This commit is contained in:
zeripath 2022-11-06 00:14:39 -04:00 • committed by GitHub
commit 0858f8c65a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
routers/api/packages/api.go
View file

@ -40,7 +40,9 @@ func reqPackageAccess(accessMode perm.AccessMode) func(ctx *context.Context) {
}
}
func Routes(ctx gocontext.Context) *web.Route {
// CommonRoutes provide endpoints for most package managers (excepting docker HUB - see below)
// These are mounted on `/api/packages` (not `/api/v1/packages`)
func CommonRoutes(ctx gocontext.Context) *web.Route {
r := web.NewRoute()
r.Use(context.PackageContexter(ctx))
@ -301,7 +303,9 @@ func Routes(ctx gocontext.Context) *web.Route {
return r
}
func ContainerRoutes(ctx gocontext.Context) *web.Route {
// DockerContainerRoutes provides endpoints that match the Docker HUB API in order for facilitate downloading packages a docker packages
// These have to be mounted on `/v2/...` due to compatibility with the Docker HUB API
func DockerContainerRoutes(ctx gocontext.Context) *web.Route {
r := web.NewRoute()
r.Use(context.PackageContexter(ctx))

1
routers/api/v1/api.go
View file

@ -1073,6 +1073,7 @@ func Routes(ctx gocontext.Context) *web.Route {
}, repoAssignment())
})
// NOTE: these are Gitea package management API - see packages.CommonRoutes and packages.DockerContainerRoutes for endpoints that implement package manager APIs
m.Group("/packages/{username}", func() {
m.Group("/{type}/{name}/{version}", func() {
m.Get("", packages.GetPackage)

10
routers/init.go
View file

@ -185,9 +185,15 @@ func NormalRoutes(ctx context.Context) *web.Route {
r.Mount("/", web_routers.Routes(ctx))
r.Mount("/api/v1", apiv1.Routes(ctx))
r.Mount("/api/internal", private.Routes())
if setting.Packages.Enabled {
r.Mount("/api/packages", packages_router.Routes(ctx))
r.Mount("/v2", packages_router.ContainerRoutes(ctx))
// Add endpoints to match common package manager APIs
// This implements package support for most package managers
r.Mount("/api/packages", packages_router.CommonRoutes(ctx))
// This implements Docker HUB API (Note this is not preceded by /api but is instead /v2)
r.Mount("/v2", packages_router.DockerContainerRoutes(ctx))
}
return r
}