Skip to content

Commit 8131483

Browse files
committed
Add support for new options exposed in builder
- INTERNAL_BUILDER: swaps the builder supplied in the env var with the one executed in the container - BUILDER_VERBOSE: enable verbose mode - SHARE_WORKSPACE: enable sharing of the build directory with the container - PRE_SCRIPT/POST_SCRIPT: absolute paths of scripts that have to be executed in the container
1 parent 5a3be7c commit 8131483

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

sabayon-buildpackages

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ docker_volumes=( -v "$OUTPUT_DIR:/usr/portage/packages" )
4141
[ -z "$ENMAN_REPOSITORIES" ] || docker_env+=(-e "ENMAN_REPOSITORIES=$ENMAN_REPOSITORIES")
4242
[ -z "$REMOVE_ENMAN_REPOSITORIES" ] || docker_env+=(-e "REMOVE_ENMAN_REPOSITORIES=$REMOVE_ENMAN_REPOSITORIES")
4343
[ -z "$DISTFILES" ] || docker_volumes+=(-v "$DISTFILES:/usr/portage/distfiles")
44-
[ -z "$INTERNAL_BUILDER" ] || docker_volumes+=(-v "/usr/sbin/builder:/usr/sbin/builder")
44+
[ -z "$INTERNAL_BUILDER" ] || docker_volumes+=(-v "$INTERNAL_BUILDER:/usr/sbin/builder")
4545
[ -z "$ENTROPY_DOWNLOADED_PACKAGES" ] || docker_volumes+=(-v "$ENTROPY_DOWNLOADED_PACKAGES:/var/lib/entropy/client/packages")
4646
[ -z "$DISTCC_HOSTS" ] || docker_env+=(-e "DISTCC_HOSTS=$DISTCC_HOSTS")
4747
[ -z "${PRUNE_VIRTUALS}" ] || docker_env+=(-e "PRUNE_VIRTUALS=$PRUNE_VIRTUALS")
@@ -58,9 +58,13 @@ docker_volumes=( -v "$OUTPUT_DIR:/usr/portage/packages" )
5858
[ -z "$REMOTE_PORTDIR" ] || docker_env+=(-e "REMOTE_PORTDIR=$REMOTE_PORTDIR")
5959
[ -z "$ETP_NOCACHE" ] || docker_env+=(-e "ETP_NOCACHE=$ETP_NOCACHE")
6060
[ -z "$PRETEND" ] || docker_env+=(-e "PRETEND=$PRETEND")
61+
[ -z "$BUILDER_VERBOSE" ] || docker_env+=(-e "BUILDER_VERBOSE=$BUILDER_VERBOSE")
6162
[ -z "$DETECT_OBSOLETE" ] || docker_env+=(-e "DETECT_OBSOLETE=$DETECT_OBSOLETE")
6263
[ -z "$TARGET_OVERLAY" ] || docker_env+=(-e "TARGET_OVERLAY=$TARGET_OVERLAY")
6364
[ -d "$LOCAL_OVERLAY" ] && docker_volumes+=(-v "$LOCAL_OVERLAY:/usr/local/local_portage")
65+
[ -z "$SHARE_WORKSPACE" ] || docker_volumes+=(-v "$SAB_WORKSPACE:/devkit-workspace")
66+
[ -z "$PRE_SCRIPT" ] || docker_volumes+=(-v "$PRE_SCRIPT:/pre-script")
67+
[ -z "$POST_SCRIPT" ] || docker_volumes+=(-v "$POST_SCRIPT:/post-script")
6468

6569
if [ -e $MAKE_CONF ]; then
6670
echo "You specified a make.conf. I hope you know what are you doing"
@@ -88,4 +92,4 @@ echo "Spawning the package builder container for '$@'."
8892
echo ""
8993
echo "docker run $DOCKER_OPTS \"${docker_env[@]}\" \"${docker_volumes[@]}\" $DOCKER_IMAGE $@"
9094

91-
docker run $DOCKER_OPTS "${docker_env[@]}" "${docker_volumes[@]}" $DOCKER_IMAGE $@
95+
docker run $DOCKER_OPTS "${docker_env[@]}" "${docker_volumes[@]}" $DOCKER_IMAGE "$@"

0 commit comments

Comments
 (0)