fix: specify dockerfile name or path of the project

cchalop1 · Mar 25, 2024 · b5650b5 · b5650b5
1 parent 6704833
commit b5650b5
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 17 deletions.
diff --git a/internal/adapter/docker.go b/internal/adapter/docker.go
@@ -61,11 +61,8 @@ func (d *DockerAdapter) BuildImage(deploy *domain.Deploy) {
 		return
 	}
 
-	DockerFileName := "Dockerfile"
-	// TODO add deploy domain
-
 	buildOptions := types.ImageBuildOptions{
-		Dockerfile: DockerFileName,
+		Dockerfile: deploy.DockerFileName,
 		Tags:       []string{deploy.GetDockerName()},
 		Remove:     true,
 	}

diff --git a/internal/adapter/filesystem.go b/internal/adapter/filesystem.go
@@ -5,6 +5,7 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"strings"
 
 	"cchalop1.com/deploy/internal"
 	"cchalop1.com/deploy/internal/domain"
@@ -107,3 +108,25 @@ func (fs *FilesystemAdapter) RemoveDockerCertOfServer(serverId string) error {
 	pathLocalCertDir := internal.CERT_DOCKER_FOLDER + "/" + serverId + "/"
 	return os.Remove(pathLocalCertDir)
 }
+
+func (fs *FilesystemAdapter) IsFolder(path string) bool {
+	fileInfo, err := os.Stat(path)
+	if err != nil {
+		return false
+	}
+
+	return fileInfo.IsDir()
+}
+
+func (fs *FilesystemAdapter) BaseDir(path string) string {
+	return filepath.Base(path)
+}
+
+func (fs *FilesystemAdapter) GetDir(path string) string {
+	arr := strings.Split(path, "/")
+	if len(arr) > 1 {
+		arr = arr[:len(arr)-2] // remove the last element
+		return strings.Join(arr, "/") + "/"
+	}
+	return "/"
+}
diff --git a/internal/application/deploy-application.go b/internal/application/deploy-application.go
@@ -56,16 +56,25 @@ func DeployApplication(deployService *service.DeployService, newDeploy dto.NewDe
 		return err
 	}
 
+	isFolder := adapter.NewFilesystemAdapter().IsFolder(pathToDir)
+	DockerFileName := "Dockerfile"
+	fmt.Println(isFolder)
+	if !isFolder {
+		DockerFileName = adapter.NewFilesystemAdapter().BaseDir(pathToDir)
+		pathToDir = adapter.NewFilesystemAdapter().GetDir(pathToDir)
+	}
+
 	deploy := domain.Deploy{
-		Id:           utils.GenerateRandomPassword(5),
-		Name:         newDeploy.Name,
-		ServerId:     newDeploy.ServerId,
-		PathToSource: pathToDir,
-		Status:       "Installing",
-		EnableTls:    newDeploy.EnableTls,
-		Email:        newDeploy.Email,
-		Envs:         newDeploy.Envs,
-		SubDomain:    newDeploy.Name,
+		Id:             utils.GenerateRandomPassword(5),
+		Name:           newDeploy.Name,
+		ServerId:       newDeploy.ServerId,
+		PathToSource:   pathToDir,
+		Status:         "Installing",
+		EnableTls:      newDeploy.EnableTls,
+		Email:          newDeploy.Email,
+		Envs:           newDeploy.Envs,
+		SubDomain:      newDeploy.Name,
+		DockerFileName: DockerFileName,
 	}
 
 	err = deployService.DatabaseAdapter.SaveDeploy(deploy)

diff --git a/internal/domain/deploy.go b/internal/domain/deploy.go
@@ -19,6 +19,7 @@ type Deploy struct {
 	Status         string    `json:"status"`
 	Url            string    `json:"url"`
 	SubDomain      string    `json:"subDomain"`
+	DockerFileName string    `json:"dockerFileName"`
 }
 
 func (d *Deploy) GetDockerName() string {

diff --git a/web/src/DeployPage.tsx b/web/src/DeployPage.tsx
@@ -58,11 +58,11 @@ export default function DeployPage() {
         <FolderIcon />
         {deploy.pathToSource}
       </div>
-      <Tabs defaultValue="database-service" className="mt-20">
-        <TabsList className="w-full justify-between pl-5 pr-5">
+      <Tabs defaultValue="settings" className="mt-20">
+        <TabsList className="w-full justify-around pl-5 pr-5">
           {/* <TabsTrigger value="database-service">Database Service</TabsTrigger> */}
-          <TabsTrigger value="logs">Logs</TabsTrigger>
           <TabsTrigger value="settings">Settings</TabsTrigger>
+          <TabsTrigger value="logs">Logs</TabsTrigger>
         </TabsList>
         {/* <TabsContent value="database-service"></TabsContent> */}
         <TabsContent value="logs">

diff --git a/web/src/components/forms/CreateDeployForm.tsx b/web/src/components/forms/CreateDeployForm.tsx
@@ -145,7 +145,9 @@ export function CreateDeployForm() {
                 />
               </div>
               <div className="flex flex-col space-y-1.5">
-                <Label htmlFor="projectPath">Project foder</Label>
+                <Label htmlFor="projectPath">
+                  Path to your project folder or Dockerfile
+                </Label>
                 <Input
                   id="projectPath"
                   name="projectPath"