diff options
author | Austin S. Hemmelgarn <austin@netdata.cloud> | 2021-10-19 07:28:26 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-19 07:28:26 -0400 |
commit | 1f3150c0a6eecf1e6cecbe5ee96cebd3301ff89b (patch) | |
tree | 2c729654bf00c88f1b0a7cafb6b79dd7669f21dc /packaging | |
parent | e0ebf9c855e7eaf1a947b1eb0463b26e0659e354 (diff) |
Optimize static build and update various dependencies. (#11660)
Diffstat (limited to 'packaging')
-rwxr-xr-x | packaging/makeself/build-static.sh | 10 | ||||
-rwxr-xr-x | packaging/makeself/install-alpine-packages.sh | 12 | ||||
-rwxr-xr-x | packaging/makeself/jobs/50-bash-5.1.8.install.sh (renamed from packaging/makeself/jobs/50-bash-5.0.install.sh) | 2 |
3 files changed, 7 insertions, 17 deletions
diff --git a/packaging/makeself/build-static.sh b/packaging/makeself/build-static.sh index dbd264af22..8d73dc5d91 100755 --- a/packaging/makeself/build-static.sh +++ b/packaging/makeself/build-static.sh @@ -19,7 +19,7 @@ case ${BUILDARCH} in ;; esac -DOCKER_CONTAINER_NAME="netdata-package-${BUILDARCH}-static-alpine312" +DOCKER_CONTAINER_NAME="netdata-package-${BUILDARCH}-static-alpine314" if [ "${BUILDARCH}" != "$(uname -m)" ]; then docker run --rm --privileged multiarch/qemu-user-static --reset -p yes || exit 1 @@ -39,12 +39,12 @@ if ! docker inspect "${DOCKER_CONTAINER_NAME}" > /dev/null 2>&1; then # inside the container and runs the script install-alpine-packages.sh # (also inside the container) # - if docker inspect alpine:3.12 > dev/null 2>&1; then - run docker image remove alpine:3.12 - run docker pull --platform=${platform} alpine:3.12 + if docker inspect alpine:3.14 > dev/null 2>&1; then + run docker image remove alpine:3.14 + run docker pull --platform=${platform} alpine:3.14 fi - run docker run --platform=${platform} -v "$(pwd)":/usr/src/netdata.git:rw alpine:3.12 \ + run docker run --platform=${platform} -v "$(pwd)":/usr/src/netdata.git:rw alpine:3.14 \ /bin/sh /usr/src/netdata.git/packaging/makeself/install-alpine-packages.sh # save the changes made permanently diff --git a/packaging/makeself/install-alpine-packages.sh b/packaging/makeself/install-alpine-packages.sh index d197f1e842..311e14a964 100755 --- a/packaging/makeself/install-alpine-packages.sh +++ b/packaging/makeself/install-alpine-packages.sh @@ -34,20 +34,10 @@ apk add --no-cache -U \ pkgconfig \ protobuf-dev \ snappy-dev \ + snappy-static \ util-linux-dev \ wget \ xz \ zlib-dev \ zlib-static || exit 1 - -# snappy doesn't have static version in alpine, let's compile it -export SNAPPY_VER="1.1.7" -wget -O /snappy.tar.gz https://github.com/google/snappy/archive/${SNAPPY_VER}.tar.gz -tar -C / -xf /snappy.tar.gz -rm /snappy.tar.gz -cd /snappy-${SNAPPY_VER} || exit 1 -mkdir build -cd build || exit 1 -cmake -DCMAKE_BUILD_SHARED_LIBS=true -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_INSTALL_LIBDIR=lib ../ -make && make install diff --git a/packaging/makeself/jobs/50-bash-5.0.install.sh b/packaging/makeself/jobs/50-bash-5.1.8.install.sh index d47220408c..5d4f0f40ae 100755 --- a/packaging/makeself/jobs/50-bash-5.0.install.sh +++ b/packaging/makeself/jobs/50-bash-5.1.8.install.sh @@ -4,7 +4,7 @@ # shellcheck source=packaging/makeself/functions.sh . "$(dirname "${0}")/../functions.sh" "${@}" || exit 1 -fetch "bash-5.0" "http://ftp.gnu.org/gnu/bash/bash-5.0.tar.gz" +fetch "bash-5.1.8" "http://ftp.gnu.org/gnu/bash/bash-5.1.8.tar.gz" export PKG_CONFIG_PATH="/openssl-static/lib/pkgconfig" |