Use prebuilt builder images for static builds. (#12826)
Austin S. Hemmelgarn committed
May 10, 2022 at 07:30 UTC
08568db13e9ceddb36d9ef9dc45557dcd2a4240e
1 file changed
+7
-28
packaging/makeself/build-static.sh
+7
-28
@@ -20,46 +20,25 @@ case ${BUILDARCH} in
20
;;
21
esac
22
23
-DOCKER_CONTAINER_NAME="netdata-package-${BUILDARCH}-static-alpine315"
23
+DOCKER_IMAGE_NAME="netdata/static-builder"
24
25
if [ "${BUILDARCH}" != "$(uname -m)" ] && [ "$(uname -m)" = 'x86_64' ] && [ -z "${SKIP_EMULATION}" ]; then
26
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes || exit 1
27
fi
28
29
-if ! docker inspect "${DOCKER_CONTAINER_NAME}" > /dev/null 2>&1; then
30
- # To run interactively:
31
- # docker run -it netdata-package-x86_64-static /bin/sh
32
- # (add -v host-dir:guest-dir:rw arguments to mount volumes)
33
- #
34
- # To remove images in order to re-create:
35
- # docker rm -v $(sudo docker ps -a -q -f status=exited)
36
- # docker rmi netdata-package-x86_64-static
37
- #
38
- # This command maps the current directory to
39
- # /usr/src/netdata.git
40
- # inside the container and runs the script install-alpine-packages.sh
41
- # (also inside the container)
42
- #
43
- if docker inspect alpine:3.15 > /dev/null 2>&1; then
44
- run docker image remove alpine:3.15
45
- run docker pull --platform=${platform} alpine:3.15
46
- fi
47
-
48
- run docker run --platform=${platform} -v "$(pwd)":/netdata:rw alpine:3.15 \
49
- /bin/sh /netdata/packaging/makeself/install-alpine-packages.sh
50
-
51
- # save the changes made permanently
52
- id=$(docker ps -l -q)
53
- run docker commit "${id}" "${DOCKER_CONTAINER_NAME}"
29
+if docker inspect "${DOCKER_IMAGE_NAME}" > /dev/null 2>&1; then
30
+ docker image rm "${DOCKER_IMAGE_NAME}" || exit 1
31
fi
32
33
+docker pull --platform "${platform}" "${DOCKER_IMAGE_NAME}"
34
+
35
# Run the build script inside the container
36
if [ -t 1 ]; then
37
run docker run -e BUILDARCH="${BUILDARCH}" -a stdin -a stdout -a stderr -i -t -v "$(pwd)":/netdata:rw \
59
- "${DOCKER_CONTAINER_NAME}" \
38
+ "${DOCKER_IMAGE_NAME}" \
39
/bin/sh /netdata/packaging/makeself/build.sh "${@}"
40
else
41
run docker run -e BUILDARCH="${BUILDARCH}" -v "$(pwd)":/netdata:rw \
63
- -e GITHUB_ACTIONS="${GITHUB_ACTIONS}" "${DOCKER_CONTAINER_NAME}" \
42
+ -e GITHUB_ACTIONS="${GITHUB_ACTIONS}" "${DOCKER_IMAGE_NAME}" \
43
/bin/sh /netdata/packaging/makeself/build.sh "${@}"
44
fi