Build With Dockerfile template and without dockerfile(using buildpack)

Makefile

@@ -18,7 +18,7 @@ SERVER_MODE_EA_ONLY=EA_ONLY
 include $(ENV_FILE)
 export
 
-build: clean wire
+build: clean wire test
 	$(ENVVAR) GOOS=$(GOOS) go build -o devtron \
 			-ldflags="-X 'github.com/devtron-labs/devtron/util.GitCommit=${GIT_COMMIT}' \
 			-X 'github.com/devtron-labs/devtron/util.BuildTime=${BUILD_TIME}' \
@@ -30,6 +30,9 @@ wire:
 clean:
 	rm -f devtron
 
+test:
+	go test ./pkg/pipeline
+
 run: build
 	./devtron
 

Wire.go

@@ -740,13 +740,16 @@ func InitializeApp() (*App, error) {
 		wire.Bind(new(repository.UserAttributesRepository), new(*repository.UserAttributesRepositoryImpl)),
 		pipelineConfig.NewPipelineStatusTimelineRepositoryImpl,
 		wire.Bind(new(pipelineConfig.PipelineStatusTimelineRepository), new(*pipelineConfig.PipelineStatusTimelineRepositoryImpl)),
-
 		wire.Bind(new(pipeline.DeploymentConfigService), new(*pipeline.DeploymentConfigServiceImpl)),
 		pipeline.NewDeploymentConfigServiceImpl,
-
 		pipelineConfig.NewCiTemplateOverrideRepositoryImpl,
 		wire.Bind(new(pipelineConfig.CiTemplateOverrideRepository), new(*pipelineConfig.CiTemplateOverrideRepositoryImpl)),
-
+		pipelineConfig.NewCiBuildConfigRepositoryImpl,
+		wire.Bind(new(pipelineConfig.CiBuildConfigRepository), new(*pipelineConfig.CiBuildConfigRepositoryImpl)),
+		pipeline.NewCiBuildConfigServiceImpl,
+		wire.Bind(new(pipeline.CiBuildConfigService), new(*pipeline.CiBuildConfigServiceImpl)),
+		pipeline.NewCiTemplateServiceImpl,
+		wire.Bind(new(pipeline.CiTemplateService), new(*pipeline.CiTemplateServiceImpl)),
 		router.NewGlobalCMCSRouterImpl,
 		wire.Bind(new(router.GlobalCMCSRouter), new(*router.GlobalCMCSRouterImpl)),
 		restHandler.NewGlobalCMCSRestHandlerImpl,

api/appbean/AppDetail.go

@@ -42,17 +42,10 @@ type GitMaterial struct {
 }
 
 type DockerConfig struct {
-	DockerRegistry   string             `json:"dockerRegistry" validate:"required"`
-	DockerRepository string             `json:"dockerRepository" validate:"required"`
-	BuildConfig      *DockerBuildConfig `json:"dockerBuildConfig"`
-}
-
-type DockerBuildConfig struct {
-	GitCheckoutPath        string            `json:"gitCheckoutPath,omitempty" validate:"required"`
-	DockerfileRelativePath string            `json:"dockerfileRelativePath,omitempty" validate:"required"`
-	Args                   map[string]string `json:"args,omitempty"`
-	TargetPlatform         string            `json:"targetPlatform"`
-	DockerBuildOptions     map[string]string `json:"dockerBuildOptions,omitempty"`
+	DockerRegistry   string                  `json:"dockerRegistry" validate:"required"`
+	DockerRepository string                  `json:"dockerRepository" validate:"required"`
+	CiBuildConfig    *bean.CiBuildConfigBean `json:"ciBuildConfig" validate:"required"`
+	CheckoutPath     string                  `json:"checkoutPath"`
 }
 
 type DeploymentTemplate struct {

api/restHandler/CoreAppRestHandler.go

@@ -491,22 +491,17 @@ func (handler CoreAppRestHandlerImpl) buildDockerConfig(appId int) (*appBean.Doc
 	}
 
 	//getting gitMaterialUrl by id
-	gitMaterial, err := handler.materialRepository.FindById(ciConfig.DockerBuildConfig.GitMaterialId)
+	gitMaterial, err := handler.materialRepository.FindById(ciConfig.CiBuildConfig.GitMaterialId)
 	if err != nil {
-		handler.logger.Errorw("error in fetching materialUrl by ID in GetAppAllDetail", "err", err, "gitMaterialId", ciConfig.DockerBuildConfig.GitMaterialId)
+		handler.logger.Errorw("error in fetching materialUrl by ID in GetAppAllDetail", "err", err, "gitMaterialId", ciConfig.CiBuildConfig.GitMaterialId)
 		return nil, err, http.StatusInternalServerError
 	}
 
 	dockerConfig := &appBean.DockerConfig{
 		DockerRegistry:   ciConfig.DockerRegistry,
 		DockerRepository: ciConfig.DockerRepository,
-		BuildConfig: &appBean.DockerBuildConfig{
-			Args:                   ciConfig.DockerBuildConfig.Args,
-			DockerfileRelativePath: ciConfig.DockerBuildConfig.DockerfilePath,
-			TargetPlatform:         ciConfig.DockerBuildConfig.TargetPlatform,
-			GitCheckoutPath:        gitMaterial.CheckoutPath,
-			DockerBuildOptions:     ciConfig.DockerBuildConfig.DockerBuildOptions,
-		},
+		CiBuildConfig:    ciConfig.CiBuildConfig,
+		CheckoutPath:     gitMaterial.CheckoutPath,
 	}
 
 	return dockerConfig, nil, http.StatusOK
@@ -1258,28 +1253,15 @@ func (handler CoreAppRestHandlerImpl) createDockerConfig(appId int, dockerConfig
 	}
 
 	//finding gitMaterial by appId and checkoutPath
-	gitMaterial, err := handler.materialRepository.FindByAppIdAndCheckoutPath(appId, dockerConfig.BuildConfig.GitCheckoutPath)
+	gitMaterial, err := handler.materialRepository.FindByAppIdAndCheckoutPath(appId, dockerConfig.CheckoutPath)
 	if err != nil {
 		handler.logger.Errorw("service err, FindByAppIdAndCheckoutPath in CreateDockerConfig", "err", err, "appId", appId)
 		return err, http.StatusInternalServerError
 	}
 
-	dockerBuildArgs := make(map[string]string)
-	if dockerConfig.BuildConfig.Args != nil {
-		dockerBuildArgs = dockerConfig.BuildConfig.Args
-	}
-	dockerBuildOptions := make(map[string]string)
-	if dockerConfig.BuildConfig.DockerBuildOptions != nil {
-		dockerBuildOptions = dockerConfig.BuildConfig.DockerBuildOptions
-	}
-	dockerBuildConfigRequest := &bean.DockerBuildConfig{
-		GitMaterialId:      gitMaterial.Id,
-		DockerfilePath:     dockerConfig.BuildConfig.DockerfileRelativePath,
-		Args:               dockerBuildArgs,
-		DockerBuildOptions: dockerBuildOptions,
-		TargetPlatform:     dockerConfig.BuildConfig.TargetPlatform,
-	}
-	createDockerConfigRequest.DockerBuildConfig = dockerBuildConfigRequest
+	ciBuildConfig := dockerConfig.CiBuildConfig
+	ciBuildConfig.GitMaterialId = gitMaterial.Id
+	createDockerConfigRequest.CiBuildConfig = ciBuildConfig
 
 	_, err = handler.pipelineBuilder.CreateCiPipeline(createDockerConfigRequest)
 	if err != nil {

client/telemetry/TelemetryEventClientExtended.go

@@ -9,6 +9,8 @@ import (
 	chartRepoRepository "github.com/devtron-labs/devtron/pkg/chartRepo/repository"
 	"github.com/devtron-labs/devtron/pkg/cluster"
 	moduleRepo "github.com/devtron-labs/devtron/pkg/module/repo"
+	"github.com/devtron-labs/devtron/pkg/pipeline"
+	"github.com/devtron-labs/devtron/pkg/pipeline/bean"
 	serverDataStore "github.com/devtron-labs/devtron/pkg/server/store"
 	"github.com/devtron-labs/devtron/pkg/sso"
 	"github.com/devtron-labs/devtron/pkg/user"
@@ -37,6 +39,7 @@ type TelemetryEventClientImplExtended struct {
 	materialRepository            pipelineConfig.MaterialRepository
 	ciTemplateRepository          pipelineConfig.CiTemplateRepository
 	chartRepository               chartRepoRepository.ChartRepository
+	ciBuildConfigService          pipeline.CiBuildConfigService
 	*TelemetryEventClientImpl
 }
 
@@ -138,6 +141,15 @@ type TelemetryEventDto struct {
 	InstallingIntegrations               []string           `json:"installingIntegrations,omitempty"`
 	DevtronReleaseVersion                string             `json:"devtronReleaseVersion,omitempty"`
 	LastLoginTime                        time.Time          `json:"LastLoginTime,omitempty"`
+	SelfDockerfileCount                  int                `json:"selfDockerfileCount"`
+	ManagedDockerfileCount               int                `json:"managedDockerfileCount"`
+	BuildPackCount                       int                `json:"buildPackCount"`
+	SelfDockerfileSuccessCount           int                `json:"selfDockerfileSuccessCount"`
+	SelfDockerfileFailureCount           int                `json:"selfDockerfileFailureCount"`
+	ManagedDockerfileSuccessCount        int                `json:"managedDockerfileSuccessCount"`
+	ManagedDockerfileFailureCount        int                `json:"managedDockerfileFailureCount"`
+	BuildPackSuccessCount                int                `json:"buildPackSuccessCount"`
+	BuildPackFailureCount                int                `json:"buildPackFailureCount"`
 }
 
 func (impl *TelemetryEventClientImplExtended) SummaryEventForTelemetry() {
@@ -259,6 +271,10 @@ func (impl *TelemetryEventClientImplExtended) SendSummaryEvent(eventType string)
 		return err
 	}
 
+	selfDockerfileCount, managedDockerfileCount, buildpackCount := impl.getCiBuildTypeData()
+
+	successCount, failureCount := impl.getCiBuildTypeVsStatusVsCount()
+
 	devtronVersion := util.GetDevtronVersion()
 	payload.ProdAppCount = prodApps
 	payload.NonProdAppCount = nonProdApps
@@ -268,6 +284,7 @@ func (impl *TelemetryEventClientImplExtended) SendSummaryEvent(eventType string)
 	payload.EnvironmentCount = len(environments)
 	payload.ClusterCount = len(clusters)
 	payload.CiCountPerDay = len(ciPipeline)
+
 	payload.CdCountPerDay = len(cdPipeline)
 	payload.GitAccountsCount = len(gitAccounts)
 	payload.GitOpsCount = len(gitOps)
@@ -291,6 +308,18 @@ func (impl *TelemetryEventClientImplExtended) SendSummaryEvent(eventType string)
 		payload.LastLoginTime = loginTime
 	}
 
+	payload.SelfDockerfileCount = selfDockerfileCount
+	payload.SelfDockerfileSuccessCount = successCount[bean.SELF_DOCKERFILE_BUILD_TYPE]
+	payload.SelfDockerfileFailureCount = failureCount[bean.SELF_DOCKERFILE_BUILD_TYPE]
+
+	payload.ManagedDockerfileCount = managedDockerfileCount
+	payload.ManagedDockerfileSuccessCount = successCount[bean.MANAGED_DOCKERFILE_BUILD_TYPE]
+	payload.ManagedDockerfileFailureCount = failureCount[bean.MANAGED_DOCKERFILE_BUILD_TYPE]
+
+	payload.BuildPackCount = buildpackCount
+	payload.BuildPackSuccessCount = successCount[bean.BUILDPACK_BUILD_TYPE]
+	payload.BuildPackFailureCount = failureCount[bean.BUILDPACK_BUILD_TYPE]
+
 	reqBody, err := json.Marshal(payload)
 	if err != nil {
 		impl.logger.Errorw("SummaryEventForTelemetry, payload marshal error", "error", err)
@@ -310,3 +339,28 @@ func (impl *TelemetryEventClientImplExtended) SendSummaryEvent(eventType string)
 	}
 	return nil
 }
+
+func (impl *TelemetryEventClientImplExtended) getCiBuildTypeData() (int, int, int) {
+	countByBuildType := impl.ciBuildConfigService.GetCountByBuildType()
+	return countByBuildType[bean.SELF_DOCKERFILE_BUILD_TYPE], countByBuildType[bean.MANAGED_DOCKERFILE_BUILD_TYPE], countByBuildType[bean.BUILDPACK_BUILD_TYPE]
+}
+
+func (impl *TelemetryEventClientImplExtended) getCiBuildTypeVsStatusVsCount() (successCount map[bean.CiBuildType]int, failureCount map[bean.CiBuildType]int) {
+	successCount = make(map[bean.CiBuildType]int)
+	failureCount = make(map[bean.CiBuildType]int)
+	buildTypeAndStatusVsCount := impl.ciWorkflowRepository.FindBuildTypeAndStatusDataOfLast1Day()
+	for _, buildTypeCount := range buildTypeAndStatusVsCount {
+		if buildTypeCount == nil {
+			continue
+		}
+		if buildTypeCount.Type == "" {
+			buildTypeCount.Type = string(bean.SELF_DOCKERFILE_BUILD_TYPE)
+		}
+		if buildTypeCount.Status == "Succeeded" {
+			successCount[bean.CiBuildType(buildTypeCount.Type)] = buildTypeCount.Count
+		} else {
+			failureCount[bean.CiBuildType(buildTypeCount.Type)] = buildTypeCount.Count
+		}
+	}
+	return successCount, failureCount
+}