Merge #33671

sagemath · Aug 17, 2022 · 5097583 · 5097583
2 parents 8231674 + bad3c16
commit 5097583
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 48 deletions.
diff --git a/.devcontainer/develop-docker-cocalc/devcontainer.json b/.devcontainer/develop-docker-cocalc/devcontainer.json
diff --git a/.devcontainer/downstream-archlinux-latest/devcontainer.json b/.devcontainer/downstream-archlinux-latest/devcontainer.json
@@ -3,9 +3,11 @@
     "name": "archlinux:latest downstream Sage",
     "image": "archlinux:latest",
     // Run commands after the container is created.
-    "postCreateCommand": "EXTRA_SYSTEM_PACKAGES='sagemath sagemath-doc' EXTRA_SAGE_PACKAGES='notebook pip' .devcontainer/post_create.sh",
+    // Create an empty bashrc to avoid the error "No such file or directory" when opening a terminal.
+    "postCreateCommand": "EXTRA_SYSTEM_PACKAGES='sagemath sagemath-doc' EXTRA_SAGE_PACKAGES='notebook pip' .devcontainer/post_create.sh && touch ~/.bashrc",
     // Run commands after the container is started.
-    "postStartCommand": "make configure && ln -sf /usr venv",
+    // There's no SAGE_LOCAL, so remove the symlink 'prefix'.
+    "postStartCommand": "rm -f prefix && ln -sf /usr venv",
     "extensions": [
         "ms-python.python"
     ]

diff --git a/.devcontainer/portability-centos-7-devtoolset-gcc_11-standard/devcontainer.json b/.devcontainer/portability-centos-7-devtoolset-gcc_11-standard/devcontainer.json
diff --git a/.devcontainer/post_create.sh b/.devcontainer/post_create.sh
@@ -3,7 +3,7 @@
 export PATH=$(pwd)/build/bin:$PATH
 SYSTEM=$(sage-guess-package-system)
 eval $(sage-print-system-package-command $SYSTEM "$@" update)
-eval $(sage-print-system-package-command $SYSTEM --yes "$@" --spkg install _prereq python3 git $EXTRA_SAGE_PACKAGES)
+eval $(sage-print-system-package-command $SYSTEM --yes "$@" --spkg install _bootstrap _prereq python3 git $EXTRA_SAGE_PACKAGES)
 if [ -n "$EXTRA_SYSTEM_PACKAGES" ]; then
     eval $(sage-print-system-package-command $SYSTEM --yes "$@" install $EXTRA_SYSTEM_PACKAGES)
 fi
diff --git a/src/doc/en/developer/portability_testing.rst b/src/doc/en/developer/portability_testing.rst
@@ -1252,30 +1252,48 @@ work without change) or to adapt them to your needs.
   hence the prefix ``downstream-...``; the suffix ``latest`` indicates
   the most recent version of Arch Linux as available on Docker Hub.)
 
+  When the message "Done. Press any key to close the terminal." appears in the terminal
+  named "Configuring", Sage is ready for use. To use Sage in a terminal, `open a new
+  terminal in VS Code <https://code.visualstudio.com/docs/terminal/basics>`_, type ``sage``
+  and hit :kbd:`Enter`. (Do not use ``./sage``; this will not work because the source tree is
+  not configured.)
+
 - `downstream-conda-forge-latest/devcontainer.json
   <https://github.com/sagemath/sage/tree/develop/.devcontainer/downstream-conda-forge-latest/devcontainer.json>`_
   similarly configures a container with an installation of conda-forge and its SageMath package.
 
+  When the message "Done. Press any key to close the terminal." appears in the terminal
+  named "Configuring", Sage is ready for use. To use Sage in a terminal, `open a new
+  terminal in VS Code <https://code.visualstudio.com/docs/terminal/basics>`_, type ``sage``
+  and hit :kbd:`Enter`. (Do not use ``./sage``; this will not work because the source tree is
+  not configured.)
+
 - `downstream-docker-cocalc/devcontainer.json
   <https://github.com/sagemath/sage/tree/develop/.devcontainer/downstream-docker-cocalc/devcontainer.json>`_
   configures a container with `the CoCalc Docker image <https://doc.cocalc.com/docker-image.html>`_.
 
+  When the message "Done. Press any key to close the terminal." appears in the terminal
+  named "Configuring", Sage is ready for use. To use Sage in a terminal, `open a new
+  terminal in VS Code <https://code.visualstudio.com/docs/terminal/basics>`_, type ``sage``
+  and hit :kbd:`Enter`. (Do not use ``./sage``; this will not work because the source tree is
+  not configured.)
+
 - `downstream-docker-computop/devcontainer.json
   <https://github.com/sagemath/sage/tree/develop/.devcontainer/develop-docker-computop/devcontainer.json>`_
   configures a container with the `Docker image from the 3-manifolds
   project <https://hub.docker.com/r/computop/sage/>`_, providing
   SnapPy, Regina, PHCPack, etc.
 
+  When the message "Done. Press any key to close the terminal." appears in the terminal
+  named "Configuring", Sage is ready for use. To use Sage in a terminal, `open a new
+  terminal in VS Code <https://code.visualstudio.com/docs/terminal/basics>`_, type ``sage``
+  and hit :kbd:`Enter`. (Do not use ``./sage``; this will not work because the source tree is
+  not configured.)
+
 Files named ``$SAGE_ROOT/.devcontainer/develop-.../devcontainer.json`` configure
 containers from a public Docker image that provides SageMath and then updates the
 installation of SageMath in this container by building from the current source tree.
 
-- `develop-docker-cocalc/devcontainer.json
-  <https://github.com/sagemath/sage/tree/develop/.devcontainer/develop-docker-cocalc/devcontainer.json>`_
-  configures a container with `the CoCalc Docker image <https://doc.cocalc.com/docker-image.html>`_.
-  It then updates the installation of SageMath in this container by building from
-  the current source tree.
-
 - `develop-docker-computop/devcontainer.json
   <https://github.com/sagemath/sage/tree/develop/.devcontainer/develop-docker-computop/devcontainer.json>`_
   configures a container with the `Docker image from the 3-manifolds