Build docker in parallel

.ci/build-docker.sh

@@ -27,7 +27,7 @@ docker_build() {
  # Docker's --cache-from does not really work with multi-stage builds: https://github.com/moby/moby/issues/34715
  # So we just have to rely on the local cache.
  time docker build -f docker/Dockerfile \
---build-arg "WITH_PYTHON=${WITH_PYTHON}" --build-arg "MAKEOPTS=${MAKEOPTS}" --build-arg "SAGE_NUM_THREADS=${SAGE_NUM_THREADS}" --build-arg "MAKEOPTS_DOCBUILD=${MAKEOPTS}" --build-arg "SAGE_NUM_THREADS_DOCBUILD=${SAGE_NUM_THREADS_DOCBUILD}" --build-arg ARTIFACT_BASE=$ARTIFACT_BASE $@
+--build-arg "WITH_PYTHON=${WITH_PYTHON}" --build-arg "MAKEFLAGS=${MAKEFLAGS}" --build-arg "SAGE_NUM_THREADS=${SAGE_NUM_THREADS}" --build-arg "MAKEFLAGS_DOCBUILD=${MAKEFLAGS}" --build-arg "SAGE_NUM_THREADS_DOCBUILD=${SAGE_NUM_THREADS_DOCBUILD}" --build-arg ARTIFACT_BASE=$ARTIFACT_BASE $@
 }
 
 # We use a multi-stage build /docker/Dockerfile. For the caching to be

.ci/setup-make-parallelity.sh

@@ -3,10 +3,10 @@
 # Source this to set CPUTHREADS (the number of apparent cores) and RAMTHREADS
 # (free RAM divided by the maximum amount needed per thread typically)
 # From this this script infers reasonable defaults for SAGE_NUM_THREADS and
-# MAKEOPTS.
+# MAKEFLAGS.
 
 # We do exactly the same for CPUTHREADS_DOCBUILD, RAMTHREADS_DOCBUILD,
-# SAGE_NUM_THREADS_DOCBUILD, MAKEOPTS_DOCBUILD. As the docbuild needs
+# SAGE_NUM_THREADS_DOCBUILD, MAKEFLAGS_DOCBUILD. As the docbuild needs
 # substantially more RAM as of May 2018.
 
 # ****************************************************************************
@@ -61,5 +61,5 @@ else
  export SAGE_NUM_THREADS_DOCBUILD=$RAMTHREADS_DOCBUILD
 fi
 # Set -j and -l for make (though -l is probably ignored by Sage)
-export MAKEOPTS="-j $SAGE_NUM_THREADS -l $((CPUTHREADS - 1)).8"
-export MAKEOPTS_DOCBUILD="-j $SAGE_NUM_THREADS_DOCBUILD -l $((CPUTHREADS_DOCBUILD - 1)).8"
+export MAKEFLAGS="-j $SAGE_NUM_THREADS -l $((CPUTHREADS - 1)).8"
+export MAKEFLAGS_DOCBUILD="-j $SAGE_NUM_THREADS_DOCBUILD -l $((CPUTHREADS_DOCBUILD - 1)).8"

.ci/test-dev.sh

@@ -26,7 +26,7 @@ IMAGE="$1"
 # Runs $IMAGE with args and check that it terminates with a zero exit code in at most limit seconds.
 timed_run() {
  START=`date +%s`
- docker run -e MAKEOPTS="$MAKEOPTS_DOCBUILD" -e SAGE_NUM_THREADS="$SAGE_NUM_THREADS_DOCBUILD" "$IMAGE" "$2"
+ docker run -e MAKEFLAGS="$MAKEFLAGS_DOCBUILD" -e SAGE_NUM_THREADS="$SAGE_NUM_THREADS_DOCBUILD" "$IMAGE" "$2"
  END=`date +%s`
  TOTAL=$((END-START))
  echo "Checking whether running \"$2\" was fast…"

.circleci/before-script.sh

@@ -18,7 +18,7 @@
 . .ci/protect-secrets.sh
 # Collect debug infos about the system we are running on
 .ci/describe-system.sh
-# Set MAKEOPTS and SAGE_NUM_THREADS 
+# Set MAKEFLAGS and SAGE_NUM_THREADS
 . .ci/setup-make-parallelity.sh
 
 # Set DOCKER_TAG according to the current branch/tag

.gitlab-ci.yml

@@ -58,7 +58,7 @@ before_script:
  - .ci/describe-system.sh
  # Set DOCKER_TAG according to the current branch/tag
  - . .ci/update-env.sh
- # Set MAKEOPTS and SAGE_NUM_THREADS according to the machine we are running on
+ # Set MAKEFLAGS and SAGE_NUM_THREADS according to the machine we are running on
  - . .ci/setup-make-parallelity.sh
 
 # We use docker-in-docker to build our docker images, i.e., we run a