diff --git a/build/base/Dockerfile b/build/base/Dockerfile index c8cb8e94..102f6873 100644 --- a/build/base/Dockerfile +++ b/build/base/Dockerfile @@ -1,4 +1,3 @@ -FROM thecodingmachine/gotenberg:3.2.0 AS hack FROM debian:9.5-slim # |-------------------------------------------------------------------------- @@ -20,19 +19,9 @@ RUN echo "deb http://httpredir.debian.org/debian/ stretch main contrib non-free" # | recovering. In our case: Chrome (headless) and Office (headless). # | -# Yep, this is dirty. The following script does not work anymore (see https://github.com/Unitech/pm2/issues/4127): -#RUN curl -sL https://raw.githubusercontent.com/Unitech/pm2/master/packager/setup.deb.sh | bash - - -# Installing PM2 with Node.js and npm breaks something which prevents Google Chrome to work as expected. -# So we just copy all PM2 related files from a previous version of Gotenberg. - RUN curl -sL https://deb.nodesource.com/setup_9.x | bash - &&\ - apt-get install -y nodejs - -COPY --from=hack /usr/bin/pm2 /usr/bin/pm2 -COPY --from=hack /usr/share/pm2 /usr/share/pm2 -COPY --from=hack /etc/default/pm2 /etc/default/pm2 -COPY --from=hack /etc/systemd/system/pm2.service /etc/systemd/system/pm2.service + apt-get install -y nodejs &&\ + npm install -g pm2 # |-------------------------------------------------------------------------- # | Chrome diff --git a/internal/pkg/pm2/pm2.go b/internal/pkg/pm2/pm2.go index 7acf48fc..c4cf937a 100644 --- a/internal/pkg/pm2/pm2.go +++ b/internal/pkg/pm2/pm2.go @@ -69,7 +69,7 @@ func (m *processManager) pm2(p Process, cmdName string) error { p.name(), } if cmdName == "start" { - cmdArgs = append(cmdArgs, "--interpreter none", "--") + cmdArgs = append(cmdArgs, "--interpreter=none", "--") cmdArgs = append(cmdArgs, p.args()...) } cmd := exec.Command(