Skip to content

Commit a62ec02

Browse files
committed
try to remove RegistryHost
1 parent 29d15f3 commit a62ec02

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

modules/setting/packages.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ package setting
66
import (
77
"fmt"
88
"math"
9-
"net/url"
109
"os"
1110
"path/filepath"
1211

@@ -19,7 +18,6 @@ var (
1918
Storage *Storage
2019
Enabled bool
2120
ChunkedUploadPath string
22-
RegistryHost string
2321

2422
LimitTotalOwnerCount int64
2523
LimitTotalOwnerSize int64
@@ -66,9 +64,6 @@ func loadPackagesFrom(rootCfg ConfigProvider) (err error) {
6664
return err
6765
}
6866

69-
appURL, _ := url.Parse(AppURL)
70-
Packages.RegistryHost = appURL.Host
71-
7267
Packages.ChunkedUploadPath = filepath.ToSlash(sec.Key("CHUNKED_UPLOAD_PATH").MustString("tmp/package-upload"))
7368
if !filepath.IsAbs(Packages.ChunkedUploadPath) {
7469
Packages.ChunkedUploadPath = filepath.ToSlash(filepath.Join(AppDataPath, Packages.ChunkedUploadPath))

routers/web/user/package.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ package user
55

66
import (
77
"net/http"
8+
"net/url"
89

910
"code.gitea.io/gitea/models/db"
1011
org_model "code.gitea.io/gitea/models/organization"
@@ -15,6 +16,7 @@ import (
1516
repo_model "code.gitea.io/gitea/models/repo"
1617
"code.gitea.io/gitea/modules/base"
1718
"code.gitea.io/gitea/modules/container"
19+
"code.gitea.io/gitea/modules/httplib"
1820
"code.gitea.io/gitea/modules/log"
1921
"code.gitea.io/gitea/modules/optional"
2022
alpine_module "code.gitea.io/gitea/modules/packages/alpine"
@@ -178,7 +180,11 @@ func ViewPackageVersion(ctx *context.Context) {
178180

179181
switch pd.Package.Type {
180182
case packages_model.TypeContainer:
181-
ctx.Data["RegistryHost"] = setting.Packages.RegistryHost
183+
registryAppURL, err := url.Parse(httplib.GuessCurrentAppURL(ctx))
184+
if err != nil {
185+
registryAppURL, _ = url.Parse(setting.AppURL)
186+
}
187+
ctx.Data["RegistryHost"] = registryAppURL.Host
182188
case packages_model.TypeAlpine:
183189
branches := make(container.Set[string])
184190
repositories := make(container.Set[string])

0 commit comments

Comments
 (0)