fix build command

maddalax · Sep 21, 2024 · 2585668 · 2585668
1 parent 1a756b7
commit 2585668
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/cli/htmgo/tasks/run/build.go b/cli/htmgo/tasks/run/build.go
@@ -2,25 +2,19 @@ package run
 
 import (
 	"github.com/maddalax/htmgo/cli/htmgo/tasks/astgen"
+	"github.com/maddalax/htmgo/cli/htmgo/tasks/copyassets"
 	"github.com/maddalax/htmgo/cli/htmgo/tasks/css"
 	"github.com/maddalax/htmgo/cli/htmgo/tasks/process"
 )
 
 func Build() {
 	astgen.GenAst(process.ExitOnError)
 	css.GenerateCss(process.ExitOnError)
-	process.RunOrExit("rm -rf ./dist")
-	process.RunOrExit("mkdir -p ./dist")
 
-	//process.RunOrExit("mkdir -p ./dist/assets/dist")
+	copyassets.CopyAssets()
 
-	//dirutil.CopyDir(
-	//	"./assets/dist",
-	//	"./dist/assets/dist",
-	//	func(path string, exists bool) bool {
-	//		return true
-	//	},
-	//)
+	process.RunOrExit("rm -rf ./dist")
+	process.RunOrExit("mkdir -p ./dist")
 
 	process.RunOrExit("env GOOS=linux GOARCH=amd64 go build -o ./dist/app-linux-amd64 .")
 	process.RunOrExit("go build -o ./dist/app .")

diff --git a/htmgo-site/Dockerfile b/htmgo-site/Dockerfile
@@ -14,7 +14,7 @@ RUN go mod download
 COPY . .
 
 # Build the Go binary for Linux
-RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o server
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go run github.com/maddalax/htmgo/cli/htmgo@latest build
 
 # Stage 2: Create the smallest possible image
 FROM gcr.io/distroless/base-debian11