Feat/i want to set a env file path (#124)

* feat(service): add env_file field * feat(service): add env_file to docker compose * feat(service): add env_file field
RomainDreidemy · Sep 14, 2023 · 9d3007c · 9d3007c
1 parent 4a4dc2e
commit 9d3007c
Show file tree

Hide file tree

Showing 10 changed files with 85 additions and 13 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/api/docs/docs.go b/api/docs/docs.go
diff --git a/api/docs/swagger.json b/api/docs/swagger.json
@@ -1653,6 +1653,9 @@
                 "entrypoint": {
                     "type": "string"
                 },
+                "envFile": {
+                    "type": "string"
+                },
                 "name": {
                     "type": "string"
                 },
@@ -1892,6 +1895,9 @@
                 "entrypoint": {
                     "type": "string"
                 },
+                "envFile": {
+                    "type": "string"
+                },
                 "id": {
                     "type": "string"
                 },
@@ -1924,6 +1930,9 @@
                 "entrypoint": {
                     "type": "string"
                 },
+                "envFile": {
+                    "type": "string"
+                },
                 "envVariables": {
                     "type": "array",
                     "items": {
@@ -1980,6 +1989,9 @@
                 "entrypoint": {
                     "type": "string"
                 },
+                "envFile": {
+                    "type": "string"
+                },
                 "name": {
                     "type": "string"
                 },

diff --git a/api/docs/swagger.yaml b/api/docs/swagger.yaml
@@ -137,6 +137,8 @@ definitions:
         type: string
       entrypoint:
         type: string
+      envFile:
+        type: string
       name:
         type: string
       positionX:
@@ -302,6 +304,8 @@ definitions:
         type: string
       entrypoint:
         type: string
+      envFile:
+        type: string
       id:
         type: string
       name:
@@ -323,6 +327,8 @@ definitions:
         type: string
       entrypoint:
         type: string
+      envFile:
+        type: string
       envVariables:
         items:
           $ref: '#/definitions/models.ServiceEnvVariableResponse'
@@ -360,6 +366,8 @@ definitions:
         type: string
       entrypoint:
         type: string
+      envFile:
+        type: string
       name:
         type: string
       positionX:

diff --git a/api/src/models/docker_compose.go b/api/src/models/docker_compose.go
@@ -12,6 +12,7 @@ type DockerComposeService struct {
 	Build         DockerComposeServiceBuild `yaml:"build,omitempty"`
 	Image         string                    `yaml:"image,omitempty"`
 	Ports         []string                  `yaml:"ports,omitempty"`
+	EnvFile       string                    `yaml:"env_file,omitempty"`
 	Environment   map[string]string         `yaml:"environment,omitempty"`
 	Volumes       []string                  `yaml:"volumes,omitempty"`
 	Networks      []string                  `yaml:"networks,omitempty"`

diff --git a/api/src/models/service_model.go b/api/src/models/service_model.go
@@ -8,6 +8,7 @@ type Service struct {
 	ContainerName string     `gorm:"type:varchar(255)"`
 	DockerImage   string     `gorm:"type:varchar(255)"`
 	DockerTag     string     `gorm:"type:varchar(255)"`
+	EnvFile       string     `gorm:"type:varchar(255)"`
 	Entrypoint    string     `gorm:"type:varchar(255)"`
 	Description   string     `gorm:"type:text"`
 	PositionX     float32    `gorm:"type:decimal(20,8);not null"`
@@ -31,6 +32,7 @@ type ServiceCreateInput struct {
 	ContainerName string  `json:"containerName"`
 	DockerImage   string  `json:"dockerImage"`
 	DockerTag     string  `json:"dockerTag"`
+	EnvFile       string  `json:"envFile"`
 	Entrypoint    string  `json:"entrypoint"`
 	Description   string  `json:"description"`
 	PositionX     float32 `json:"positionX" validate:"required"`
@@ -42,6 +44,7 @@ type ServiceUpdateInput struct {
 	ContainerName string  `json:"containerName"`
 	DockerImage   string  `json:"dockerImage"`
 	DockerTag     string  `json:"dockerTag"`
+	EnvFile       string  `json:"envFile"`
 	Context       string  `json:"context"`
 	Dockerfile    string  `json:"dockerfile"`
 	Entrypoint    string  `json:"entrypoint"`
@@ -56,6 +59,7 @@ type ServiceResponse struct {
 	ContainerName string     `json:"containerName"`
 	DockerImage   string     `json:"dockerImage"`
 	DockerTag     string     `json:"dockerTag"`
+	EnvFile       string     `json:"envFile"`
 	Entrypoint    string     `json:"entrypoint"`
 	Description   string     `json:"description"`
 	PositionX     float32    `json:"positionX"`
@@ -68,6 +72,7 @@ type ServiceResponseItem struct {
 	ContainerName string     `json:"containerName"`
 	DockerImage   string     `json:"dockerImage"`
 	DockerTag     string     `json:"dockerTag"`
+	EnvFile       string     `json:"envFile"`
 	Entrypoint    string     `json:"entrypoint"`
 	Description   string     `json:"description"`
 	PositionX     float32    `json:"positionX"`

diff --git a/api/src/services/docker_compose/builders/service_builder.go b/api/src/services/docker_compose/builders/service_builder.go
@@ -33,6 +33,10 @@ func DockerComposeServiceBuilder(service models.Service) models.DockerComposeSer
 		dockerComposeService.Image = BuildDockerComposeServiceImage(service)
 	}
 
+	if service.EnvFile != "" {
+		dockerComposeService.EnvFile = service.EnvFile
+	}
+
 	if len(service.ServicePorts) > 0 {
 		dockerComposeService.Ports = BuildDockerComposeServicePorts(service.ServicePorts)
 	}

diff --git a/api/src/services/docker_compose/builders/service_builder_test.go b/api/src/services/docker_compose/builders/service_builder_test.go
@@ -107,6 +107,23 @@ func TestDockerComposeServicesBuilder(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "should have a env_file value if specified",
+			args: args{
+				services: []models.Service{
+					{
+						Name:    "api",
+						EnvFile: "prod.env",
+					},
+				},
+			},
+			want: map[string]models.DockerComposeService{
+				"api": {
+					ContainerName: "api",
+					EnvFile:       "prod.env",
+				},
+			},
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {

diff --git a/api/src/services/factories/service_factory.go b/api/src/services/factories/service_factory.go
@@ -11,6 +11,7 @@ func BuildServiceResponse(service models.Service) models.ServiceResponseItem {
 		ContainerName: service.ContainerName,
 		DockerImage:   service.DockerImage,
 		DockerTag:     service.DockerTag,
+		EnvFile:       service.EnvFile,
 		Entrypoint:    service.Entrypoint,
 		Description:   service.Description,
 		PositionX:     service.PositionX,
@@ -35,6 +36,7 @@ func BuildServiceFromServiceCreationInput(service models.ServiceCreateInput, sta
 		ContainerName: service.ContainerName,
 		DockerImage:   service.DockerImage,
 		DockerTag:     service.DockerTag,
+		EnvFile:       service.EnvFile,
 		Entrypoint:    service.Entrypoint,
 		Description:   service.Description,
 		PositionX:     service.PositionX,
@@ -49,6 +51,7 @@ func BuildServiceFromServiceUpdateInput(service models.ServiceUpdateInput) model
 		ContainerName: service.ContainerName,
 		DockerImage:   service.DockerImage,
 		DockerTag:     service.DockerTag,
+		EnvFile:       service.EnvFile,
 		Entrypoint:    service.Entrypoint,
 		Description:   service.Description,
 		PositionX:     service.PositionX,

diff --git a/front/src/forms/editor.structure.ts b/front/src/forms/editor.structure.ts
@@ -124,6 +124,13 @@ export const DRAWER_TYPE_STRUCTURES: EditorStructure = {
       component: Input,
       validator: string().nullable()
     },
+    {
+      label: 'Env file',
+      key: 'envFile',
+      type: TypeList.TEXT,
+      component: Input,
+      validator: string().nullable()
+    },
     {
       label: 'Entrypoint',
       key: 'entrypoint',