diff --git a/Dockerfile b/Dockerfile index 49352d9..1d0c4fb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ WORKDIR /backend-build COPY . . COPY --from=frontend /frontend-build/dist ./server/dist -RUN CGO_ENABLED=0 go build -o shortify ./main.go +RUN go build -o shortify ./cmd/shortify/main.go # Make workspace with above generated files. FROM alpine:3.16 AS monolithic diff --git a/cmd/server.go b/cmd/shortify/main.go similarity index 97% rename from cmd/server.go rename to cmd/shortify/main.go index e82607d..4946f66 100644 --- a/cmd/server.go +++ b/cmd/shortify/main.go @@ -1,4 +1,4 @@ -package cmd +package main import ( "context" @@ -10,6 +10,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" + _ "modernc.org/sqlite" "github.com/boojack/shortify/server" _profile "github.com/boojack/shortify/server/profile" @@ -127,3 +128,10 @@ func initConfig() { println("version:", profile.Version) println("---") } + +func main() { + err := Execute() + if err != nil { + panic(err) + } +} diff --git a/main.go b/main.go deleted file mode 100644 index 061a83e..0000000 --- a/main.go +++ /dev/null @@ -1,14 +0,0 @@ -package main - -import ( - _ "modernc.org/sqlite" - - "github.com/boojack/shortify/cmd" -) - -func main() { - err := cmd.Execute() - if err != nil { - panic(err) - } -} diff --git a/scripts/.air.toml b/scripts/.air.toml index 5623916..d7a2991 100644 --- a/scripts/.air.toml +++ b/scripts/.air.toml @@ -3,7 +3,7 @@ tmp_dir = ".air" [build] bin = "./.air/shortify" - cmd = "go build -o ./.air/shortify ./main.go" + cmd = "go build -o ./.air/shortify ./cmd/shortify/main.go" delay = 1000 exclude_dir = [".air", "web", "build"] exclude_file = [] diff --git a/scripts/build.sh b/scripts/build.sh index b7f5b61..ad7e3ff 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -8,6 +8,6 @@ cd "$(dirname "$0")/../" echo "Start building backend..." -go build -o ./build/shortify ./main.go +go build -o ./build/shortify ./cmd/shortify/main.go echo "Backend built!"