Updated 3rd party static build dependencies and use alpine 3.12 (#10241)
* updated 3rd party static dependencies * updated alpine to 3.12 * updated docker container name and added libuv-static * add lz4-static to alpine packages
Costa Tsaousis committed
Nov 18, 2020 at 18:48 UTC
40da71e1eb0b65e24745df332d8e28a716830b00
7 files changed
+11
-8
packaging/makeself/build-x86_64-static.sh
+2
-2
@@ -7,7 +7,7 @@
7
8
set -e
9
10
-DOCKER_CONTAINER_NAME="netdata-package-x86_64-static-alpine37"
10
+DOCKER_CONTAINER_NAME="netdata-package-x86_64-static-alpine312"
11
12
if ! docker inspect "${DOCKER_CONTAINER_NAME}" > /dev/null 2>&1; then
13
# To run interactively:
@@ -23,7 +23,7 @@ if ! docker inspect "${DOCKER_CONTAINER_NAME}" > /dev/null 2>&1; then
23
# inside the container and runs the script install-alpine-packages.sh
24
# (also inside the container)
25
#
26
- run docker run -v "$(pwd)":/usr/src/netdata.git:rw alpine:3.7 \
26
+ run docker run -v "$(pwd)":/usr/src/netdata.git:rw alpine:3.12 \
27
/bin/sh /usr/src/netdata.git/packaging/makeself/install-alpine-packages.sh
28
29
# save the changes made permanently
packaging/makeself/install-alpine-packages.sh
+3
@@ -26,10 +26,13 @@ apk add --no-cache -U \
26
util-linux-dev \
27
gnutls-dev \
28
zlib-dev \
29
+ zlib-static \
30
libmnl-dev \
31
libnetfilter_acct-dev \
32
libuv-dev \
33
+ libuv-static \
34
lz4-dev \
35
+ lz4-static \
36
snappy-dev \
37
protobuf-dev \
38
binutils \
packaging/makeself/jobs/50-bash-5.0.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-4.4.18" "http://ftp.gnu.org/gnu/bash/bash-4.4.18.tar.gz"
7
+fetch "bash-5.0" "http://ftp.gnu.org/gnu/bash/bash-5.0.tar.gz"
8
9
export PKG_CONFIG_PATH="/openssl-static/lib/pkgconfig"
10
packaging/makeself/jobs/50-curl-7.73.0.install.sh
renamed
+2
-2
@@ -4,14 +4,14 @@
4
# shellcheck source=packaging/makeself/functions.sh
5
. "$(dirname "${0}")/../functions.sh" "${@}" || exit 1
6
7
-fetch "curl-curl-7_60_0" "https://github.com/curl/curl/archive/curl-7_60_0.tar.gz"
7
+fetch "curl-7.73.0" "https://curl.haxx.se/download/curl-7.73.0.tar.gz"
8
9
export CFLAGS="-I/openssl-static/include"
10
export LDFLAGS="-static -L/openssl-static/lib"
11
export PKG_CONFIG="pkg-config --static"
12
export PKG_CONFIG_PATH="/openssl-static/lib/pkgconfig"
13
14
-run ./buildconf
14
+run autoreconf -fi
15
16
run ./configure \
17
--prefix="${NETDATA_INSTALL_PATH}" \
packaging/makeself/jobs/50-fping-5.0.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 "fping-4.2" "https://github.com/schweikert/fping/releases/download/v4.2/fping-4.2.tar.gz"
7
+fetch "fping-5.0" "https://fping.org/dist/fping-5.0.tar.gz"
8
9
export CFLAGS="-static -I/openssl-static/include"
10
export LDFLAGS="-static -L/openssl-static/lib"
packaging/makeself/jobs/50-ioping-1.2.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 "netdata-ioping-43d15a5" "https://github.com/netdata/ioping/tarball/master"
7
+fetch "ioping-1.2" "https://github.com/koct9i/ioping/archive/v1.2.tar.gz"
8
9
export CFLAGS="-static"
10
packaging/makeself/openssl.version
+1
-1
@@ -1 +1 @@
1
-OpenSSL_1_1_1g
1
+OpenSSL_1_1_1h