From f89b45425faded31d60d72ab1eb5b6ec7473ea21 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Thu, 26 Dec 2024 19:56:15 +0900 Subject: [PATCH] Added missing patches directory --- .../alpine/patches/chromedp_no_sandbox.patch | 17 +++++++++++++++++ .../centos/patches/chromedp_no_sandbox.patch | 17 +++++++++++++++++ .../ol/patches/chromedp_no_sandbox.patch | 17 +++++++++++++++++ .../rhel/patches/chromedp_no_sandbox.patch | 17 +++++++++++++++++ .../ubuntu/patches/chromedp_no_sandbox.patch | 17 +++++++++++++++++ .../alpine/patches/chromedp_no_sandbox.patch | 17 +++++++++++++++++ .../centos/patches/chromedp_no_sandbox.patch | 17 +++++++++++++++++ .../ol/patches/chromedp_no_sandbox.patch | 17 +++++++++++++++++ .../rhel/patches/chromedp_no_sandbox.patch | 17 +++++++++++++++++ .../ubuntu/patches/chromedp_no_sandbox.patch | 17 +++++++++++++++++ 10 files changed, 170 insertions(+) create mode 100644 Dockerfiles/build-mysql/alpine/patches/chromedp_no_sandbox.patch create mode 100644 Dockerfiles/build-mysql/centos/patches/chromedp_no_sandbox.patch create mode 100644 Dockerfiles/build-mysql/ol/patches/chromedp_no_sandbox.patch create mode 100644 Dockerfiles/build-mysql/rhel/patches/chromedp_no_sandbox.patch create mode 100644 Dockerfiles/build-mysql/ubuntu/patches/chromedp_no_sandbox.patch create mode 100644 Dockerfiles/build-pgsql/alpine/patches/chromedp_no_sandbox.patch create mode 100644 Dockerfiles/build-pgsql/centos/patches/chromedp_no_sandbox.patch create mode 100644 Dockerfiles/build-pgsql/ol/patches/chromedp_no_sandbox.patch create mode 100644 Dockerfiles/build-pgsql/rhel/patches/chromedp_no_sandbox.patch create mode 100644 Dockerfiles/build-pgsql/ubuntu/patches/chromedp_no_sandbox.patch diff --git a/Dockerfiles/build-mysql/alpine/patches/chromedp_no_sandbox.patch b/Dockerfiles/build-mysql/alpine/patches/chromedp_no_sandbox.patch new file mode 100644 index 000000000..c8a2e162c --- /dev/null +++ b/Dockerfiles/build-mysql/alpine/patches/chromedp_no_sandbox.patch @@ -0,0 +1,17 @@ +diff --git a/src/go/cmd/zabbix_web_service/pdf_report_creator.go b/src/go/cmd/zabbix_web_service/pdf_report_creator.go +index afab41204d1..f1a9b859f34 100644 +--- a/src/go/cmd/zabbix_web_service/pdf_report_creator.go ++++ b/src/go/cmd/zabbix_web_service/pdf_report_creator.go +@@ -100,7 +100,11 @@ func (h *handler) report(w http.ResponseWriter, r *http.Request) { + return + } + +- opts := chromedp.DefaultExecAllocatorOptions[:] ++ opts := append(chromedp.DefaultExecAllocatorOptions[:], ++ chromedp.DisableGPU, ++ chromedp.NoSandbox, ++ chromedp.Flag("disable-setuid-sandbox", true), ++ ) + + if options.IgnoreURLCertErrors == 1 { + opts = append(opts, chromedp.Flag("ignore-certificate-errors", "1")) diff --git a/Dockerfiles/build-mysql/centos/patches/chromedp_no_sandbox.patch b/Dockerfiles/build-mysql/centos/patches/chromedp_no_sandbox.patch new file mode 100644 index 000000000..c8a2e162c --- /dev/null +++ b/Dockerfiles/build-mysql/centos/patches/chromedp_no_sandbox.patch @@ -0,0 +1,17 @@ +diff --git a/src/go/cmd/zabbix_web_service/pdf_report_creator.go b/src/go/cmd/zabbix_web_service/pdf_report_creator.go +index afab41204d1..f1a9b859f34 100644 +--- a/src/go/cmd/zabbix_web_service/pdf_report_creator.go ++++ b/src/go/cmd/zabbix_web_service/pdf_report_creator.go +@@ -100,7 +100,11 @@ func (h *handler) report(w http.ResponseWriter, r *http.Request) { + return + } + +- opts := chromedp.DefaultExecAllocatorOptions[:] ++ opts := append(chromedp.DefaultExecAllocatorOptions[:], ++ chromedp.DisableGPU, ++ chromedp.NoSandbox, ++ chromedp.Flag("disable-setuid-sandbox", true), ++ ) + + if options.IgnoreURLCertErrors == 1 { + opts = append(opts, chromedp.Flag("ignore-certificate-errors", "1")) diff --git a/Dockerfiles/build-mysql/ol/patches/chromedp_no_sandbox.patch b/Dockerfiles/build-mysql/ol/patches/chromedp_no_sandbox.patch new file mode 100644 index 000000000..c8a2e162c --- /dev/null +++ b/Dockerfiles/build-mysql/ol/patches/chromedp_no_sandbox.patch @@ -0,0 +1,17 @@ +diff --git a/src/go/cmd/zabbix_web_service/pdf_report_creator.go b/src/go/cmd/zabbix_web_service/pdf_report_creator.go +index afab41204d1..f1a9b859f34 100644 +--- a/src/go/cmd/zabbix_web_service/pdf_report_creator.go ++++ b/src/go/cmd/zabbix_web_service/pdf_report_creator.go +@@ -100,7 +100,11 @@ func (h *handler) report(w http.ResponseWriter, r *http.Request) { + return + } + +- opts := chromedp.DefaultExecAllocatorOptions[:] ++ opts := append(chromedp.DefaultExecAllocatorOptions[:], ++ chromedp.DisableGPU, ++ chromedp.NoSandbox, ++ chromedp.Flag("disable-setuid-sandbox", true), ++ ) + + if options.IgnoreURLCertErrors == 1 { + opts = append(opts, chromedp.Flag("ignore-certificate-errors", "1")) diff --git a/Dockerfiles/build-mysql/rhel/patches/chromedp_no_sandbox.patch b/Dockerfiles/build-mysql/rhel/patches/chromedp_no_sandbox.patch new file mode 100644 index 000000000..c8a2e162c --- /dev/null +++ b/Dockerfiles/build-mysql/rhel/patches/chromedp_no_sandbox.patch @@ -0,0 +1,17 @@ +diff --git a/src/go/cmd/zabbix_web_service/pdf_report_creator.go b/src/go/cmd/zabbix_web_service/pdf_report_creator.go +index afab41204d1..f1a9b859f34 100644 +--- a/src/go/cmd/zabbix_web_service/pdf_report_creator.go ++++ b/src/go/cmd/zabbix_web_service/pdf_report_creator.go +@@ -100,7 +100,11 @@ func (h *handler) report(w http.ResponseWriter, r *http.Request) { + return + } + +- opts := chromedp.DefaultExecAllocatorOptions[:] ++ opts := append(chromedp.DefaultExecAllocatorOptions[:], ++ chromedp.DisableGPU, ++ chromedp.NoSandbox, ++ chromedp.Flag("disable-setuid-sandbox", true), ++ ) + + if options.IgnoreURLCertErrors == 1 { + opts = append(opts, chromedp.Flag("ignore-certificate-errors", "1")) diff --git a/Dockerfiles/build-mysql/ubuntu/patches/chromedp_no_sandbox.patch b/Dockerfiles/build-mysql/ubuntu/patches/chromedp_no_sandbox.patch new file mode 100644 index 000000000..c8a2e162c --- /dev/null +++ b/Dockerfiles/build-mysql/ubuntu/patches/chromedp_no_sandbox.patch @@ -0,0 +1,17 @@ +diff --git a/src/go/cmd/zabbix_web_service/pdf_report_creator.go b/src/go/cmd/zabbix_web_service/pdf_report_creator.go +index afab41204d1..f1a9b859f34 100644 +--- a/src/go/cmd/zabbix_web_service/pdf_report_creator.go ++++ b/src/go/cmd/zabbix_web_service/pdf_report_creator.go +@@ -100,7 +100,11 @@ func (h *handler) report(w http.ResponseWriter, r *http.Request) { + return + } + +- opts := chromedp.DefaultExecAllocatorOptions[:] ++ opts := append(chromedp.DefaultExecAllocatorOptions[:], ++ chromedp.DisableGPU, ++ chromedp.NoSandbox, ++ chromedp.Flag("disable-setuid-sandbox", true), ++ ) + + if options.IgnoreURLCertErrors == 1 { + opts = append(opts, chromedp.Flag("ignore-certificate-errors", "1")) diff --git a/Dockerfiles/build-pgsql/alpine/patches/chromedp_no_sandbox.patch b/Dockerfiles/build-pgsql/alpine/patches/chromedp_no_sandbox.patch new file mode 100644 index 000000000..c8a2e162c --- /dev/null +++ b/Dockerfiles/build-pgsql/alpine/patches/chromedp_no_sandbox.patch @@ -0,0 +1,17 @@ +diff --git a/src/go/cmd/zabbix_web_service/pdf_report_creator.go b/src/go/cmd/zabbix_web_service/pdf_report_creator.go +index afab41204d1..f1a9b859f34 100644 +--- a/src/go/cmd/zabbix_web_service/pdf_report_creator.go ++++ b/src/go/cmd/zabbix_web_service/pdf_report_creator.go +@@ -100,7 +100,11 @@ func (h *handler) report(w http.ResponseWriter, r *http.Request) { + return + } + +- opts := chromedp.DefaultExecAllocatorOptions[:] ++ opts := append(chromedp.DefaultExecAllocatorOptions[:], ++ chromedp.DisableGPU, ++ chromedp.NoSandbox, ++ chromedp.Flag("disable-setuid-sandbox", true), ++ ) + + if options.IgnoreURLCertErrors == 1 { + opts = append(opts, chromedp.Flag("ignore-certificate-errors", "1")) diff --git a/Dockerfiles/build-pgsql/centos/patches/chromedp_no_sandbox.patch b/Dockerfiles/build-pgsql/centos/patches/chromedp_no_sandbox.patch new file mode 100644 index 000000000..c8a2e162c --- /dev/null +++ b/Dockerfiles/build-pgsql/centos/patches/chromedp_no_sandbox.patch @@ -0,0 +1,17 @@ +diff --git a/src/go/cmd/zabbix_web_service/pdf_report_creator.go b/src/go/cmd/zabbix_web_service/pdf_report_creator.go +index afab41204d1..f1a9b859f34 100644 +--- a/src/go/cmd/zabbix_web_service/pdf_report_creator.go ++++ b/src/go/cmd/zabbix_web_service/pdf_report_creator.go +@@ -100,7 +100,11 @@ func (h *handler) report(w http.ResponseWriter, r *http.Request) { + return + } + +- opts := chromedp.DefaultExecAllocatorOptions[:] ++ opts := append(chromedp.DefaultExecAllocatorOptions[:], ++ chromedp.DisableGPU, ++ chromedp.NoSandbox, ++ chromedp.Flag("disable-setuid-sandbox", true), ++ ) + + if options.IgnoreURLCertErrors == 1 { + opts = append(opts, chromedp.Flag("ignore-certificate-errors", "1")) diff --git a/Dockerfiles/build-pgsql/ol/patches/chromedp_no_sandbox.patch b/Dockerfiles/build-pgsql/ol/patches/chromedp_no_sandbox.patch new file mode 100644 index 000000000..c8a2e162c --- /dev/null +++ b/Dockerfiles/build-pgsql/ol/patches/chromedp_no_sandbox.patch @@ -0,0 +1,17 @@ +diff --git a/src/go/cmd/zabbix_web_service/pdf_report_creator.go b/src/go/cmd/zabbix_web_service/pdf_report_creator.go +index afab41204d1..f1a9b859f34 100644 +--- a/src/go/cmd/zabbix_web_service/pdf_report_creator.go ++++ b/src/go/cmd/zabbix_web_service/pdf_report_creator.go +@@ -100,7 +100,11 @@ func (h *handler) report(w http.ResponseWriter, r *http.Request) { + return + } + +- opts := chromedp.DefaultExecAllocatorOptions[:] ++ opts := append(chromedp.DefaultExecAllocatorOptions[:], ++ chromedp.DisableGPU, ++ chromedp.NoSandbox, ++ chromedp.Flag("disable-setuid-sandbox", true), ++ ) + + if options.IgnoreURLCertErrors == 1 { + opts = append(opts, chromedp.Flag("ignore-certificate-errors", "1")) diff --git a/Dockerfiles/build-pgsql/rhel/patches/chromedp_no_sandbox.patch b/Dockerfiles/build-pgsql/rhel/patches/chromedp_no_sandbox.patch new file mode 100644 index 000000000..c8a2e162c --- /dev/null +++ b/Dockerfiles/build-pgsql/rhel/patches/chromedp_no_sandbox.patch @@ -0,0 +1,17 @@ +diff --git a/src/go/cmd/zabbix_web_service/pdf_report_creator.go b/src/go/cmd/zabbix_web_service/pdf_report_creator.go +index afab41204d1..f1a9b859f34 100644 +--- a/src/go/cmd/zabbix_web_service/pdf_report_creator.go ++++ b/src/go/cmd/zabbix_web_service/pdf_report_creator.go +@@ -100,7 +100,11 @@ func (h *handler) report(w http.ResponseWriter, r *http.Request) { + return + } + +- opts := chromedp.DefaultExecAllocatorOptions[:] ++ opts := append(chromedp.DefaultExecAllocatorOptions[:], ++ chromedp.DisableGPU, ++ chromedp.NoSandbox, ++ chromedp.Flag("disable-setuid-sandbox", true), ++ ) + + if options.IgnoreURLCertErrors == 1 { + opts = append(opts, chromedp.Flag("ignore-certificate-errors", "1")) diff --git a/Dockerfiles/build-pgsql/ubuntu/patches/chromedp_no_sandbox.patch b/Dockerfiles/build-pgsql/ubuntu/patches/chromedp_no_sandbox.patch new file mode 100644 index 000000000..c8a2e162c --- /dev/null +++ b/Dockerfiles/build-pgsql/ubuntu/patches/chromedp_no_sandbox.patch @@ -0,0 +1,17 @@ +diff --git a/src/go/cmd/zabbix_web_service/pdf_report_creator.go b/src/go/cmd/zabbix_web_service/pdf_report_creator.go +index afab41204d1..f1a9b859f34 100644 +--- a/src/go/cmd/zabbix_web_service/pdf_report_creator.go ++++ b/src/go/cmd/zabbix_web_service/pdf_report_creator.go +@@ -100,7 +100,11 @@ func (h *handler) report(w http.ResponseWriter, r *http.Request) { + return + } + +- opts := chromedp.DefaultExecAllocatorOptions[:] ++ opts := append(chromedp.DefaultExecAllocatorOptions[:], ++ chromedp.DisableGPU, ++ chromedp.NoSandbox, ++ chromedp.Flag("disable-setuid-sandbox", true), ++ ) + + if options.IgnoreURLCertErrors == 1 { + opts = append(opts, chromedp.Flag("ignore-certificate-errors", "1"))