Merge branch 'master' into docker_to_py10

Author: bnmnetp

docker/.env.prototype

@@ -7,7 +7,8 @@
 RUNESTONE_HOST=localhost
 
 # Select a configuration for the instructor-facing server (the Runestone server) and the student-facing server (BookServer). Valid values are ``test``, ``development``, and ``production``.
-SERVER_CONFIG=development
+SERVER_CONFIG=production
+
 
 # For production, change the credentials for the DB to something more secure.
 # This should be done prior to first running ``docker/docker_tools.py up``.

docker/README.rst

@@ -200,7 +200,7 @@ For the development use case, you do not need to modify any of the default envir
 
 **OR**
 
-For the production use case, you will need to modify these variables. To do so, edit the ``.env`` file, which Docker will read automatically as it loads containers. A sample ``.env`` file is provided as ``./.env`` (copied from `docker/.env.prototype <.env.prototype>` on the first build). See comments in the file for details.
+For the production use case, you will need to modify these variables. To do so, edit the ``.env`` file, which Docker will read automatically as it loads containers. A sample ``.env`` file is provided as ``./.env`` (copied from `docker/.env.prototype <.env.prototype>` on the first build). See comments in the file for details.  Especially pay attention to the `SERVER_CONFIG` value.   It defaults to `development` and you will need to change it to `production` if you do a `build --single` or just `build` defaults to single or `build --multi`.
 
 Python Settings
 ^^^^^^^^^^^^^^^

docker/docker_tools.py

@@ -17,7 +17,7 @@
 #
 #   -   Single-container: these commands creates a container designed to execute on a single server. The Dockerized applications associated with it include Jobe, Redis, and Postgres. A volume is used to persist data, such as updates to the server.
 #
-#       -   Production mode (the default): ``docker-tool build --single`` creates a container designed for production (which includes obtaining an HTTPS certificate).
+#       -   Production mode (the default): ``docker-tools build --single`` creates a container designed for production (which includes obtaining an HTTPS certificate).
 #
 #       -   Development mode: ``docker-tools build --single-dev`` creates a container supporting a development mode, which provides additional tools and installs the BookServer and Runestone Components from github, instead of from releases on PyPI.
 #
@@ -868,6 +868,7 @@ def _build_phase_1(
         # ``sphinxcontrib.paverutils.run_sphinx`` lacks venv support -- it doesn't use ``sys.executable``, so it doesn't find ``sphinx-build`` in the system path when executing ``/srv/venv/bin/runestone`` directly, instead of activating the venv first (where it does work). As a huge, ugly hack, symlink it to make it available in the system path.
         "ln -sf $RUNESTONE_PATH/.venv/bin/sphinx-build /usr/local/bin",
         # Deal with a different subdirectory layout inside the container (mandated by web2py) and outside the container by adding these symlinks.
+        # TODO: should only do this in dev
         "ln -sf $BOOK_SERVER_PATH $WEB2PY_PATH/applications/BookServer",
         # We can't use ``$BOOK_SERVER_PATH`` here, since we need ``/srv/bookserver-dev`` in lowercase, not CamelCase.
         "ln -sf /srv/bookserver-dev $WEB2PY_PATH/applications/bookserver-dev",
@@ -1044,7 +1045,9 @@ def _build_phase_2_core(
         xqt("rm -f $RUNESTONE_PATH/databases/*")
         print("Populating database...")
         xqt("rsmanage initdb --force", cwd=env.WEB2PY_PATH)
-        xqt("alembic stamp head", cwd=env.BOOK_SERVER_PATH)
+        # Should only use alembic in dev mode.
+        if build_config.is_dev():
+            xqt("alembic stamp head", cwd=env.BOOK_SERVER_PATH)
     else:
         print("Database already populated.")
         # TODO: any checking to see if the db is healthy? Perhaps run Alembic autogenerate to see if it wants to do anything?

docker/docker_tools_misc.py

@@ -73,6 +73,10 @@ def start_servers(dev: bool) -> None:
 def _start_servers(dev: bool) -> None:
     ensure_in_docker()
     bs_config = os.environ.get("BOOK_SERVER_CONFIG", "production")
+    w2p_config = os.environ.get("WEB2PY_CONFIG", "production")
+    if bs_config != w2p_config:
+        raise ValueError("web2py and bookserver configs do not match")
+
     if bs_config == "development":
         dev = True