diff --git a/build/base/Dockerfile b/build/base/Dockerfile index 37aebaff..dcddb5fb 100644 --- a/build/base/Dockerfile +++ b/build/base/Dockerfile @@ -45,8 +45,7 @@ RUN mkdir -p /usr/share/man/man1mkdir -p /usr/share/man/man1 &&\ ENV UNO_URL=https://raw.githubusercontent.com/dagwieers/unoconv/master/unoconv -RUN apt-get install -y python3 &&\ - curl -Ls $UNO_URL -o /usr/bin/unoconv &&\ +RUN curl -Ls $UNO_URL -o /usr/bin/unoconv &&\ chmod +x /usr/bin/unoconv &&\ ln -s /usr/bin/python3 /usr/bin/python &&\ unoconv --version diff --git a/build/tests/docker-entrypoint.sh b/build/tests/docker-entrypoint.sh index 32294499..f51b3776 100755 --- a/build/tests/docker-entrypoint.sh +++ b/build/tests/docker-entrypoint.sh @@ -9,10 +9,8 @@ if [ "$CURRENT_USER" != "gotenberg" ]; then exit 1 fi -# Start the PM2 processes -# (Google Chrome headless & unoconv listener). -# TODO just start chrome -go run github.com/thecodingmachine/gotenberg/test/cmd/pm2 +# Start Google Chrome headless. +go run test/cmd/chrome.go # Run our tests. if [ "$CODE_COVERAGE" = "1" ]; then diff --git a/internal/app/xhttp/handler_test.go b/internal/app/xhttp/handler_test.go index c4c78add..11c0731d 100644 --- a/internal/app/xhttp/handler_test.go +++ b/internal/app/xhttp/handler_test.go @@ -6,7 +6,6 @@ import ( "io/ioutil" "net/http" "net/http/httptest" - "os" "testing" "github.com/labstack/echo/v4" @@ -23,18 +22,6 @@ func TestPingHandler(t *testing.T) { srv = New(config) req := httptest.NewRequest(http.MethodGet, pingEndpoint, nil) test.AssertStatusCode(t, http.StatusOK, srv, req) - // should returns a JSON as - // LOG_LEVEL is "DEBUG". - os.Setenv(conf.LogLevelEnvVar, "DEBUG") - config, err := conf.FromEnv() - assert.Nil(t, err) - srv = New(config) - req = httptest.NewRequest(http.MethodGet, pingEndpoint, nil) - rec := httptest.NewRecorder() - srv.ServeHTTP(rec, req) - assert.Equal(t, "application/json; charset=UTF-8", rec.Header().Get("Content-type")) - assert.Equal(t, http.StatusOK, rec.Code) - os.Unsetenv(conf.LogLevelEnvVar) } func TestMergeHandler(t *testing.T) { diff --git a/internal/pkg/chrome/doc.go b/internal/pkg/chrome/doc.go index 7b442802..c5431149 100644 --- a/internal/pkg/chrome/doc.go +++ b/internal/pkg/chrome/doc.go @@ -1 +1,3 @@ +// Package chrome helps starting +// Google Chrome headless in background. package chrome diff --git a/test/cmd/chrome.go b/test/cmd/chrome.go new file mode 100644 index 00000000..82b38fcc --- /dev/null +++ b/test/cmd/chrome.go @@ -0,0 +1,23 @@ +package main + +import ( + "context" + + "github.com/thecodingmachine/gotenberg/internal/pkg/chrome" + "github.com/thecodingmachine/gotenberg/internal/pkg/conf" + "github.com/thecodingmachine/gotenberg/internal/pkg/xlog" +) + +func main() { + const op string = "main" + config, err := conf.FromEnv() + systemLogger := xlog.New(config.LogLevel(), "system") + if err != nil { + systemLogger.FatalOp(op, err) + } + // start Google Chrome. + _, err = chrome.Start(context.Background(), systemLogger) + if err != nil { + systemLogger.FatalOp(op, err) + } +}