summaryrefslogtreecommitdiffstats
path: root/makeself
diff options
context:
space:
mode:
authorCosta Tsaousis (ktsaou) <costa@tsaousis.gr>2017-04-02 12:08:17 +0300
committerCosta Tsaousis (ktsaou) <costa@tsaousis.gr>2017-04-02 12:08:17 +0300
commit55f77f0823b0ece6b1fbd37409d3da7a6f2c7f65 (patch)
treea564a8a353c24985bbabaf5fe92e3da27abdb4db /makeself
parent6ace8446de9d0c27856ecfba5d3261a909b91c98 (diff)
comments
Diffstat (limited to 'makeself')
-rwxr-xr-xmakeself/build-x86_64-static.sh47
1 files changed, 30 insertions, 17 deletions
diff --git a/makeself/build-x86_64-static.sh b/makeself/build-x86_64-static.sh
index 9d48bc9a41..2248ad76ce 100755
--- a/makeself/build-x86_64-static.sh
+++ b/makeself/build-x86_64-static.sh
@@ -2,23 +2,36 @@
set -e
-if ! sudo docker inspect netdata-package-x86_64-static > /dev/null 2>&1
-then
- # To run interactively:
- # sudo 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:
- # sudo docker rm -v $(sudo docker ps -a -q -f status=exited)
- # sudo docker rmi netdata-package-x86_64-static
- sudo docker run -v `pwd`:/usr/src/netdata.git:rw alpine:3.5 \
- /bin/sh /usr/src/netdata.git/makeself/setup-x86_64-static.sh
- id=`sudo docker ps -l -q`
- sudo docker commit $id netdata-package-x86_64-static
- fi
-sudo docker run -v `pwd`:/usr/src/netdata.git:rw netdata-package-x86_64-static \
- /bin/sh /usr/src/netdata.git/makeself/build.sh
+DOCKER_CONTAINER_NAME="netdata-package-x86_64-static"
-if [ "$USER" ]
+if ! sudo docker inspect "${DOCKER_CONTAINER_NAME}" >/dev/null 2>&1
then
- sudo chown -R "$USER" .
+ # To run interactively:
+ # sudo 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:
+ # sudo docker rm -v $(sudo docker ps -a -q -f status=exited)
+ # sudo 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 setup-x86_64-static.sh
+ # (also inside the container)
+ #
+ sudo docker run -v $(pwd):/usr/src/netdata.git:rw alpine:3.5 \
+ /bin/sh /usr/src/netdata.git/makeself/setup-x86_64-static.sh
+
+ # save the changes made permanently
+ id=$(sudo docker ps -l -q)
+ sudo docker commit ${id} "${DOCKER_CONTAINER_NAME}"
+fi
+
+# Run the build script inside the container
+sudo docker run -v $(pwd):/usr/src/netdata.git:rw "${DOCKER_CONTAINER_NAME}" \
+ /bin/sh /usr/src/netdata.git/makeself/build.sh
+
+if [ "${USER}" ]
+ then
+ sudo chown -R "${USER}" .
fi