From 214cb3a41e86bc11c825b9ed8ff2513d4e69c72d Mon Sep 17 00:00:00 2001
From: "Austin S. Hemmelgarn" <austin@netdata.cloud>
Date: Mon, 6 Sep 2021 09:10:05 -0400
Subject: Embed build architecture in static build archive names. (#11463)

* Embed build architecture in static build archive names.

This is required for proper support for static installs in the new
kickstart script.

The associated changes will also simplify adding static builds for other
architectures in the future.

* Update CI to use new static build changes properly.

* Fix typos.

* Fix link created by static build process.

* Fix build environment setup.
---
 packaging/makeself/build-x86_64-static.sh | 45 ++-----------------------------
 1 file changed, 2 insertions(+), 43 deletions(-)

(limited to 'packaging/makeself/build-x86_64-static.sh')

diff --git a/packaging/makeself/build-x86_64-static.sh b/packaging/makeself/build-x86_64-static.sh
index 83fa0dba92..0f5f1df145 100755
--- a/packaging/makeself/build-x86_64-static.sh
+++ b/packaging/makeself/build-x86_64-static.sh
@@ -2,47 +2,6 @@
 
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-# shellcheck source=./packaging/installer/functions.sh
-. "$(dirname "$0")"/../installer/functions.sh || exit 1
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 
-set -e
-
-DOCKER_CONTAINER_NAME="netdata-package-x86_64-static-alpine312"
-
-if ! docker inspect "${DOCKER_CONTAINER_NAME}" > /dev/null 2>&1; then
-  # To run interactively:
-  #   docker run -it netdata-package-x86_64-static /bin/sh
-  # (add -v host-dir:guest-dir:rw arguments to mount volumes)
-  #
-  # To remove images in order to re-create:
-  #   docker rm -v $(sudo docker ps -a -q -f status=exited)
-  #   docker rmi netdata-package-x86_64-static
-  #
-  # This command maps the current directory to
-  #   /usr/src/netdata.git
-  # inside the container and runs the script install-alpine-packages.sh
-  # (also inside the container)
-  #
-  run docker run -v "$(pwd)":/usr/src/netdata.git:rw alpine:3.12 \
-    /bin/sh /usr/src/netdata.git/packaging/makeself/install-alpine-packages.sh
-
-  # save the changes made permanently
-  id=$(docker ps -l -q)
-  run docker commit "${id}" "${DOCKER_CONTAINER_NAME}"
-fi
-
-# Run the build script inside the container
-if [ -t 1 ]; then
-  run docker run -a stdin -a stdout -a stderr -i -t -v \
-    "$(pwd)":/usr/src/netdata.git:rw \
-    "${DOCKER_CONTAINER_NAME}" \
-    /bin/sh /usr/src/netdata.git/packaging/makeself/build.sh "${@}"
-else
-  run docker run -v "$(pwd)":/usr/src/netdata.git:rw \
-    "${DOCKER_CONTAINER_NAME}" \
-    /bin/sh /usr/src/netdata.git/packaging/makeself/build.sh "${@}"
-fi
-
-if [ "${USER}" ]; then
-  sudo chown -R "${USER}" .
-fi
+"${SCRIPT_DIR}/build-static.sh" x86_64
-- 
cgit v1.2.3