diff options
| author | Elan Ruusamäe | 2018-12-31 08:57:33 (GMT) |
|---|---|---|
| committer | Elan Ruusamäe | 2018-12-31 08:57:33 (GMT) |
| commit | 3ac42f8dc7c05a1be1d4b9f7295253d119c1c58c (patch) | |
| tree | 2f7929695e99a8f5fdb42c737ecd0413cdf3120e | |
| parent | e2ea04e5474ce5ba927b69769d379ad306c1701c (diff) | |
| download | cleanbuild-3ac42f8dc7c05a1be1d4b9f7295253d119c1c58c.zip cleanbuild-3ac42f8dc7c05a1be1d4b9f7295253d119c1c58c.tar.gz | |
add --network option to docker builder
| -rwxr-xr-x | cleanbuild-docker.sh | 8 |
1 files 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 |