github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

feat: add ability to customize the registry repo with a template

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2024-01-19 06:20:43 -05:00
parent ea28367689
commit 214dc9b69a
5 changed files with 67 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
plugins/registry/report.go
View File

@@ -13,15 +13,16 @@ func ReportSingleApp(appName string, format string, infoFlag string) error {
}
flags := map[string]common.ReportFunc{
"--registry-computed-image-repo": reportComputedImageRepo,
"--registry-image-repo": reportImageRepo,
"--registry-computed-push-on-release": reportComputedPushOnRelease,
"--registry-global-push-on-release": reportGlobalPushOnRelease,
"--registry-push-on-release": reportPushOnRelease,
"--registry-computed-server": reportComputedServer,
"--registry-global-server": reportGlobalServer,
"--registry-server": reportServer,
"--registry-tag-version": reportTagVersion,
"--registry-computed-image-repo": reportComputedImageRepo,
"--registry-image-repo": reportImageRepo,
"--registry-computed-push-on-release": reportComputedPushOnRelease,
"--registry-global-push-on-release": reportGlobalPushOnRelease,
"--registry-push-on-release": reportPushOnRelease,
"--registry-computed-server": reportComputedServer,
"--registry-global-server": reportGlobalServer,
"--registry-global-image-repo-template": reportGlobalImageRepoTemplate,
"--registry-server": reportServer,
"--registry-tag-version": reportTagVersion,
}
flagKeys := []string{}
@@ -36,8 +37,11 @@ func ReportSingleApp(appName string, format string, infoFlag string) error {
}
func reportComputedImageRepo(appName string) string {
imageRepo := reportImageRepo(appName)
imageRepo = strings.TrimSpace(imageRepo)
imageRepo := strings.TrimSpace(reportImageRepo(appName))
if imageRepo == "" {
imageRepo, _ = getImageRepoFromTemplate(appName)
}
if imageRepo == "" {
imageRepo = common.GetAppImageRepo(appName)
}
@@ -76,6 +80,10 @@ func reportComputedServer(appName string) string {
return strings.TrimSpace(server)
}
func reportGlobalImageRepoTemplate(appName string) string {
return common.PropertyGet("registry", "--global", "image-repo-template")
}
func reportGlobalServer(appName string) string {
return common.PropertyGet("registry", "--global", "server")
}