[projects/cleanbuild] add --network option to docker builder
glen
glen at pld-linux.org
Mon Dec 31 10:28:54 CET 2018
commit 3ac42f8dc7c05a1be1d4b9f7295253d119c1c58c
Author: Elan Ruusamäe <glen at pld-linux.org>
Date: Mon Dec 31 10:57:33 2018 +0200
add --network option to docker builder
cleanbuild-docker.sh | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/cleanbuild-docker.sh b/cleanbuild-docker.sh
index 6574190..9edc122 100755
--- a/cleanbuild-docker.sh
+++ b/cleanbuild-docker.sh
@@ -5,6 +5,7 @@ PROGRAM=${0##*/}
# defaults
: ${PACKAGE_NAME=''}
+: ${NETWORKING=false}
dir=$(pwd)
image=registry.gitlab.com/pld-linux/cleanbuild
@@ -54,7 +55,7 @@ package_prepare() {
docker exec $name builder -g $PACKAGE_NAME
# prevent network access like pld builders do
- docker exec --user=root -w / $name setfacl -m u:builder:--- /etc/resolv.conf
+ $NETWORKING || docker exec --user=root -w / $name setfacl -m u:builder:--- /etc/resolv.conf
git_tag=$(GIT_DIR=$topdir/packages/$PACKAGE_NAME/.git git describe --tags --always)
buildlog=rpm/logs/${git_tag#auto/*/}.log
@@ -105,12 +106,15 @@ package_build() {
parse_options() {
local t
- t=$(getopt -o '' --long '' -n "$PROGRAM" -- "$@")
+ t=$(getopt -o '' --long 'network' -n "$PROGRAM" -- "$@")
[ $? != 0 ] && exit $?
eval set -- "$t"
while :; do
case "$1" in
+ --network)
+ NETWORKING=true
+ ;;
--)
shift
break
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/projects/cleanbuild.git/commitdiff/2da31caa754f920335a6c371f2b883b570fe717f
More information about the pld-cvs-commit
mailing list