diff --git a/build/bin/write-dockerfile.sh b/build/bin/write-dockerfile.sh index c12af2c6686..17812a2ec0d 100755 --- a/build/bin/write-dockerfile.sh +++ b/build/bin/write-dockerfile.sh @@ -7,6 +7,7 @@ SYSTEM="${1:-debian}" shopt -s extglob TYPE_PATTERN="${2:-standard}" WITH_SYSTEM_SPKG="${3:-yes}" +IGNORE_MISSING_SYSTEM_PACKAGES="${4:-no}" # STRIP_COMMENTS="sed s/#.*//;" SAGE_ROOT=. @@ -32,36 +33,92 @@ for PKG_SCRIPTS in build/pkgs/*; do fi fi done +echo "# Automatically generated by SAGE_ROOT/build/bin/write-dockerfile.sh" +echo "# the :comments: separate the generated file into sections" +echo "# to simplify writing scripts that customize this file" case $SYSTEM in debian*|ubuntu*) cat <&2 exit 1 ;; esac cat < {envdir}/Dockerfile' - docker build . -f {envdir}/Dockerfile --build-arg EXTRA_CONFIGURE_ARGS="{env:EXTRA_CONFIGURE_ARGS:}" {env:EXTRA_DOCKER_BUILD_ARGS:} --build-arg BASE_IMAGE={env:BASE_IMAGE} + docker: bash -c 'build/bin/write-dockerfile.sh {env:SYSTEM} "{env:TYPE_PATTERN:}" {env:WITH_SYSTEM_SPKG} {env:IGNORE_MISSING_SYSTEM_PACKAGES} > {envdir}/Dockerfile' + docker: docker build . -f {envdir}/Dockerfile \ + docker: --build-arg EXTRA_CONFIGURE_ARGS="{env:EXTRA_CONFIGURE_ARGS:}" \ + docker: --build-arg BASE_IMAGE={env:BASE_IMAGE} \ + docker-conda: --build-arg USE_CONDARC="{env:CONDARC}" \ + docker: {env:EXTRA_DOCKER_BUILD_ARGS:}