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.

Sign up for GitHub

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

breaking change: include sanitized hostname in offline registry path #562

Closed
wants to merge 8 commits into from
Closed

breaking change: include sanitized hostname in offline registry path #562

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
982403d
breaking change: include sanitized hostname in offline registry path
jeff-mccoy Jun 24, 2022
7be077f
Merge branch 'master' into 561-cant-deploy-zarf-package-built-with-im…
jeff-mccoy Jun 24, 2022
5a3874f
Merge branch 'master' into 561-cant-deploy-zarf-package-built-with-im…
jeff-mccoy Jul 6, 2022
212f9c3
Merge branch 'master' into 561-cant-deploy-zarf-package-built-with-im…
jeff-mccoy Jul 8, 2022
530a645
Merge branch 'master' into 561-cant-deploy-zarf-package-built-with-im…
jeff-mccoy Jul 17, 2022
0a6ee61
Merge branch 'master' into 561-cant-deploy-zarf-package-built-with-im…
jeff-mccoy Jul 18, 2022
6c1a3e2
Merge branch 'master' into 561-cant-deploy-zarf-package-built-with-im…
jeff-mccoy Jul 27, 2022
f0d3903
Merge branch 'master' into 561-cant-deploy-zarf-package-built-with-im…
jeff-mccoy Aug 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions src/internal/utils/image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
package utils

import "regexp"
import (
"regexp"

// For further explanation see https://regex101.com/library/PiL191 and https://regex101.com/r/PiL191/1
var hostParser = regexp.MustCompile(`(?im)^([a-z0-9\-.]+\.[a-z0-9\-]+:?[0-9]*)?/?(.+)$`)
"github.com/defenseunicorns/zarf/src/internal/message"
)

// For further explanation see https://regex101.com/r/DzfGag/1
var hostParser = regexp.MustCompile(`(?im)^(.*):(.*/.*)`)

// SwapHost Perform base url replacment without the docker libs
func SwapHost(src string, targetHost string) string {
var substitution = targetHost + "/$2"
return hostParser.ReplaceAllString(src, substitution)
func SwapHost(src, targetHost string) string {
message.Debugf("images.SwapHost(%s, %s)", src, targetHost)
return hostParser.ReplaceAllString(src, targetHost+"/$1.$2")
}