diff --git a/Dockerfile b/Dockerfile index 1a4e70e..0c9539b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ FROM golang:1.16-alpine AS builder ADD . /src -RUN cd /src/cmd/link && go build +RUN cd /src/cmd/cgnolink && go build FROM alpine EXPOSE 8080 WORKDIR /app -COPY --from=builder /src/cmd/link/link /app/ +COPY --from=builder /src/cmd/cgnolink/cgnolink /app/ COPY --from=builder /src/migrations /app/migrations -ENTRYPOINT ./link \ No newline at end of file +ENTRYPOINT ./cgnolink \ No newline at end of file diff --git a/cmd/cgnolink/main.go b/cmd/cgnolink/main.go new file mode 100644 index 0000000..b11807f --- /dev/null +++ b/cmd/cgnolink/main.go @@ -0,0 +1,20 @@ +package main + +import ( + "cgnolink" + "cgnolink/database" +) + +func main() { + conf := cgnolink.NewConfig() + + pool := database.Pool(conf) + + if err := cgnolink.Migrate(pool); err != nil { + panic(err) + } + + server := cgnolink.NewServer(conf, pool) + + server.Logger.Fatal(server.Start(":8080")) +} diff --git a/cmd/link/main.go b/cmd/link/main.go deleted file mode 100644 index a808aae..0000000 --- a/cmd/link/main.go +++ /dev/null @@ -1,20 +0,0 @@ -package main - -import ( - "link" - "link/database" -) - -func main() { - conf := link.NewConfig() - - pool := database.Pool(conf) - - if err := link.Migrate(pool); err != nil { - panic(err) - } - - server := link.NewServer(conf, pool) - - server.Logger.Fatal(server.Start(":8080")) -} diff --git a/config.go b/config.go index d48f8f0..cd7529e 100644 --- a/config.go +++ b/config.go @@ -1,4 +1,4 @@ -package link +package cgnolink import ( "github.com/knadh/koanf" diff --git a/go.mod b/go.mod index f480e09..3280081 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module link +module cgnolink go 1.16 diff --git a/migrate.go b/migrate.go index 25619fd..4f62eea 100644 --- a/migrate.go +++ b/migrate.go @@ -1,4 +1,4 @@ -package link +package cgnolink import ( "context" diff --git a/server.go b/server.go index 8e97c02..2cb5887 100644 --- a/server.go +++ b/server.go @@ -1,11 +1,11 @@ -package link +package cgnolink import ( + "cgnolink/link" "github.com/jackc/pgx/v4/pgxpool" "github.com/knadh/koanf" "github.com/labstack/echo/v4" "github.com/labstack/echo/v4/middleware" - "link/link" "net/http" )