@@ -119,10 +119,15 @@ fi
119# * Do a single unpack to create the package index cache (again due to directory perms)
119# * Do a single unpack to create the package index cache (again due to directory perms)
120docker run $ARGS_PREBUILD $IMAGE /bin/bash -c "stackage-curator check --plan-file $PLAN_FILE && stackage-curator fetch --plan-file $PLAN_FILE && cd /tmp && exec stack unpack random"
120docker run $ARGS_PREBUILD $IMAGE /bin/bash -c "stackage-curator check --plan-file $PLAN_FILE && stackage-curator fetch --plan-file $PLAN_FILE && cd /tmp && exec stack unpack random"
122# Now do the actual build. We need to first set the owner of the home directory
127# Now do the actual build. We need to first set the owner of the home directory
123# correctly, so we run the command as root, change owner, and then use sudo to
128# correctly, so we run the command as root, change owner, and then use sudo to
124# switch back to the current user
129# switch back to the current user
125−docker run $ARGS_BUILD $IMAGE nice -n 15 /bin/bash -c "chown $USER $HOME && exec sudo -E -u $USER env \"HOME=$HOME\" \"PATH=\$PATH\" stackage-curator make-bundle --jobs 2 --plan-file $PLAN_FILE --docmap-file $DOCMAP_FILE --bundle-file $BUNDLE_FILE --target $TARGET"
130+docker run $ARGS_BUILD $IMAGE nice -n 15 /bin/bash -c "chown $USER $HOME && exec sudo -E -u $USER env \"HOME=$HOME\" \"PATH=\$PATH\" stackage-curator make-bundle --jobs $JOBS --plan-file $PLAN_FILE --docmap-file $DOCMAP_FILE --bundle-file $BUNDLE_FILE --target $TARGET"
127# Make sure we actually need this snapshot. We used to perform this check
132# Make sure we actually need this snapshot. We used to perform this check
128# exclusively before building. Now we perform it after as well for the case of
133# exclusively before building. Now we perform it after as well for the case of