Optimize static build and update various dependencies. (#11660)
Austin S. Hemmelgarn committed
Oct 19, 2021 at 07:28 UTC
1f3150c0a6eecf1e6cecbe5ee96cebd3301ff89b
3 files changed
+7
-17
packaging/makeself/build-static.sh
+5
-5
@@ -19,7 +19,7 @@ case ${BUILDARCH} in
19
;;
20
esac
21
22
-DOCKER_CONTAINER_NAME="netdata-package-${BUILDARCH}-static-alpine312"
22
+DOCKER_CONTAINER_NAME="netdata-package-${BUILDARCH}-static-alpine314"
23
24
if [ "${BUILDARCH}" != "$(uname -m)" ]; then
25
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
39
# inside the container and runs the script install-alpine-packages.sh
40
# (also inside the container)
41
#
42
- if docker inspect alpine:3.12 > dev/null 2>&1; then
43
- run docker image remove alpine:3.12
44
- run docker pull --platform=${platform} alpine:3.12
42
+ if docker inspect alpine:3.14 > dev/null 2>&1; then
43
+ run docker image remove alpine:3.14
44
+ run docker pull --platform=${platform} alpine:3.14
45
fi
46
47
- run docker run --platform=${platform} -v "$(pwd)":/usr/src/netdata.git:rw alpine:3.12 \
47
+ run docker run --platform=${platform} -v "$(pwd)":/usr/src/netdata.git:rw alpine:3.14 \
48
/bin/sh /usr/src/netdata.git/packaging/makeself/install-alpine-packages.sh
49
50
# save the changes made permanently
packaging/makeself/install-alpine-packages.sh
+1
-11
@@ -34,20 +34,10 @@ apk add --no-cache -U \
34
pkgconfig \
35
protobuf-dev \
36
snappy-dev \
37
+ snappy-static \
38
util-linux-dev \
39
wget \
40
xz \
41
zlib-dev \
42
zlib-static ||
43
exit 1
43
-
44
-# snappy doesn't have static version in alpine, let's compile it
45
-export SNAPPY_VER="1.1.7"
46
-wget -O /snappy.tar.gz https://github.com/google/snappy/archive/${SNAPPY_VER}.tar.gz
47
-tar -C / -xf /snappy.tar.gz
48
-rm /snappy.tar.gz
49
-cd /snappy-${SNAPPY_VER} || exit 1
50
-mkdir build
51
-cd build || exit 1
52
-cmake -DCMAKE_BUILD_SHARED_LIBS=true -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_INSTALL_LIBDIR=lib ../
53
-make && make install
packaging/makeself/jobs/50-bash-5.1.8.install.sh
renamed
+1
-1
@@ -4,7 +4,7 @@
4
# shellcheck source=packaging/makeself/functions.sh
5
. "$(dirname "${0}")/../functions.sh" "${@}" || exit 1
6
7
-fetch "bash-5.0" "http://ftp.gnu.org/gnu/bash/bash-5.0.tar.gz"
7
+fetch "bash-5.1.8" "http://ftp.gnu.org/gnu/bash/bash-5.1.8.tar.gz"
8
9
export PKG_CONFIG_PATH="/openssl-static/lib/pkgconfig"
10