mirror of
https://github.com/gotenberg/gotenberg.git
synced 2026-08-12 10:22:14 +01:00
Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6846e7941f | ||
|
|
719287c3a6 |
@@ -1,4 +1,3 @@
|
|||||||
FROM thecodingmachine/gotenberg:3.2.0 AS hack
|
|
||||||
FROM debian:9.5-slim
|
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).
|
# | 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 - &&\
|
RUN curl -sL https://deb.nodesource.com/setup_9.x | bash - &&\
|
||||||
apt-get install -y nodejs
|
apt-get install -y nodejs &&\
|
||||||
|
npm install -g pm2
|
||||||
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
|
|
||||||
|
|
||||||
# |--------------------------------------------------------------------------
|
# |--------------------------------------------------------------------------
|
||||||
# | Chrome
|
# | Chrome
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ func mustParseEnvVar() *api.Options {
|
|||||||
}
|
}
|
||||||
if v, ok := os.LookupEnv(disableGoogleChromeEnvVar); ok {
|
if v, ok := os.LookupEnv(disableGoogleChromeEnvVar); ok {
|
||||||
if v != "1" && v != "0" {
|
if v != "1" && v != "0" {
|
||||||
notify.ErrPrint(fmt.Errorf("%s: wrong value: want \"0\" or \"1\" got %v", defaultWaitTimeoutEnvVar, v))
|
notify.ErrPrint(fmt.Errorf("%s: wrong value: want \"0\" or \"1\" got %v", disableGoogleChromeEnvVar, v))
|
||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
opts.EnableChromeEndpoints = v != "1"
|
opts.EnableChromeEndpoints = v != "1"
|
||||||
|
|||||||
@@ -69,7 +69,7 @@ func (m *processManager) pm2(p Process, cmdName string) error {
|
|||||||
p.name(),
|
p.name(),
|
||||||
}
|
}
|
||||||
if cmdName == "start" {
|
if cmdName == "start" {
|
||||||
cmdArgs = append(cmdArgs, "--interpreter none", "--")
|
cmdArgs = append(cmdArgs, "--interpreter=none", "--")
|
||||||
cmdArgs = append(cmdArgs, p.args()...)
|
cmdArgs = append(cmdArgs, p.args()...)
|
||||||
}
|
}
|
||||||
cmd := exec.Command(
|
cmd := exec.Command(
|
||||||
|
|||||||
Reference in New Issue
Block a user