From 00151562145df50cc65e9902d52d5fa77f89fe50 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 9 Jun 2022 06:52:47 +0200 Subject: Merging upstream version 1.35.0. Signed-off-by: Daniel Baumann --- packaging/docker/Dockerfile | 4 ++-- packaging/docker/health.sh | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'packaging/docker') diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile index 89e723a4f..194fa536b 100644 --- a/packaging/docker/Dockerfile +++ b/packaging/docker/Dockerfile @@ -26,8 +26,8 @@ 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 --use-system-protobuf ${EXTRA_INSTALL_OPTS} \ - "$([ "$RELEASE_CHANNEL" = stable ] && echo --stable-channel)" + CFLAGS="-O2 -pipe" ./netdata-installer.sh --dont-wait --dont-start-it --use-system-protobuf \ + ${EXTRA_INSTALL_OPTS} --one-time-build "$([ "$RELEASE_CHANNEL" = stable ] && echo --stable-channel)" # files to one directory RUN mkdir -p /app/usr/sbin/ \ diff --git a/packaging/docker/health.sh b/packaging/docker/health.sh index 088a6c0d7..00adf97a6 100755 --- a/packaging/docker/health.sh +++ b/packaging/docker/health.sh @@ -4,7 +4,8 @@ if [ -z "${NETDATA_HEALTHCHECK_TARGET}" ] ; then # If users didn't request something else, query `/api/v1/info`. - NETDATA_HEALTHCHECK_TARGET="http://localhost:19999/api/v1/info" + PORT=${NETDATA_LISTENER_PORT:-19999} + NETDATA_HEALTHCHECK_TARGET="http://localhost:${PORT}/api/v1/info" fi case "${NETDATA_HEALTHCHECK_TARGET}" in -- cgit v1.2.3