Update Docker development container environment information to be consistent for v2.2.

Author: baagaard-usgs

docker/pylith-devenv

@@ -110,10 +110,11 @@ USER ${PYLITH_USER}
 
 # Environment variables used in VSCode settings
 ENV  PYLITH_DIR=${INSTALL_DIR} \
-     PYLITH_BUILDDIR=${TOPBUILD_DIR}/pylith  \
-     PYTHON_INCDIR=/usr/include/python3.8 \
+     PYLITH_BUILDDIR=${TOPBUILD_DIR}/pylith \
+     PETSC_DIR=${PYLITHDEPS_DIR} \
+     PYTHON_INCDIR=${PYLITHDEPS_DIR}/include/python2.7 \
      MPI_INCDIR=/usr/include/x86_64-linux-gnu/mpich \
-     PROJ_INCDIR=/usr/include \
+     PROJ_INCDIR=${PYLITHDEPS_DIR}/include \
      CPPUNIT_INCDIR=/usr/include
 
 ENV PATH=${PYLITH_DIR}/bin:${PYLITHDEPS_DIR}/bin:${PATH_ORIG} \

docs/devenv/docker-devenv.md

@@ -18,11 +18,11 @@ The Docker image also defines the environment:
 | :------------------- | :-----------------------------------: | :------------------------------------------------------ |
 | `PYTHON_VERSION`     |                 `2.7`                 | Python version                                          |
 | `PYLITH_USER`        |             `pylith-dev`              | Username within container                               |
-| `BASE_DIR`           |             `/opt/pylith`             | Top-level directory for development workspace           |
+| `DEV_DIR`           |             `/opt/pylith`             | Top-level directory for development workspace           |
 | `HOME`               |        `/home/${PYLITH_USER}`         | Home directory for user                                 |
-| `INSTALL_DIR`        |       `${BASE_DIR}/dest/debug`        | Directory where code is installed                       |
-| `TOPSRC_DIR`         |           `${BASE_DIR}/src`           | Top-level directory for source code                     |
-| `TOPBUILD_DIR`       |       `${BASE_DIR}/build/debug`       | Top-level directory for building                        |
+| `INSTALL_DIR`        |       `${DEV_DIR}/dest/debug`        | Directory where code is installed                       |
+| `TOPSRC_DIR`         |           `${DEV_DIR}/src`           | Top-level directory for source code                     |
+| `TOPBUILD_DIR`       |       `${DEV_DIR}/build/debug`       | Top-level directory for building                        |
 | `PYLITH_BUILDDIR`    |       `${TOPBUILD_DIR}/pylith`        | Top-level directory where we build PyLith [^vscode]     |
 | `PYLITH_DIR`        |           `${INSTALL_DIR}`            | Directory containing installed PyLith [^vscode] |
 | `PYLITHDEPS_DIR`        |           `/opt/dependencies`            | Directory containing external dependencies [^vscode] |
@@ -44,7 +44,7 @@ You only need to run these setup steps once.
 2. You need to have a [GitHub](https://github.com) account.
 :::
 
-### Fork repositories on GitHub
+### Fork repository on GitHub
 
 1. Log in to your [GitHub](https://github.com) account.
 
@@ -168,6 +168,16 @@ The consequence of using a relative link is that your local clone will look for
 
 ### Configure and build PyLith for development
 
+:::{important}
+Make sure your PyLith clone is on a v2.2 compatible branch.
+This is either `releases/v2.2` from the `geodynamics/pylith` repository or one of your own branches from that branch.
+
+```{code-block} bash
+cd /opt/pylith/src
+git checkout releases/v2.2
+```
+:::
+
 ```{code-block} bash
 cd ${TOPBUILD_DIR}/pylith
 pushd ${TOPSRC_DIR} && autoreconf -if && popd