Skip to content

cherry pick #4353 to release 3.4.1 #4368

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

Open
wants to merge 1 commit into
base: release-3.4.1
Choose a base branch
from
Open

cherry pick #4353 to release 3.4.1 #4368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion pkg/microservice/aslan/core/workflow/service/workflow/controller/job/job_build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1178,8 +1178,12 @@ func getBuildJobVariables(build *commonmodels.ServiceAndBuild, taskID int64, pro

// repo envs
ret = append(ret, getReposVariables(build.Repos)...)

// build specific envs
ret = append(ret, &commonmodels.KeyVal{Key: "DOCKER_REGISTRY_HOST", Value: registry.RegAddr, IsCredential: false})
registryHost := strings.TrimPrefix(registry.RegAddr, "http://")
registryHost = strings.TrimPrefix(registryHost, "https://")
ret = append(ret, &commonmodels.KeyVal{Key: "DOCKER_REGISTRY_HOST", Value: registryHost, IsCredential: false})
ret = append(ret, &commonmodels.KeyVal{Key: "DOCKER_REGISTRY_NAMESPACE", Value: registry.Namespace, IsCredential: false})
ret = append(ret, &commonmodels.KeyVal{Key: "DOCKER_REGISTRY_AK", Value: registry.AccessKey, IsCredential: false})
ret = append(ret, &commonmodels.KeyVal{Key: "DOCKER_REGISTRY_SK", Value: registry.SecretKey, IsCredential: true})

Expand Down
5 changes: 4 additions & 1 deletion pkg/microservice/aslan/core/workflow/service/workflow/controller/job/job_vm_deploy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,7 +663,10 @@ func getVMDeployJobVariables(vmDeploy *commonmodels.ServiceAndVMDeploy, buildInf
ret = append(ret, prepareDefaultWorkflowTaskEnvs(project, workflowName, workflowDisplayName, infrastructure, taskID)...)

// registry envs
ret = append(ret, &commonmodels.KeyVal{Key: "DOCKER_REGISTRY_HOST", Value: registry.RegAddr, IsCredential: false})
registryHost := strings.TrimPrefix(registry.RegAddr, "http://")
registryHost = strings.TrimPrefix(registryHost, "https://")
ret = append(ret, &commonmodels.KeyVal{Key: "DOCKER_REGISTRY_HOST", Value: registryHost, IsCredential: false})
ret = append(ret, &commonmodels.KeyVal{Key: "DOCKER_REGISTRY_NAMESPACE", Value: registry.Namespace, IsCredential: false})
ret = append(ret, &commonmodels.KeyVal{Key: "DOCKER_REGISTRY_AK", Value: registry.AccessKey, IsCredential: false})
ret = append(ret, &commonmodels.KeyVal{Key: "DOCKER_REGISTRY_SK", Value: registry.SecretKey, IsCredential: true})

Expand Down