From 1cd23988756cb44bb3187fb1701ac1ee572f8e08 Mon Sep 17 00:00:00 2001 From: Elijah Wright Date: Tue, 10 Jun 2025 09:33:26 -0700 Subject: [PATCH] compile domain regex only once --- runner-manager/cfd/cmd/drive/get_job_config.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/runner-manager/cfd/cmd/drive/get_job_config.go b/runner-manager/cfd/cmd/drive/get_job_config.go index c3a6ff4..bd89a01 100644 --- a/runner-manager/cfd/cmd/drive/get_job_config.go +++ b/runner-manager/cfd/cmd/drive/get_job_config.go @@ -68,6 +68,9 @@ type CIVar struct { Value string } +// match images w/ docker domain, or no domain (i.e. docker by default) +var domainRegex = regexp.MustCompile(`^((registry-\d+|index)?\.?docker\.io\/|[^.]*(:|$))`) + type VcapAppData struct { CFApi string `json:"cf_api"` OrgID string `json:"org_id"` @@ -197,14 +200,11 @@ func (cfg *JobConfig) processImage(img Image, m *cloudgov.AppManifest) { if img.Name != "" { m.Docker.Image = img.Name - // match images w/ docker domain, or no domain (i.e. docker by default) - re := regexp.MustCompile(`^((registry-\d+|index)?\.?docker\.io\/|[^.]*(:|$))`) - // TODO: #95 if strings.Contains(img.Name, "registry.gitlab.com") { m.Docker.Username = cfg.CIRegistryUser m.Docker.Password = cfg.CIRegistryPass - } else if re.FindString(img.Name) != "" { + } else if domainRegex.FindString(img.Name) != "" { m.Docker.Username = cfg.DockerHubUser m.Docker.Password = cfg.DockerHubToken }