Compare commits

...

1 Commits

Author SHA1 Message Date
Julien Neuhart
5a439ca70c fix: remove internal package and move it to cmd (#321) 2021-08-23 18:33:26 +02:00
4 changed files with 12 additions and 11 deletions

View File

@@ -19,13 +19,12 @@ RUN go mod download &&\
# Copy the source code. # Copy the source code.
COPY cmd ./cmd COPY cmd ./cmd
COPY internal ./internal
COPY pkg ./pkg COPY pkg ./pkg
# Build the binary. # Build the binary.
ARG GOTENBERG_VERSION ARG GOTENBERG_VERSION
RUN go build -o gotenberg -ldflags "-X 'github.com/gotenberg/gotenberg/v7/internal/app/gotenberg.version=$GOTENBERG_VERSION'" cmd/gotenberg/main.go RUN go build -o gotenberg -ldflags "-X 'github.com/gotenberg/gotenberg/v7/cmd.Version=$GOTENBERG_VERSION'" cmd/gotenberg/main.go
FROM debian:buster-slim FROM debian:buster-slim

View File

@@ -1,4 +1,4 @@
package gotenberg package gotenbergcmd
import ( import (
"context" "context"
@@ -25,10 +25,13 @@ Version: %s
------------------------------------------------------- -------------------------------------------------------
` `
var version = "snapshot" // Version is the... version of the Gotenberg application. We set it at the
// build stage of the Docker image.
var Version = "snapshot"
// Run starts the Gotenberg application. Call this in the main of your program.
func Run() { func Run() {
fmt.Printf(banner, version) fmt.Printf(banner, Version)
// Creates the roo` FlagSet and adds the modules flags to it. // Creates the roo` FlagSet and adds the modules flags to it.
fs := flag.NewFlagSet("gotenberg", flag.ExitOnError) fs := flag.NewFlagSet("gotenberg", flag.ExitOnError)

View File

@@ -1,16 +1,12 @@
package main package main
import ( import (
gotenbergapp "github.com/gotenberg/gotenberg/v7/internal/app/gotenberg" gotenbergcmd "github.com/gotenberg/gotenberg/v7/cmd"
// Gotenberg modules. // Gotenberg modules.
_ "github.com/gotenberg/gotenberg/v7/pkg/standard" _ "github.com/gotenberg/gotenberg/v7/pkg/standard"
// PDF engines.
_ "github.com/gotenberg/gotenberg/v7/pkg/modules/libreoffice/pdfengine"
_ "github.com/gotenberg/gotenberg/v7/pkg/modules/pdfcpu"
_ "github.com/gotenberg/gotenberg/v7/pkg/modules/pdftk"
) )
func main() { func main() {
gotenbergapp.Run() gotenbergcmd.Run()
} }

View File

@@ -5,7 +5,10 @@ import (
_ "github.com/gotenberg/gotenberg/v7/pkg/modules/chromium" _ "github.com/gotenberg/gotenberg/v7/pkg/modules/chromium"
_ "github.com/gotenberg/gotenberg/v7/pkg/modules/gc" _ "github.com/gotenberg/gotenberg/v7/pkg/modules/gc"
_ "github.com/gotenberg/gotenberg/v7/pkg/modules/libreoffice" _ "github.com/gotenberg/gotenberg/v7/pkg/modules/libreoffice"
_ "github.com/gotenberg/gotenberg/v7/pkg/modules/libreoffice/pdfengine"
_ "github.com/gotenberg/gotenberg/v7/pkg/modules/libreoffice/unoconv" _ "github.com/gotenberg/gotenberg/v7/pkg/modules/libreoffice/unoconv"
_ "github.com/gotenberg/gotenberg/v7/pkg/modules/logging" _ "github.com/gotenberg/gotenberg/v7/pkg/modules/logging"
_ "github.com/gotenberg/gotenberg/v7/pkg/modules/pdfcpu"
_ "github.com/gotenberg/gotenberg/v7/pkg/modules/pdfengines" _ "github.com/gotenberg/gotenberg/v7/pkg/modules/pdfengines"
_ "github.com/gotenberg/gotenberg/v7/pkg/modules/pdftk"
) )