File tree Expand file tree Collapse file tree 2 files changed +7
-6
lines changed Expand file tree Collapse file tree 2 files changed +7
-6
lines changed Original file line number Diff line number Diff line change @@ -6,7 +6,6 @@ package setting
6
6
import (
7
7
"fmt"
8
8
"math"
9
- "net/url"
10
9
"os"
11
10
"path/filepath"
12
11
19
18
Storage * Storage
20
19
Enabled bool
21
20
ChunkedUploadPath string
22
- RegistryHost string
23
21
24
22
LimitTotalOwnerCount int64
25
23
LimitTotalOwnerSize int64
@@ -66,9 +64,6 @@ func loadPackagesFrom(rootCfg ConfigProvider) (err error) {
66
64
return err
67
65
}
68
66
69
- appURL , _ := url .Parse (AppURL )
70
- Packages .RegistryHost = appURL .Host
71
-
72
67
Packages .ChunkedUploadPath = filepath .ToSlash (sec .Key ("CHUNKED_UPLOAD_PATH" ).MustString ("tmp/package-upload" ))
73
68
if ! filepath .IsAbs (Packages .ChunkedUploadPath ) {
74
69
Packages .ChunkedUploadPath = filepath .ToSlash (filepath .Join (AppDataPath , Packages .ChunkedUploadPath ))
Original file line number Diff line number Diff line change @@ -5,6 +5,7 @@ package user
5
5
6
6
import (
7
7
"net/http"
8
+ "net/url"
8
9
9
10
"code.gitea.io/gitea/models/db"
10
11
org_model "code.gitea.io/gitea/models/organization"
@@ -15,6 +16,7 @@ import (
15
16
repo_model "code.gitea.io/gitea/models/repo"
16
17
"code.gitea.io/gitea/modules/base"
17
18
"code.gitea.io/gitea/modules/container"
19
+ "code.gitea.io/gitea/modules/httplib"
18
20
"code.gitea.io/gitea/modules/log"
19
21
"code.gitea.io/gitea/modules/optional"
20
22
alpine_module "code.gitea.io/gitea/modules/packages/alpine"
@@ -178,7 +180,11 @@ func ViewPackageVersion(ctx *context.Context) {
178
180
179
181
switch pd .Package .Type {
180
182
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
182
188
case packages_model .TypeAlpine :
183
189
branches := make (container.Set [string ])
184
190
repositories := make (container.Set [string ])
You can’t perform that action at this time.
0 commit comments