archive/netdata_netdata
0
0
Fork 0
mirror of https://github.com/netdata/netdata.git synced 2025-04-27 14:16:20 +00:00
Code Issues Projects Releases Wiki Activity

Use system copy of protobuf in Docker images and static builds. ()

Browse source 
We know both environments provide a reliably stable copy, and this
greatly improves build imes.
This commit is contained in:
Austin S. Hemmelgarn 2021-09-09 07:58:58 -04:00 • committed by GitHub
parent 538ba0a2e5
commit 5ff0032310
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
packaging
docker
Dockerfile
makeself/jobs
70-netdata-git.install.sh

2
packaging/docker/Dockerfile
View file

@ -26,7 +26,7 @@ WORKDIR /opt/netdata.git
RUN chmod +x netdata-installer.sh && \ RUN chmod +x netdata-installer.sh && \
cp -rp /deps/* /usr/local/ && \ cp -rp /deps/* /usr/local/ && \
/bin/echo -e "INSTALL_TYPE='oci'\nPREBUILT_ARCH='$(uname -m)'" > ./system/.install-type && \ /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)" "$([ "$RELEASE_CHANNEL" = stable ] && echo --stable-channel)"
# files to one directory # files to one directory

1
packaging/makeself/jobs/70-netdata-git.install.sh
View file

@ -31,6 +31,7 @@ run ./netdata-installer.sh \
--dont-wait \ --dont-wait \
--dont-start-it \ --dont-start-it \
--require-cloud \ --require-cloud \
--use-system-protobuf \
--dont-scrub-cflags-even-though-it-may-break-things --dont-scrub-cflags-even-though-it-may-break-things
# Properly mark the install type # Properly mark the install type