Cleanup packaging/makeself/build-x86_64-static.sh to use /bin/sh and remove use of sudo (#7725)
James Mills committed
Jan 18, 2020 at 00:34 UTC
986bc2052c34b8cbb8ec46664b77cf2994df34c3
1 file changed
+12
-13
packaging/makeself/build-x86_64-static.sh
+12
-13
@@ -1,4 +1,5 @@
1
-#!/usr/bin/env bash
1
+#!/bin/sh
2
+
3
# SPDX-License-Identifier: GPL-3.0-or-later
4
5
. $(dirname "$0")/../installer/functions.sh || exit 1
@@ -7,36 +8,34 @@ set -e
8
9
DOCKER_CONTAINER_NAME="netdata-package-x86_64-static-alpine37"
10
10
-if ! sudo docker inspect "${DOCKER_CONTAINER_NAME}" >/dev/null 2>&1
11
-then
11
+if ! docker inspect "${DOCKER_CONTAINER_NAME}" >/dev/null 2>&1; then
12
# To run interactively:
13
- # sudo docker run -it netdata-package-x86_64-static /bin/sh
13
+ # docker run -it netdata-package-x86_64-static /bin/sh
14
# (add -v host-dir:guest-dir:rw arguments to mount volumes)
15
#
16
# To remove images in order to re-create:
17
- # sudo docker rm -v $(sudo docker ps -a -q -f status=exited)
18
- # sudo docker rmi netdata-package-x86_64-static
17
+ # docker rm -v $(sudo docker ps -a -q -f status=exited)
18
+ # docker rmi netdata-package-x86_64-static
19
#
20
# This command maps the current directory to
21
# /usr/src/netdata.git
22
# inside the container and runs the script install-alpine-packages.sh
23
# (also inside the container)
24
#
25
- run sudo docker run -v $(pwd):/usr/src/netdata.git:rw alpine:3.7 \
25
+ run docker run -v $(pwd):/usr/src/netdata.git:rw alpine:3.7 \
26
/bin/sh /usr/src/netdata.git/packaging/makeself/install-alpine-packages.sh
27
28
# save the changes made permanently
29
- id=$(sudo docker ps -l -q)
30
- run sudo docker commit ${id} "${DOCKER_CONTAINER_NAME}"
29
+ id=$(docker ps -l -q)
30
+ run docker commit ${id} "${DOCKER_CONTAINER_NAME}"
31
fi
32
33
# Run the build script inside the container
34
-run sudo docker run -a stdin -a stdout -a stderr -i -t -v \
34
+run docker run -a stdin -a stdout -a stderr -i -t -v \
35
$(pwd):/usr/src/netdata.git:rw \
36
"${DOCKER_CONTAINER_NAME}" \
37
/bin/sh /usr/src/netdata.git/packaging/makeself/build.sh "${@}"
38
39
-if [ "${USER}" ]
40
- then
41
- sudo chown -R "${USER}" .
39
+if [ "${USER}" ]; then
40
+ chown -R "${USER}" .
41
fi