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.
Austin S. Hemmelgarn committed
Sep 9, 2021 at 07:58 UTC
5ff0032310daabe514fc18913e7cbf4501651961
2 files changed
+2
-1
packaging/docker/Dockerfile
+1
-1
@@ -26,7 +26,7 @@ WORKDIR /opt/netdata.git
26
RUN chmod +x netdata-installer.sh && \
27
cp -rp /deps/* /usr/local/ && \
28
/bin/echo -e "INSTALL_TYPE='oci'\nPREBUILT_ARCH='$(uname -m)'" > ./system/.install-type && \
29
- ./netdata-installer.sh --dont-wait --dont-start-it ${EXTRA_INSTALL_OPTS} \
29
+ ./netdata-installer.sh --dont-wait --dont-start-it --use-system-protobuf ${EXTRA_INSTALL_OPTS} \
30
"$([ "$RELEASE_CHANNEL" = stable ] && echo --stable-channel)"
31
32
# files to one directory
packaging/makeself/jobs/70-netdata-git.install.sh
+1
@@ -31,6 +31,7 @@ run ./netdata-installer.sh \
31
--dont-wait \
32
--dont-start-it \
33
--require-cloud \
34
+ --use-system-protobuf \
35
--dont-scrub-cflags-even-though-it-may-break-things
36
37
# Properly mark the install type