From 2014549fa55baf34c7d62cdf2814a65959c9fa50 Mon Sep 17 00:00:00 2001 From: Leonard Gram Date: Sat, 20 Jul 2019 13:03:10 +0200 Subject: [PATCH] PhantomJS: Fixes rendering on Debian Buster (#18162) Closes #17588 --- pkg/services/rendering/phantomjs.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkg/services/rendering/phantomjs.go b/pkg/services/rendering/phantomjs.go index a67d43c3c239..a907b427fde1 100644 --- a/pkg/services/rendering/phantomjs.go +++ b/pkg/services/rendering/phantomjs.go @@ -67,10 +67,18 @@ func (rs *RenderingService) renderViaPhantomJS(ctx context.Context, opts Opts) ( timezone := "" + cmd.Env = os.Environ() + if opts.Timezone != "" { timezone = isoTimeOffsetToPosixTz(opts.Timezone) - baseEnviron := os.Environ() - cmd.Env = appendEnviron(baseEnviron, "TZ", timezone) + cmd.Env = appendEnviron(cmd.Env, "TZ", timezone) + } + + // Added to disable usage of newer version of OPENSSL + // that seem to be incompatible with PhantomJS (used in Debian Buster) + if runtime.GOOS == "linux" { + disableNewOpenssl := "/etc/ssl" + cmd.Env = appendEnviron(cmd.Env, "OPENSSL_CONF", disableNewOpenssl) } rs.log.Debug("executing Phantomjs", "binPath", binPath, "cmdArgs", cmdArgs, "timezone", timezone)