From 5ff0032310daabe514fc18913e7cbf4501651961 Mon Sep 17 00:00:00 2001
From: "Austin S. Hemmelgarn" <austin@netdata.cloud>
Date: Thu, 9 Sep 2021 07:58:58 -0400
Subject: [PATCH] Use system copy of protobuf in Docker images and static
builds. (#11496)
We know both environments provide a reliably stable copy, and this
greatly improves build imes.
---
packaging/docker/Dockerfile | 2 +-
packaging/makeself/jobs/70-netdata-git.install.sh | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile
index bee3c70942..c0efb4bfa4 100644
--- a/packaging/docker/Dockerfile
+++ b/packaging/docker/Dockerfile
@@ -26,7 +26,7 @@ WORKDIR /opt/netdata.git
RUN chmod +x netdata-installer.sh && \
cp -rp /deps/* /usr/local/ && \
/bin/echo -e "INSTALL_TYPE='oci'\nPREBUILT_ARCH='$(uname -m)'" > ./system/.install-type && \
- ./netdata-installer.sh --dont-wait --dont-start-it ${EXTRA_INSTALL_OPTS} \
+ ./netdata-installer.sh --dont-wait --dont-start-it --use-system-protobuf ${EXTRA_INSTALL_OPTS} \
"$([ "$RELEASE_CHANNEL" = stable ] && echo --stable-channel)"
# files to one directory
diff --git a/packaging/makeself/jobs/70-netdata-git.install.sh b/packaging/makeself/jobs/70-netdata-git.install.sh
index 11608a4e4d..21c5195d84 100755
--- a/packaging/makeself/jobs/70-netdata-git.install.sh
+++ b/packaging/makeself/jobs/70-netdata-git.install.sh
@@ -31,6 +31,7 @@ run ./netdata-installer.sh \
--dont-wait \
--dont-start-it \
--require-cloud \
+ --use-system-protobuf \
--dont-scrub-cflags-even-though-it-may-break-things
# Properly mark the install type