Skip to content

fix: Build context disable #3405

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

Merged
merged 3 commits into from
May 20, 2023
Merged

fix: Build context disable #3405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
811be49
build-ctx-disable
gireesh-naidu May 19, 2023
9cbe108
build-ctx-disable with env variable
gireesh-naidu May 20, 2023
3bd6f48
review changes
gireesh-naidu May 20, 2023
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
24 changes: 18 additions & 6 deletions pkg/appClone/AppCloneService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -780,13 +780,25 @@ func (impl *AppCloneServiceImpl) CreateCiPipeline(req *cloneCiPipelineRequest) (
templateOverride := templateOverrideBean.CiTemplateOverride
ciBuildConfig := templateOverrideBean.CiBuildConfig
//getting new git material for this app
gitMaterial, err := impl.materialRepository.FindByAppIdAndCheckoutPath(req.appId, templateOverride.GitMaterial.CheckoutPath)
if err != nil {
impl.logger.Errorw("error in getting git material by appId and checkoutPath", "err", err, "appid", req.refAppId, "checkoutPath", templateOverride.GitMaterial.CheckoutPath)
return nil, err
//gitMaterial, err := impl.materialRepository.FindByAppIdAndCheckoutPath(req.appId, templateOverride.GitMaterial.CheckoutPath)
if len(req.gitMaterialMapping) == 0 {
impl.logger.Errorw("no git materials found for the app", "appId", req.appId)
return nil, fmt.Errorf("no git materials found for the app, %d", req.appId)
}
gitMaterialId := req.gitMaterialMapping[ciBuildConfig.GitMaterialId]
buildContextGitMaterialId := req.gitMaterialMapping[ciBuildConfig.BuildContextGitMaterialId]
if gitMaterialId == 0 {
for _, id := range req.gitMaterialMapping {
gitMaterialId = id
break
}
}
if buildContextGitMaterialId == 0 {
buildContextGitMaterialId = gitMaterialId
}
ciBuildConfig.GitMaterialId = gitMaterial.Id
templateOverride.GitMaterialId = gitMaterial.Id
ciBuildConfig.GitMaterialId = gitMaterialId
ciBuildConfig.BuildContextGitMaterialId = buildContextGitMaterialId
templateOverride.GitMaterialId = gitMaterialId
ciBuildConfig.Id = 0
ciPatchReq.CiPipeline.DockerConfigOverride = bean.DockerConfigOverride{
DockerRegistry: templateOverride.DockerRegistryId,
Expand Down
1 change: 1 addition & 0 deletions pkg/pipeline/CiConfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ type CiConfig struct {
BaseLogLocationPath string `env:"BASE_LOG_LOCATION_PATH" envDefault:"/home/devtron/"`
ClusterConfig *rest.Config
NodeLabel map[string]string
EnableBuildContext bool `env:"ENABLE_BUILD_CONTEXT" envDefault:"false"`
}

type CiVolumeMount struct {
Expand Down
1 change: 1 addition & 0 deletions pkg/pipeline/CiService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,6 +483,7 @@ func (impl *CiServiceImpl) buildWfRequestForCiPipeline(pipeline *pipelineConfig.
IgnoreDockerCachePull: impl.ciConfig.IgnoreDockerCacheForCI,
CacheInvalidate: trigger.InvalidateCache,
ExtraEnvironmentVariables: trigger.ExtraEnvironmentVariables,
EnableBuildContext: impl.ciConfig.EnableBuildContext,
}
if dockerRegistry != nil {

Expand Down
1 change: 1 addition & 0 deletions pkg/pipeline/WorkflowService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ type WorkflowRequest struct {
CacheInvalidate bool `json:"cacheInvalidate"`
IsPvcMounted bool `json:"IsPvcMounted"`
ExtraEnvironmentVariables map[string]string `json:"extraEnvironmentVariables"`
EnableBuildContext bool `json:"enableBuildContext"`
}

const (
Expand Down