diff --git a/Dockerfile b/Dockerfile index 61eace1..4336c82 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:stretch +FROM debian:bookworm ADD git-tag /git-tag diff --git a/build_and_push.sh b/build_and_push.sh index 0e95ec6..dc457ef 100755 --- a/build_and_push.sh +++ b/build_and_push.sh @@ -1,7 +1,7 @@ #!/bin/sh MY_IMAGE_NAME="caprover/netdata" -NETDATA_VERSION="v1.34.1" +NETDATA_VERSION="v1.42.2" # ensure you're not running it on local machine if [ -z "$CI" ] || [ -z "$GITHUB_REF" ]; then @@ -22,5 +22,5 @@ docker buildx ls docker buildx create --name mybuilder docker buildx use mybuilder -# REMOVED linux/arm64 as debie:jessie isn't built for linux/arm64 -docker buildx build --platform linux/amd64,linux/arm,linux/arm64,linux/386 -t $MY_IMAGE_NAME:latest -t $MY_IMAGE_NAME:$NETDATA_VERSION --push . +# REMOVED linux/arm, and all 32 bit. Just focus on x86_64 +docker buildx build --platform linux/amd64,linux/arm,linux/arm64,linux/386 -t $MY_IMAGE_NAME:latest -t $MY_IMAGE_NAME:$NETDATA_VERSION --push . \ No newline at end of file diff --git a/scripts/build.sh b/scripts/build.sh index 4876b29..254383a 100644 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -2,22 +2,22 @@ set -e DEBIAN_FRONTEND=noninteractive -# some mirrors have issues, i skipped httpredir in favor of an eu mirror +# some mirrors have issues, i skipped httpredir in favor of an eu mirror, moved to bookworm, and they cause duplicates only. -echo "deb http://ftp.nl.debian.org/debian/ stretch main" > /etc/apt/sources.list -echo "deb http://security.debian.org/debian-security stretch/updates main" >> /etc/apt/sources.list +# echo "deb http://deb.debian.org/debian/ bookworm main" > /etc/apt/sources.list +# echo "deb http://security.debian.org/debian-security bookworm-security main" >> /etc/apt/sources.list # install dependencies for build # source: https://learn.netdata.cloud/docs/agent/packaging/installer/methods/manual -apt-get -qq update -apt-get -y install zlib1g-dev uuid-dev libmnl-dev gcc make curl git autoconf autogen automake pkg-config netcat-openbsd jq libuv1-dev liblz4-dev libjudy-dev libssl-dev cmake libelf-dev libprotobuf-dev protobuf-compiler g++ -apt-get -y install autoconf-archive lm-sensors nodejs python python-mysqldb python-yaml libjudydebian1 libuv1 liblz4-1 openssl -apt-get -y install msmtp msmtp-mta apcupsd fping +apt-get update -qq && \ +apt-get install -y ca-certificates git-man netcat-openbsd krb5-locales less libbrotli1 libbsd0 libcbor0.8 libcurl3-gnutls libcurl4 libedit2 liberror-perl libexpat1 libfido2-1 libgdbm-compat4 libgdbm6 libgssapi-krb5-2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.5-0 libldap-common libnghttp2-14 libperl5.36 libpsl5 librtmp1 libsasl2-2 libsasl2-modules libsasl2-modules-db libssh2-1 libssl3 libx11-6 libx11-data libxau6 libxcb1 libxdmcp6 libxext6 libxmuu1 netbase openssh-client openssl patch nodejs perl perl-modules-5.36 publicsuffix xauth && \ +apt-get install -y autoconf autoconf-archive autogen automake cmake curl g++ gcc git gzip libatomic1 libuuid1 libelf-dev libjson-c-dev libjudy-dev liblz4-dev libmnl-dev libssl-dev libsystemd-dev libuv1-dev libyaml-dev lm-sensors make pkg-config python3 python3-mysqldb python3-yaml tar uuid-dev zlib1g-dev libprotobuf-dev protobuf-compiler && \ +apt-get install -y msmtp msmtp-mta apcupsd fping -# fetch netdata +# fetch netdata & replaced firehol obsoleted by netdata -git clone https://github.com/firehol/netdata.git /netdata.git +git clone https://github.com/netdata/netdata.git /netdata.git cd /netdata.git TAG=$(